From 8e4cb2a89d44c72079ff01aff862806f4969ce1b Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 2 Oct 2015 09:28:24 -0400 Subject: [PATCH 1/2] app-shells/zsh: fix build w/gcc-5 #547950 --- app-shells/zsh/files/zsh-5.1.0-gcc-5.patch | 16 ++++++++++++++++ app-shells/zsh/zsh-5.1.1.ebuild | 1 + 2 files changed, 17 insertions(+) create mode 100644 app-shells/zsh/files/zsh-5.1.0-gcc-5.patch diff --git a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch new file mode 100644 index 0000000000000..74756d2946c46 --- /dev/null +++ b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/547950 +http://www.zsh.org/mla/workers/2015/msg02660.html + +fix building w/gcc-5 + +--- a/Src/Modules/system.mdd ++++ b/Src/Modules/system.mdd +@@ -15,7 +15,7 @@ + touch errtmp.out; \ + else \ + $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \ +- $(CPP) errtmp.c >errtmp.out; \ ++ $(CPP) -P errtmp.c >errtmp.out; \ + fi + $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@ + rm -f errtmp.c errtmp.out diff --git a/app-shells/zsh/zsh-5.1.1.ebuild b/app-shells/zsh/zsh-5.1.1.ebuild index 695369ab8bfcc..295b2ca3d6731 100644 --- a/app-shells/zsh/zsh-5.1.1.ebuild +++ b/app-shells/zsh/zsh-5.1.1.ebuild @@ -53,6 +53,7 @@ src_prepare() { soelim Doc/zshall.1.soelim > Doc/zshall.1 epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff + epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950 cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die eprefixify "${T}"/zprofile || die From 3574435ae3de31bb9409c406154aa03fbbb884f7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 2 Oct 2015 09:34:55 -0400 Subject: [PATCH 2/2] x11-apps/sessreg: fix build w/gcc-5 #546742 --- x11-apps/sessreg/files/sessreg-1.1.0-gcc-5.patch | 16 ++++++++++++++++ x11-apps/sessreg/sessreg-1.1.0.ebuild | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 x11-apps/sessreg/files/sessreg-1.1.0-gcc-5.patch diff --git a/x11-apps/sessreg/files/sessreg-1.1.0-gcc-5.patch b/x11-apps/sessreg/files/sessreg-1.1.0-gcc-5.patch new file mode 100644 index 0000000000000..7ed7511d0965c --- /dev/null +++ b/x11-apps/sessreg/files/sessreg-1.1.0-gcc-5.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/546742 +https://bugs.freedesktop.org/show_bug.cgi?id=90615 + +fix building w/gcc-5 + +--- man/Makefile.in ++++ man/Makefile.in +@@ -9,7 +9,7 @@ + + 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' > $@ + diff --git a/x11-apps/sessreg/sessreg-1.1.0.ebuild b/x11-apps/sessreg/sessreg-1.1.0.ebuild index ae366d07209c0..8504af90d4d86 100644 --- a/x11-apps/sessreg/sessreg-1.1.0.ebuild +++ b/x11-apps/sessreg/sessreg-1.1.0.ebuild @@ -13,3 +13,7 @@ IUSE="" RDEPEND="" DEPEND="${RDEPEND} x11-proto/xproto" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.0-gcc-5.patch #546742 +)