| 1 |
commit: c7dc706efaceb4816df5eedb45cd7c79ef1c3ef4 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 29 20:03:23 2015 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 29 20:04:23 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7dc706e |
| 7 |
|
| 8 |
app-shells/ksh: Fix build with GCC 5 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/555670 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.26_p3 |
| 13 |
|
| 14 |
app-shells/ksh/files/cpp.patch | 24 ++++++++++++++++++++++++ |
| 15 |
app-shells/ksh/ksh-93.20140625.ebuild | 3 ++- |
| 16 |
2 files changed, 26 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/app-shells/ksh/files/cpp.patch b/app-shells/ksh/files/cpp.patch |
| 19 |
new file mode 100644 |
| 20 |
index 0000000..7075bcf |
| 21 |
--- /dev/null |
| 22 |
+++ b/app-shells/ksh/files/cpp.patch |
| 23 |
@@ -0,0 +1,24 @@ |
| 24 |
+iffe depends on cc -E not inserting newlines between tokens |
| 25 |
+ |
| 26 |
+https://build.opensuse.org/package/view_file/home:Andreas_Schwab:Factory/ksh/cpp.patch?expand=1 |
| 27 |
+ |
| 28 |
+--- a/src/cmd/INIT/iffe.sh |
| 29 |
++++ b/src/cmd/INIT/iffe.sh |
| 30 |
+@@ -3427,7 +3427,7 @@ |
| 31 |
+ (eval "$src") <&$nullin || e=1 |
| 32 |
+ ;; |
| 33 |
+ mac*|nomac*) |
| 34 |
+- if compile $cc -E $tmp.c <&$nullin >$tmp.i |
| 35 |
++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i |
| 36 |
+ then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i |
| 37 |
+ else e=1 |
| 38 |
+ fi |
| 39 |
+@@ -3718,7 +3718,7 @@ |
| 40 |
+ <<\"#define $v\">> $v <<\"/* native $v */\">> |
| 41 |
+ <<\"#endif\">> |
| 42 |
+ #endif" > $tmp.c |
| 43 |
+- if compile $cc -E $tmp.c <&$nullin >$tmp.i |
| 44 |
++ if compile $cc -E -P $tmp.c <&$nullin >$tmp.i |
| 45 |
+ then sed -e '/<<[ ]*".*"[ ]*>>/!d' -e 's/<<[ ]*"//g' -e 's/"[ ]*>>//g' $tmp.i > $tmp.t |
| 46 |
+ if test -s $tmp.t |
| 47 |
+ then success |
| 48 |
|
| 49 |
diff --git a/app-shells/ksh/ksh-93.20140625.ebuild b/app-shells/ksh/ksh-93.20140625.ebuild |
| 50 |
index 5276f82..020d6b9 100644 |
| 51 |
--- a/app-shells/ksh/ksh-93.20140625.ebuild |
| 52 |
+++ b/app-shells/ksh/ksh-93.20140625.ebuild |
| 53 |
@@ -1,4 +1,4 @@ |
| 54 |
-# Copyright 1999-2014 Gentoo Foundation |
| 55 |
+# Copyright 1999-2015 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
# $Id$ |
| 58 |
|
| 59 |
@@ -29,6 +29,7 @@ src_prepare() { |
| 60 |
bin/package src/cmd/INIT/package.sh || die |
| 61 |
|
| 62 |
epatch "${FILESDIR}"/${PN}-prefix.patch |
| 63 |
+ epatch "${FILESDIR}"/cpp.patch |
| 64 |
eprefixify src/cmd/ksh93/data/msg.c |
| 65 |
} |
Archives