Since GCC 4.8 cpp leaves a lot of blank lines if it reads from stdin. So
instead of feeding the input file to stdin pass it via command line.

Similar bug with xinit: https://bugs.freedesktop.org/show_bug.cgi?id=69439.
---
 config/Makefile.am | 2 +-
 cpprules.in        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Makefile.am b/config/Makefile.am
index e1484f1..2094229 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -71,4 +71,4 @@ CPP_FILES_FLAGS = -DBINDIR="$(bindir)" 
-DDEFAULTVT="$(DEFAULTVT)" \
     -DSHELL_CMD="$(SHELL_CMD)" $(MKTEMP_DEFINES)
 
 Xservers.ws: $(srcdir)/Xservers.ws.cpp
-       $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < 
$(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
+       $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) 
$(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
diff --git a/cpprules.in b/cpprules.in
index c6daca3..10d30be 100644
--- a/cpprules.in
+++ b/cpprules.in
@@ -23,4 +23,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 .cpp:
-       $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | 
$(CPP_SED_MAGIC) > $@
+       $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | 
$(CPP_SED_MAGIC) > $@
-- 
2.7.0

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to