summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2014-06-15 18:00:07 +0000
committerFabian Groffen <grobian@gentoo.org>2014-06-15 18:00:07 +0000
commit8a4b1830b6560c6cec701a90ab6a34f53b0a2213 (patch)
treec45d34572ef23ea791f98d1a44afac971f64e656 /sys-devel
parentRemove bogus ChangeLog entry. (diff)
downloadgentoo-2-8a4b1830b6560c6cec701a90ab6a34f53b0a2213.tar.gz
gentoo-2-8a4b1830b6560c6cec701a90ab6a34f53b0a2213.tar.bz2
gentoo-2-8a4b1830b6560c6cec701a90ab6a34f53b0a2213.zip
Fix build with perl-5.18
(Portage version: HEAD/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gcc-apple/ChangeLog6
-rw-r--r--sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-perl-5.18.patch11
-rw-r--r--sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild4
3 files changed, 19 insertions, 2 deletions
diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog
index 5da5fcec8e9e..390bef898fc7 100644
--- a/sys-devel/gcc-apple/ChangeLog
+++ b/sys-devel/gcc-apple/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-devel/gcc-apple
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.25 2014/05/22 18:59:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.26 2014/06/15 18:00:07 grobian Exp $
+
+ 15 Jun 2014; Fabian Groffen <grobian@gentoo.org>
+ +files/gcc-apple-4.2.1_p5666-perl-5.18.patch, gcc-apple-4.2.1_p5666-r1.ebuild:
+ Fix build with perl-5.18
22 May 2014; Fabian Groffen <grobian@gentoo.org>
gcc-apple-4.2.1_p5666-r1.ebuild:
diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-perl-5.18.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-perl-5.18.patch
new file mode 100644
index 000000000000..af3688aa48e5
--- /dev/null
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-perl-5.18.patch
@@ -0,0 +1,11 @@
+--- a/contrib/texi2pod.pl
++++ b/contrib/texi2pod.pl
+@@ -337,7 +337,7 @@ while(<$inf>) {
+ $_ = "\n=item $1\n";
+ }
+ } else {
+- $_ = "\n=item $ic\n";
++ $_ = "\n=item Z\&LT;\&GT;$ic\n";
+ $ic =~ y/A-Ya-y/B-Zb-z/;
+ $ic =~ s/(\d+)/$1 + 1/eg;
+ }
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
index 05ad5a904d89..a9cc887fde9a 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild,v 1.3 2014/05/22 18:59:30 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r1.ebuild,v 1.4 2014/06/15 18:00:07 grobian Exp $
EAPI="3"
@@ -123,6 +123,8 @@ src_prepare() {
|| die "Failed to rewrite $XD"
fi
+ epatch "${FILESDIR}"/${P}-perl-5.18.patch
+
epatch "${FILESDIR}"/${PN}-4.2.1-prefix-search-dirs.patch
eprefixify "${S}"/gcc/gcc.c