summaryrefslogtreecommitdiff
path: root/extra/xorg-xinit/cpp-4.8-compat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extra/xorg-xinit/cpp-4.8-compat.patch')
-rw-r--r--extra/xorg-xinit/cpp-4.8-compat.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/extra/xorg-xinit/cpp-4.8-compat.patch b/extra/xorg-xinit/cpp-4.8-compat.patch
new file mode 100644
index 000000000..b19f53eee
--- /dev/null
+++ b/extra/xorg-xinit/cpp-4.8-compat.patch
@@ -0,0 +1,22 @@
+From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 23 Nov 2013 07:03:39 +0000
+Subject: Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/cpprules.in b/cpprules.in
+index eaea428..0931bee 100644
+--- a/cpprules.in
++++ b/cpprules.in
+@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ SUFFIXES = .cpp
+
+ .cpp:
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
+--
+cgit v0.9.0.2-2-gbebe