diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-09-25 20:34:17 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-09-25 20:34:17 +0000 |
| commit | 4e7a954354409ad3d0de5979228b25c71d337268 (patch) | |
| tree | 40aa556be210581403673e0d07e53a22156e4c44 /sys-devel/gcc-apple | |
| parent | Updated to current release (closes bugs 282598 and 283780). (diff) | |
| download | gentoo-2-4e7a954354409ad3d0de5979228b25c71d337268.tar.gz gentoo-2-4e7a954354409ad3d0de5979228b25c71d337268.tar.bz2 gentoo-2-4e7a954354409ad3d0de5979228b25c71d337268.zip | |
With updated libtool stuff, we no longer need the hacky workaround on Darwin10, thanks rrrachel for testing
(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 | 7 | ||||
| -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 | 7 |
3 files changed, 7 insertions, 33 deletions
diff --git a/sys-devel/gcc-apple/ChangeLog b/sys-devel/gcc-apple/ChangeLog index 8f13e2edf0e0..b4c41711dab9 100644 --- a/sys-devel/gcc-apple/ChangeLog +++ b/sys-devel/gcc-apple/ChangeLog @@ -1,6 +1,11 @@ # 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.9 2009/09/25 15:26:09 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/ChangeLog,v 1.10 2009/09/25 20:34:17 grobian Exp $ + + 25 Sep 2009; Fabian Groffen <grobian@gentoo.org> + gcc-apple-4.2.1_p5574.ebuild, -files/gcc-apple-4.2.1_p5574-darwin10.patch: + With updated libtool stuff, we no longer need the hacky workaround on + Darwin10, thanks rrrachel for testing 25 Sep 2009; Fabian Groffen <grobian@gentoo.org> gcc-apple-4.2.1_p5574.ebuild: 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 deleted file mode 100644 index 8845c950469b..000000000000 --- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5574-darwin10.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 208be62ed4a7..6151f9c7c515 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.3 2009/09/25 17:38:57 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/gcc-apple-4.2.1_p5574.ebuild,v 1.4 2009/09/25 20:34:17 grobian Exp $ ETYPE="gcc-compiler" @@ -110,11 +110,6 @@ src_unpack() { # 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() { |