[PATCH] Pass -P to the preprocessor when generating filenames for the manpage.
mattst88 at gmail.com
Wed Oct 7 10:29:58 PDT 2015
On Wed, Oct 7, 2015 at 7:46 AM, Aurelien Jarno <aurelien at aurel32.net> wrote:
> On 2015-09-30 15:16, Matt Turner wrote:
>> On Wed, Sep 9, 2015 at 2:44 PM, Aurelien Jarno <aurelien at aurel32.net> wrote:
>> > From: Stefan Dirsch <sndirsch at suse.de>
>> > Fixes build with GCC 5. Patch by Richard Biener <rguenther at suse.com>
>> > ---
>> > man/Makefile.am | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> > sessreg doesn't build with GCC 5 (BZ90615), due to new line markers in
>> > the preprocessor output. GCC documentation advise to use -P . This is
>> > the solution chosen by freebsd , suse  or suggested in the debian
>> > bug log . Note that it is supported by at least clang and oracle
>> > studio.
>> > In order to avoid every for distribution to implement this solution in
>> > a different way, I have just taken the suse patch and I am sending it
>> > with this mail. I hope it could be applied that way.
>> >  http://gcc.gnu.org/gcc-5/porting_to.html
>> >  https://reviews.freebsd.org/rP382986
>> >  http://lists.opensuse.org/opensuse-commit/2015-02/msg01337.html
>> >  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778176#36
>> > diff --git a/man/Makefile.am b/man/Makefile.am
>> > index 665ace5..2e5f146 100644
>> > --- a/man/Makefile.am
>> > +++ b/man/Makefile.am
>> > @@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
>> > AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
>> > filenames.sed: filenames.sed.c
>> > - $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>> > + $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>> > $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \
>> > $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@
>> > --
>> This works for me. I'm happy to see it committed (and I can do that
>> for you if you want -- just let me know).
> Given nobody seems to have complain about this for some days, I would
> indeed appreciate if you can commit it. Thanks!
Sure. Pushed as commit 93f5d5abf.
More information about the xorg-devel