[PATCH] Pass -P to the preprocessor when generating filenames for the manpage.

Aurelien Jarno aurelien at aurel32.net
Wed Oct 7 07:46:15 PDT 2015


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 [1]. This is
> > the solution chosen by freebsd [2], suse [3] or suggested in the debian
> > bug log [4]. 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.
> >
> > [1] http://gcc.gnu.org/gcc-5/porting_to.html
> > [2] https://reviews.freebsd.org/rP382986
> > [3] http://lists.opensuse.org/opensuse-commit/2015-02/msg01337.html
> > [4] 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!

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien at aurel32.net                 http://www.aurel32.net


More information about the xorg-devel mailing list