Add patch to suppress annoying -mlong-branch warning that we totally can't do anything about

Package-Manager: portage-2.2.00.15838-prefix/cvs/Darwin powerpc

4 files changed, 45 insertions, 24 deletions

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 21a43e7c1aa7..9896b894f504 100644
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.7 2010/03/21 19:33:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.8 2010/03/21 20:41:45 grobian Exp $
+
+  21 Mar 2010; Fabian Groffen <grobian@gentoo.org>
+  binutils-apple-3.2-r1.ebuild,
+  +files/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch:
+  Add patch to suppress annoying -mlong-branch warning that we totally can't
+  do anything about
 
 *binutils-apple-3.2-r1 (21 Mar 2010)
 
diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 55051faf7caf..8503e7bd4e36 100644
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -12,6 +12,7 @@ AUX binutils-apple-3.1.2-as-Makefile.patch 308 RMD160 043f9f5fc0eeedd7c1f61520ba
 AUX binutils-apple-3.2-armv7-defines.patch 321 RMD160 f6aa6230d53de02c1c60e127bec188e748502157 SHA1 4f83bf45ee90d727e83a326d1218786bff4b80a8 SHA256 1c7fb1938bc8d906af861ff4cc430ebee860162d0de28ca4ebb57d67ff62074f
 AUX binutils-apple-3.2-ld64-Makefile 760 RMD160 da9f2930915d75d51bab3a58417a3ddc59a24bc4 SHA1 f4e0735ed11f3b277d88cf5300efab9e4ac03dda SHA256 990d24770f2e9ef985ad0f8d9f56c0fb1a0798b102418d29810918447a5ec92e
 AUX ld64-95.2.12-Makefile 736 RMD160 dcd8c54a51ae612e99fc4e01e9f29ca3e89673e4 SHA1 ded0b7d55e9fd4e671f4de0d09904cdf33da3c4b SHA256 45c50e789e25fc5552a25f086e2bb974785a907431ba2f2605c7bc6c9891af9b
+AUX ld64-95.2.12-darwin8-no-mlong-branch-warning.patch 620 RMD160 cf17f65dda73393a921896b8844493b237dc3307 SHA1 b834e98d61a9ecd70aa99b89b5575a8e32b5b2f7 SHA256 ca0455c78e77f84e7d15e6edf19085b0729a12baf29a89455af84e947f201b1d
 DIST binutils-apple-3.2-unwind-patches-1.tar.xz 11620 RMD160 0a912000d2ba75a73cd9981c0ee6edb3258255c1 SHA1 9196aaed53bbd894afa79a75538f6db3ac43d975 SHA256 6c1a26c8b0a0c3cb313aedc64af1d3672b94ff07d8d4c1334154d4e1c45dc77a
 DIST binutils-apple-LP64-patches-1.tar.bz2 10235 RMD160 754e956a9b8b9ecdf1bde5115bad0eb85545292e SHA1 e863f222e2f3eb5134de661987c7e5b58abaa710 SHA256 a107459f3914d57524e51ec4cb5e800f6715d40003514c79add0b5b4521cf809
 DIST cctools-698.1.tar.gz 2318018 RMD160 898c7b46869d4989c115420912fdd8d96ae923d3 SHA1 11cb788151365fb365f7bf4a9083c3fcc6fa88f7 SHA256 383f1c0c78a2b3efdfdf7ce01adb7e2f8ee9985164dba6ab1c0fae800a211cec
@@ -22,7 +23,7 @@ DIST ld64-85.2.2.tar.gz 298144 RMD160 f7f897666a072e07f1888beca5b22fdd75fa1b61 S
 DIST ld64-95.2.12.tar.gz 401104 RMD160 35de89aa1d31d100bd952829df4316e640c03cb4 SHA1 eea384a5ed3b5a994cc24e076c74ad20e6f8b68a SHA256 5a5ea02bd81d74f4f773403bebe34950acf4830fb7fee0d466305276f869097c
 EBUILD binutils-apple-3.1.1.ebuild 5157 RMD160 692fc010932d7ddbf51b3fd63f1f79742cdfcff3 SHA1 5c82eb1ce460f94cc4328327ad5c141463a3953a SHA256 c8f9904789faea57409863af02683e6eae36377925fcf4e7a9dd44dab9c7e6ac
 EBUILD binutils-apple-3.1.2.ebuild 5288 RMD160 bbe9a2371e5e1e66b0c9fa2f4ca600bb2474d234 SHA1 5d21c2ac4c555ec8d997efe9d5ae0233b2fa17cb SHA256 0818f10ee517368085e4bacfd53f25ab81115f05b480fb716c6b70b7ebc59bdd
-EBUILD binutils-apple-3.2-r1.ebuild 6021 RMD160 60d94b9df5243c67b1612f3b7f4a256ef908f0da SHA1 4220da739ffbf3bad6bb84a4ab3c56a6bf92030e SHA256 b68507ad543cd330744c34b4018241dcfa6af3c62a087f7763d64f043e39dc0c
+EBUILD binutils-apple-3.2-r1.ebuild 6094 RMD160 bf7c3aa6380fb08bec245777aecb2a3e924e99e9 SHA1 986273651ad9b6b9fb8693cd5c8fc72550050878 SHA256 5f58d817814fa95a27acac71e090c435b6355058683ca2a0735c8a73f7e11d3c
 EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-MISC ChangeLog 4740 RMD160 6acb85e1dff4fb7b20b8b8c6329f37c967b2b0ac SHA1 aa56fc4d54143d922d3e5197097d90eb3c8ae2ed SHA256 c5f5b51993d963b10cd0b0f084ca72df0d731ec8db7f5c70589582693e5b2f3b
+MISC ChangeLog 4982 RMD160 660a7f45b825d4e7c0a17ae9403371c087160066 SHA1 aba7a261485940893435da8f6399c34111a09a0a SHA256 2e2598af2981347a6b1992f92c23e55c4492252a64cbcb4accb4c6cdaba35db9
 MISC metadata.xml 158 RMD160 61ad495b84df949a636009d30b8c3af6d267e469 SHA1 cacd49ab85e7648a81e5dd4791ef9598090ee63d SHA256 6a21555efc71392966785841abafc9b2984d97d75ad574d654db6adc8674b1bd
diff --git a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
index c36246d5704f..32a35c65c047 100644
--- a/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild,v 1.1 2010/03/21 19:33:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-3.2-r1.ebuild,v 1.2 2010/03/21 20:41:45 grobian Exp $
 
 EAPI="3"
 
@@ -53,7 +53,17 @@ fi
 
 S=${WORKDIR}
 
-prepare_ld64() {
+src_prepare() {
+	cd "${S}"/${CCTOOLS}
+	epatch "${FILESDIR}"/${PN}-3.1.1-as.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
+	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
+	epatch "${FILESDIR}"/${P}-armv7-defines.patch
+
 	cd "${S}"/${LD64}/src
 	cp "${FILESDIR}"/${LD64}-Makefile Makefile
 
@@ -65,7 +75,14 @@ prepare_ld64() {
 	echo '' > linker_opts
 	echo "char ldVersionString[] = ${VER_STR};" > version.cpp
 
+	epatch "${WORKDIR}"/ld64-unwind/${LD64}-unlibunwind.patch
+	[[ ${CHOST} == powerpc*-darwin* ]] && \
+		epatch "${FILESDIR}"/${LD64}-darwin8-no-mlong-branch-warning.patch
+
 	# clean up test suite
+	cd "${S}"/${LD64}
+	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
+
 	cd "${S}"/${LD64}/unit-tests/test-cases
 	local c
 
@@ -89,25 +106,7 @@ prepare_ld64() {
 	# TODO no idea what goes wrong here
 	((++c)); rm -rf dwarf-debug-notes;
 
-	elog "Deleted $c tests that were bound to fail"
-}
-
-src_prepare() {
-	prepare_ld64
-
-	cd "${S}"/${CCTOOLS}
-	epatch "${FILESDIR}"/${PN}-3.1.1-as.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-as-dir.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-libtool-ranlib.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-nmedit.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-headers.patch
-	epatch "${FILESDIR}"/${PN}-3.1.1-no-oss-dir.patch
-	epatch "${FILESDIR}"/${P}-armv7-defines.patch
-
-	cd "${S}"/${LD64}
-	epatch "${FILESDIR}"/${PN}-3.1.1-testsuite.patch
-	epatch "${WORKDIR}"/ld64-unwind/ld64-95.2.12-unlibunwind.patch
+	einfo "Deleted $c tests that were bound to fail"
 
 	cd "${S}"
 	ebegin "cleaning Makefiles from unwanted CFLAGS"
diff --git a/sys-devel/binutils-apple/files/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch b/sys-devel/binutils-apple/files/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
new file mode 100644
index 000000000000..790fb97339c5
--- /dev/null
+++ b/sys-devel/binutils-apple/files/ld64-95.2.12-darwin8-no-mlong-branch-warning.patch
@@ -0,0 +1,15 @@
+The whole system (/usr/bin/crt0.o for example) is long-branch compiled,
+so *any* linkage operation causes this warning to be raised.  Don't do
+it.
+
+--- ld/MachOReaderRelocatable.hpp
++++ ld/MachOReaderRelocatable.hpp
+@@ -4165,8 +4165,6 @@
+ 				if ( nextReloc->r_type() != PPC_RELOC_PAIR ) {
+ 					throw "PPC_RELOC_JBSR missing following pair";
+ 				}
+-				if ( !fHasLongBranchStubs )
+-					warning("object file compiled with -mlong-branch which is no longer needed. To remove this warning, recompile without -mlong-branch: %s", fPath);
+ 				fHasLongBranchStubs = true;
+ 				result = true;
+ 				if ( reloc->r_extern() ) {