| 1 |
commit: 8e4cb2a89d44c72079ff01aff862806f4969ce1b |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 2 13:28:24 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 2 13:28:24 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4cb2a8 |
| 7 |
|
| 8 |
app-shells/zsh: fix build w/gcc-5 #547950 |
| 9 |
|
| 10 |
app-shells/zsh/files/zsh-5.1.0-gcc-5.patch | 16 ++++++++++++++++ |
| 11 |
app-shells/zsh/zsh-5.1.1.ebuild | 1 + |
| 12 |
2 files changed, 17 insertions(+) |
| 13 |
|
| 14 |
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 |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..74756d2 |
| 17 |
--- /dev/null |
| 18 |
+++ b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch |
| 19 |
@@ -0,0 +1,16 @@ |
| 20 |
+https://bugs.gentoo.org/547950 |
| 21 |
+http://www.zsh.org/mla/workers/2015/msg02660.html |
| 22 |
+ |
| 23 |
+fix building w/gcc-5 |
| 24 |
+ |
| 25 |
+--- a/Src/Modules/system.mdd |
| 26 |
++++ b/Src/Modules/system.mdd |
| 27 |
+@@ -15,7 +15,7 @@ |
| 28 |
+ touch errtmp.out; \ |
| 29 |
+ else \ |
| 30 |
+ $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \ |
| 31 |
+- $(CPP) errtmp.c >errtmp.out; \ |
| 32 |
++ $(CPP) -P errtmp.c >errtmp.out; \ |
| 33 |
+ fi |
| 34 |
+ $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@ |
| 35 |
+ rm -f errtmp.c errtmp.out |
| 36 |
|
| 37 |
diff --git a/app-shells/zsh/zsh-5.1.1.ebuild b/app-shells/zsh/zsh-5.1.1.ebuild |
| 38 |
index 695369a..295b2ca 100644 |
| 39 |
--- a/app-shells/zsh/zsh-5.1.1.ebuild |
| 40 |
+++ b/app-shells/zsh/zsh-5.1.1.ebuild |
| 41 |
@@ -53,6 +53,7 @@ src_prepare() { |
| 42 |
soelim Doc/zshall.1.soelim > Doc/zshall.1 |
| 43 |
|
| 44 |
epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff |
| 45 |
+ epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950 |
| 46 |
|
| 47 |
cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die |
| 48 |
eprefixify "${T}"/zprofile || die |
Archives