Make x86 thread defines available on PPC to fix compilation, bug #384339

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 34869d0df05a6d67dfd74428fa024aa558a24dcf..2bbe49e534740a9c3a4eaf05abd5192ed7ebb84e 100644 (file)
--- a/sys-devel/binutils-apple/ChangeLog
+++ b/sys-devel/binutils-apple/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/binutils-apple
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.20 2011/09/25 08:03:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.21 2011/09/25 09:32:15 grobian Exp $
+
+  25 Sep 2011; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.1.ebuild:
+  Make x86 thread defines available on PPC to fix compilation, bug #384339
 
   25 Sep 2011; Fabian Groffen <grobian@gentoo.org> binutils-apple-4.1.ebuild:
   Stop compiling unused libunwind, mimic Availability.h macros for pre OS X

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index e23f93292e845f1a04932e4bbe615759cd883030..8b245ea860b2e34ec91cc0c76f2667c903c80305 100644 (file)
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -56,13 +56,13 @@ EBUILD binutils-apple-3.2.3-r1.ebuild 6521 RMD160 6bd22707129894fc03f8949c79c1b0
 EBUILD binutils-apple-3.2.3-r2.ebuild 6669 RMD160 8a32c0be4ec8a6e8c89f5c2155fb172ebc4565e4 SHA1 9c495edc134edf36478897a7950510e7b57f92fe SHA256 17b6d484e33a20939d00a6bf496fe6aefa2920d21c4fbb6bbf359e853f754f7f
 EBUILD binutils-apple-3.2.6.ebuild 6670 RMD160 1a7df67ed733c1a22aca1414e7a2b3f1c1597d9c SHA1 6e5b37a6c5c63c87999f5dd67526cfd8936f44e8 SHA256 241af9c47b9165234672ee61466d4ba21af689cec6ab5e7f606d1f60355b30b8
 EBUILD binutils-apple-3.2.ebuild 5913 RMD160 47df8d8d2e207eb95e10359f35c2c5fd152f8938 SHA1 26b56881f56b63bc3f9b25aeae6c814f969f5dfd SHA256 41fb357219cdbb20f16200d05016c1866046f9a351994b738d6e0b7176f3488e
-EBUILD binutils-apple-4.1.ebuild 7717 RMD160 ee4150e083886f622e9e4cec632b8ef904abab78 SHA1 2b884fe9fe7e42f4b437693531b8eb943a2eba39 SHA256 32bf96e386857b58cc0611171e45f3525114b82624bbb75a547f1e6e9a7ed88e
-MISC ChangeLog 8097 RMD160 6e7ad426018504eee38fe4926fb4cd34c7582053 SHA1 40f52a32f0280c093d0134105431c715767d7cec SHA256 241def4cc6683af1220c8d035e9f010c5e6fd055983c5f6e167d95998d99abee
+EBUILD binutils-apple-4.1.ebuild 7849 RMD160 a510ae60ea26e5a6a3974840b83ed3c85a1989e4 SHA1 68c39c1353bb093b5e2d0a08f893958286db1819 SHA256 c0c1b32032744a35729375783e50d77ef72c348521f7382f241cee93480eea92
+MISC ChangeLog 8251 RMD160 17b2c885cff489fee7691a14101a140d65d5b1c6 SHA1 4ba3bace5756b4f3fb7707fd5d8ac398121ba925 SHA256 88a760cc00520274abe94942896faa1985d91e1534a3ce541ce23a64059f4bde
 MISC metadata.xml 250 RMD160 1d572689c02f6408ad8dfcfc955f8dfb7ec3a201 SHA1 dbd7759df5303c9dd998023753a3361206bad1e2 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5+4FwACgkQX3X2B8XHTomY5gCgnsKIXHx9CCy4rj2xd97UG2I5
-lC0AniS+4qhNq6qeKpnVks5ytYOYu0Rp
-=SBSw
+iEYEARECAAYFAk5+9SQACgkQX3X2B8XHTomJ0ACeLXyB6XXQEzcWO0LsNaeK8xY1
+T80An1obp3roB8pNtzGy1lOXG+eJLgMM
+=nRdR
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
index 51fcdace491bf98312afdcf28abb9fbe52252572..e8d5fae2d9807785f61c986cd5646e2712b6961e 100644 (file)
--- a/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
+++ b/sys-devel/binutils-apple/binutils-apple-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.3 2011/09/25 08:03:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/binutils-apple-4.1.ebuild,v 1.4 2011/09/25 09:32:15 grobian Exp $
 
 EAPI="3"
 
@@ -89,8 +89,11 @@ src_prepare() {
        echo "char ldVersionString[] = ${VER_STR};" > version.cpp
 
        epatch "${FILESDIR}"/${LD64%.1}-debug-backtrace.patch
-       [[ ${CHOST} == powerpc*-darwin* ]] && \
+       if [[ ${CHOST} == powerpc*-darwin* ]] ; then
                epatch "${FILESDIR}"/${LD64%.1}-darwin8-no-mlong-branch-warning.patch
+               sed -i -e '/#include <mach-o\/loader.h>/a\#include <mach/i386/thread_status.h>' \
+                       ld/HeaderAndLoadCommands.hpp || die
+       fi
        if use !lto ; then
                sed -i -e '/#define LTO_SUPPORT 1/d' other/ObjectDump.cpp || die
        fi