commit:     8e4cb2a89d44c72079ff01aff862806f4969ce1b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  2 13:28:24 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Oct  2 13:28:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4cb2a8

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(+)

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 0000000..74756d2
--- /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 695369a..295b2ca 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

Reply via email to