diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-09-25 15:26:09 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-09-25 15:26:09 +0000 |
| commit | a1be2da9ebe80e022dd46373414dcd821b7ac2e7 (patch) | |
| tree | ee711e70f64df54d1deb0c29c94117623becfb31 /sys-devel/gcc-apple | |
| parent | Version bump. (diff) | |
| download | gentoo-2-a1be2da9ebe80e022dd46373414dcd821b7ac2e7.tar.gz gentoo-2-a1be2da9ebe80e022dd46373414dcd821b7ac2e7.tar.bz2 gentoo-2-a1be2da9ebe80e022dd46373414dcd821b7ac2e7.zip | |
Merge back Snow Leopard fixes from Prefix Tree
(Portage version: 2.2.00.14411-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'sys-devel/gcc-apple')
| -rw-r--r-- | sys-devel/gcc-apple/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5574-darwin10.patch | 26 | ||||
| -rw-r--r-- | sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild | 10 |
3 files changed, 40 insertions, 2 deletions
diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog index d0e4d377e566..8f13e2edf0e0 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-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.8 2009/09/06 09:36:37 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.9 2009/09/25 15:26:09 grobian Exp $ + + 25 Sep 2009; Fabian Groffen <grobian@gentoo.org> + gcc-apple-4.2.1_p5574.ebuild: + Merge back Snow Leopard fixes from Prefix Tree 06 Sep 2009; Fabian Groffen <grobian@gentoo.org> files/gcc-apple-4.2.1-gfortran.patch: diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5574-darwin10.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5574-darwin10.patch new file mode 100644 index 000000000000..8845c950469b --- /dev/null +++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5574-darwin10.patch @@ -0,0 +1,26 @@ +On Snow Leopard the perl script fails because the object files aren't +placed in some .libs dir, it seems as if no libtool is used here at all, +so fix it by not looking in .libs dir + +--- libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.am ++++ libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.am +@@ -53,7 +53,7 @@ + $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) + perl ${glibcxx_srcdir}/scripts/make_exports.pl \ + libstdc++-symbol.ver \ +- $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \ ++ $(libstdc___la_OBJECTS:%.lo=%.o) \ + `echo $(libstdc___la_LIBADD) | \ + sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ + > $@ || (rm -f $@ ; exit 1) +--- libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.in ++++ libstdcxx-16/libstdcxx/libstdc++-v3/src/Makefile.in +@@ -689,7 +689,7 @@ + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ perl ${glibcxx_srcdir}/scripts/make_exports.pl \ + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ libstdc++-symbol.ver \ +-@ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ $(libstdc___la_OBJECTS:%.lo=.libs/%.o) \ ++@ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ $(libstdc___la_OBJECTS:%.lo=%.o) \ + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ `echo $(libstdc___la_LIBADD) | \ + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ + @ENABLE_SYMVERS_DARWIN_EXPORT_TRUE@@ENABLE_SYMVERS_GNU_FALSE@ > $@ || (rm -f $@ ; exit 1) diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild index e86e28dacbbb..0cb47288c3af 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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_p5574.ebuild,v 1.1 2009/06/21 10:27:55 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.2 2009/09/25 15:26:09 grobian Exp $ ETYPE="gcc-compiler" @@ -107,6 +107,14 @@ src_unpack() { cd "${WORKDIR}"/libstdcxx-${LIBSTDCXX_APPLE_VERSION}/libstdcxx epatch "${FILESDIR}"/libstdc++-${LIBSTDCXX_APPLE_VERSION}.patch + # copy lt-stuff that has been fixed for darwin10 in gcc but not + # libstdcxx + cp "${S}"/lt* . || die "failed to update libstdcxx' lt-files" + + # until this is tested not to break on earlier versions, apply it + # conditionally + [[ ${CHOST} == *-darwin10 ]] && \ + epatch "${FILESDIR}"/${PN}-4.2.1_p5574-darwin10.patch } src_compile() { |