Fix USE=lto compilation thanks to patch from Charles Davis in bug #387481

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

diff --git a/sys-devel/binutils-apple/ChangeLog b/sys-devel/binutils-apple/ChangeLog
index 2bbe49e534740a9c3a4eaf05abd5192ed7ebb84e..4c0024a758c920b2cc3a54b811cbabc14f0a3ae9 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.21 2011/09/25 09:32:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils-apple/ChangeLog,v 1.22 2011/10/18 16:43:44 grobian Exp $
+
+  18 Oct 2011; Fabian Groffen <grobian@gentoo.org> files/ld64-123.2-Makefile:
+  Fix USE=lto compilation thanks to patch from Charles Davis in bug #387481
 
   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

diff --git a/sys-devel/binutils-apple/Manifest b/sys-devel/binutils-apple/Manifest
index 8b245ea860b2e34ec91cc0c76f2667c903c80305..6eff139d77eda54c9edaffdaf2dfc452f4596fb7 100644 (file)
--- a/sys-devel/binutils-apple/Manifest
+++ b/sys-devel/binutils-apple/Manifest
@@ -20,7 +20,7 @@ AUX binutils-apple-3.2.3-ranlib.patch 2866 RMD160 3e9c64eea5676b872cbf60268ecb47
 AUX binutils-apple-4.0-as-dir.patch 1458 RMD160 b409d3cc62cdeb5a66af2c0939423066c288c07d SHA1 abcfbee6b4470786aa4e3aa30b951c3277a52c4b SHA256 b33439299340b311ef606e11427a7ded25b75e1d35791bb50d7815f4f87b6abc
 AUX binutils-apple-4.0-as.patch 2738 RMD160 f7601fc41f373f8e7ef122d059dd04ca42d400af SHA1 fb5f02cf3ead339c0e1723f89e996615f3c15d2f SHA256 b068f2a8bff9fb8f7dd92eb64c9587c9517ef51e682211f81b57e69b7e25fdef
 AUX binutils-apple-4.0-no-oss-dir.patch 604 RMD160 844f112ff9dfcd4618a8b1e8a65318397ea16c2c SHA1 beadc9fead70c8befe66eef7d024913d00b79e3f SHA256 fda851a89d86ecc4c90850b4d744daae478e2e55f83522d51a50c2a28f09223f
-AUX ld64-123.2-Makefile 1410 RMD160 2984ea9528d35cf77090237d95568873b299405b SHA1 821d1c513850ffe7db562a4de4927e80f8a6ebb1 SHA256 49a46695577fbf969bd84c674efb63b6de5362aff50689b642d57cda42ddbd9c
+AUX ld64-123.2-Makefile 1472 RMD160 bc00197c0048e0dfaf582f4b53c54fa78e124f4a SHA1 0be029edd6bd799f1f3c302667fc2515a199e153 SHA256 c37c24e79bb9cd5f4a1b9acaa4c61b9dd29bdba1c9a2d5685b4421996f4eebd0
 AUX ld64-123.2-darwin8-no-mlong-branch-warning.patch 790 RMD160 00f8bdb53843777e615d9d7947378d914c7cf077 SHA1 26d3f38a847b4a1d21397d5599ece60d25d30f83 SHA256 d3d5750998000a5fe296efff3298c0096ebbd9118c637a67b070f93acadea4ef
 AUX ld64-123.2-debug-backtrace.patch 338 RMD160 1b9b8739da7dc70544f413e30c7fc88103af4ecc SHA1 ebfa3b86fe2a9931f5a814c00f697bf6936f76b5 SHA256 26b16aa555bb15dcb6d799785aed0d240e50cbe0a77968a2a4fe92623bd105ab
 AUX ld64-123.2.1-lto.patch 6387 RMD160 e4ae378f7328875898f03d8b5db59e6f15c2a9ce SHA1 70189a53ddc53c96cdc2f9090f67ad1cb1e9c20e SHA256 5a8c0d0673a48db3cbb08c8234763bdb2149294cebc7707bf394461a73d9ae65
@@ -57,12 +57,12 @@ EBUILD binutils-apple-3.2.3-r2.ebuild 6669 RMD160 8a32c0be4ec8a6e8c89f5c2155fb17
 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 7849 RMD160 a510ae60ea26e5a6a3974840b83ed3c85a1989e4 SHA1 68c39c1353bb093b5e2d0a08f893958286db1819 SHA256 c0c1b32032744a35729375783e50d77ef72c348521f7382f241cee93480eea92
-MISC ChangeLog 8251 RMD160 17b2c885cff489fee7691a14101a140d65d5b1c6 SHA1 4ba3bace5756b4f3fb7707fd5d8ac398121ba925 SHA256 88a760cc00520274abe94942896faa1985d91e1534a3ce541ce23a64059f4bde
+MISC ChangeLog 8406 RMD160 ec23d068dc2b823365a903b47b9f60ed787d01f5 SHA1 b1b1e3ea118afbfd80bdde9c5221083df397d644 SHA256 2446645fd0842296cad5f36229d5d8eddd194bbe5b865c65f085cbd69e13d192
 MISC metadata.xml 250 RMD160 1d572689c02f6408ad8dfcfc955f8dfb7ec3a201 SHA1 dbd7759df5303c9dd998023753a3361206bad1e2 SHA256 f783a2767bd8eb2edebc0b1b1391fdcb461dcdb7a7c99dc1b82504c466688e79
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5+9SQACgkQX3X2B8XHTomJ0ACeLXyB6XXQEzcWO0LsNaeK8xY1
-T80An1obp3roB8pNtzGy1lOXG+eJLgMM
-=nRdR
+iEYEARECAAYFAk6drMYACgkQX3X2B8XHTolSWwCfYyVGjo3kP7ini/U6KL7zX10J
+9ZMAoJls93Kyral+/bqYIuKRMKeAGBqj
+=9/Uc
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/binutils-apple/files/ld64-123.2-Makefile b/sys-devel/binutils-apple/files/ld64-123.2-Makefile
index bd60c60cff0f14890bf98231147dc8efb94dafe9..bf8c8a040b99fbf6fbbefc59fb41d910fbefaa48 100644 (file)
--- a/sys-devel/binutils-apple/files/ld64-123.2-Makefile
+++ b/sys-devel/binutils-apple/files/ld64-123.2-Makefile
@@ -18,14 +18,17 @@ LD64LIBS=ld/parsers/archive_file.o ld/parsers/macho_relocatable_file.o \
                 ld/Options.o ld/Resolver.o ld/debugline.o ld/ld.o
 
 ifeq ($(LTO),1)
-LD64LIBS += ld/parsers/lto_file.o
 CPPFLAGS += "-DLTO"
+LTO_OBJ = ld/parsers/lto_file.o
+LIBLTO = -lLTO
 else
 CPPFLAGS += "-ULTO"
+LTO_OBJ =
+LIBLTO =
 endif
 
-ld64: libprunetrie.a $(LD64LIBS) version.o
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+ld64: libprunetrie.a version.o $(LTO_OBJ)
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
 
 rebase: other/rebase.o
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
@@ -36,8 +39,8 @@ dyldinfo: other/dyldinfo.o
 unwinddump: other/unwinddump.o
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
 
-ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o
-       $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
+ObjectDump: other/ObjectDump.o ld/debugline.o ld/parsers/macho_relocatable_file.o $(LTO_OBJ)
+       $(CXX) $(CXXFLAGS) $(LDFLAGS) $(LIBLTO) -o $@ $^
 
 machocheck: other/machochecker.o
        $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^