Add workaround for our older (Prefix/Darwin) toolchain

Package-Manager: portage-2.2.14-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

diff --git a/sys-devel/llvm/ChangeLog b/sys-devel/llvm/ChangeLog
index 3d53c7d69e492fc2c1fceaab6e82b1babfde00f7..90a2cca9c4e2b1a0dfe4551d62bfe52b6883b89e 100644 (file)
--- a/sys-devel/llvm/ChangeLog
+++ b/sys-devel/llvm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.217 2015/01/01 20:53:32 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.218 2015/01/11 20:05:43 grobian Exp $
+
+  11 Jan 2015; Fabian Groffen <grobian@gentoo.org>
+  +files/clang-3.4-darwin_old_linker.patch, llvm-3.4.2.ebuild:
+  Add workaround for our older (Prefix/Darwin) toolchain
 
   01 Jan 2015; Markus Meier <maekke@gentoo.org> llvm-3.5.0.ebuild:
   arm stable, bug #530882

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index f28d09d07de87f20c835e9083f96f678614656b7..3b7402cbe43d08da8f612af58e4d4fa4ca934e6a 100644 (file)
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -7,6 +7,7 @@ AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc
 AUX clang-3.3-gcc-header-path.patch 4309 SHA256 56e51c30b91f0ff264c27e332c5375672c035b8271a64860b9e940c918ebf7ac SHA512 568c82c34b56bd18e34122975a420f38ae9f190c9efec00383aa0802c1810297b1fef94a21093775ee20c4b30ad5800b4bbebd26e5cbc9358b11ce7b5165ac41 WHIRLPOOL 2ea6ba49110d6f0bb1f3c6f93f6788463cfcf67b19d9397a69ab4066d3fc1106d544bedc24668a5e515df561e992a7d59a27253a08fae02e622aad36962ace8f
 AUX clang-3.3-gentoo-install.patch 2815 SHA256 76a3ce245b1fb9cc5d391934755d27e248bdcbb9581ab7931287e75bf626aad5 SHA512 8105461ff031a7dc00e2a8ca9939afb56525bdc065beff7bb06f22525cb6ecf6b8196a1e0ac11fa3895dc29b4f04c24f61c5492859f23785285517775f3d69b6 WHIRLPOOL dbb5fc2596bee19ec9fff0c14b4a9e087a6ba4e3af115da956c43772cf44f2f480a21f86b15ec3890d74cc3fa3b9cb4e3bdbee341677fb8e79a640b0a5c8f6fa
 AUX clang-3.4-darwin_build_fix.patch 1876 SHA256 b2fe85911006affc8ac5fc68496c45845872cf4b37445910b8d10a5bfbe77fcc SHA512 54841b590e14b84f90b00ec782785181018196d076764e4048960d1321d18aac388e1220bdc70b10432dfb5fcad5a43af6c33124ec93df8bc3a724cceeee9260 WHIRLPOOL 8c1373a558619be095427d7986246524e5f7c1239ee706234debc2add1f03626d630a1e5216bdc7127f0b833eca791fae666765a27d394ecc55d394492f424ab
+AUX clang-3.4-darwin_old_linker.patch 630 SHA256 6b00cc7da39b70e75cbe3048ae2d9f181d3bf9e3d299721fa9b4ff1205d371e2 SHA512 ae9561b84de7566097c625c0e841d266d91c0fbd9ad5ee9b0b780ed1bb2e5c19adcd5a48dbe729729eb23b402573be6106b4f2cd380e3cda3854d0badf52c91d WHIRLPOOL 51250715d8cd94b11f4eb66b7313782d9ae599c295afd5f4fe3c69ef59c14797b15d31256cfd6b6d18401029a083584b964d6048a84024b2a31aa03fe0877f41
 AUX clang-3.4-darwin_prefix-include-paths.patch 710 SHA256 f76311dfc5fa734a3a72fa516f695486595963824d5b6891fd1454d71c27fa0b SHA512 e130d7392b82ffc40ec96c0ee45d53cf032c761e00a7a2382af1f826e2a892b12069a7f5407307e1828fb741e522b8e10728d593d839e1b5648ccf9460feff0e WHIRLPOOL d2b24e224cb90be9615994d64af92b139325b2630cc43851370b8989d0eb7ee8f43ad421e3036041a30ec1fb30c1e3ddaf09d54f461484963a2bd8ea2fba24c6
 AUX clang-3.4-gentoo-install.patch 3228 SHA256 051799f114102aa46717dc4a7224c878f7511b69a06090c501abe157c6025c5d SHA512 35127c66182ee1f698bf96731c11679c3fe162d9dcb524c06467598b374fcce94dd0484723acc0072ab1565c581e2fc74d6b7246484bfd9bf1511eb419a85c9b WHIRLPOOL 3d1644da31e9278bf0983bcaf1947b99570e71366b6cc868020c5978037795c27ae211c4d32562dfc1933ff2a4e9f8c0aab0248ac9c6c69fc954a830502d3f68
 AUX clang-3.5-gentoo-install.patch 2166 SHA256 e359a219f2d0d2b88094bbb5ab91fd50d9662686f77e85b7ccfb8d1c4a6fd39d SHA512 07e5b3d4131a7d58577bcb99a82c585258c98a38e71b7e8dda058b467a558471e1ddeec5c9f5492f5d17e280cd4b09e49338e0926dd2534583bc8a2772bce26d WHIRLPOOL 5582b2015b4d3e845a45bfda08c156683df11685170f253f79ccf016f2e771b016d213417d83068f01a41bd8e0148474711cd6f9b7187e758322e9ebb9c390dd
@@ -65,15 +66,15 @@ EBUILD llvm-3.0-r2.ebuild 5767 SHA256 62fca1169c63516f29102a3a1bb4ea74408dfd151d
 EBUILD llvm-3.1-r2.ebuild 6033 SHA256 9b9a587d30419fa646764a96e12fc6272f73f7246138c76ba577f0d6ab3afe59 SHA512 8b969084210af4203c029bb33d5b984e0b17f6770fd489dad818154ac9f6a87bfad069eff71776f678d9eb5d5136af472d3008d5bc73fab9dc1f36811af906c4 WHIRLPOOL 928459551d7cf6e8d18244026ba82cc3dbaf2b65bd6eac8adb617695c95535ba65bd013909730d5922de5764e9d6c6c4cf007aa6acd0b493826aa938d0389a5d
 EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fcf74643be2c6f8099f11 SHA512 e781a4e4416a4acee667029744dab7f8e52022df4fcbb89d4d9acf855549f1c0a1661b79ee0067fd052a36bad278f08a2ff7f6e6e44d8c3ea7f82910ac573d9b WHIRLPOOL 115d13959a22867266dd7c0133109ccba063e97972cc2c807fb7a6dd7d3fbef1726caf314e262f6683a97a2c3a6ff776f808de7d80923472fc692554eccbca27
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
-EBUILD llvm-3.4.2.ebuild 15628 SHA256 f20ecd20046059e2b3b3fa18cec3cf7ed22269d814b640a56756d70c7de39df1 SHA512 9a9185d9d24e3304e7664dd7e719a2fd9cd6e160b7b97be2e473c0867f40de7733e8ccc574d15c1d0b7ee7b314c62afa88cf45ec5bd344ba78ed391509f38bc9 WHIRLPOOL 3c60b96db4a79197c47746c43e43427320612792f61f5358256eddd4988a36b50cf3f26be6b0e88f866c8bba0f31a792ad9711b5ba07ec6ba98264a832057e89
+EBUILD llvm-3.4.2.ebuild 15684 SHA256 bf48165569f4e1d74e59315ad96183c2275a4ebd909460e9478ea5ece021da23 SHA512 0885736fb3e33aa6aa76c8f83e9280e66482e4748722f9ebb767e1ca47fa94e00ab2007702c7aa35a36c06103fa41ce00fa3a8123e9adc14bcc0778edc211cad WHIRLPOOL a659c1f8dc8452299ce98e7b9d7e66515b1c8fcf8922d97888bc761acbe4e6d40412c635e5bbee9207c68cdf9c46d13b3c8e4012f38abb54c930a1b2eab5348d
 EBUILD llvm-3.5.0.ebuild 15104 SHA256 f3f8698353f9c5d2c9e28ade63b4573e6efb5cbace7da0ee400cfcd7e3e486b6 SHA512 a3434a4ef8050300f9e7309e35693c0b928bb5b438d95c54cf76298f29669b16466711f341ef0d37a3b6817342667f18130d106a2e839fcac0855a0db519758a WHIRLPOOL 4f662cdf9fb8b53d17c6c958b9734e91a7d085bcba0d7ad32c8a21e079adc57f62ef925ae1d1016e1642452e62d2cba1e8a9e39241d783cca8baad43bf9045e5
 EBUILD llvm-9999.ebuild 13914 SHA256 96c731cfe077bec0da28a5dc82179e6e70bda7fc77c8c25ed4d64eca845738f8 SHA512 ed6a18ae0a1c59c3327d118d478a03e4a73953d9a5a3b2c0953ce80076f2d07db9e83e078a7af00e094191d2dc1c3372640340a63ccb7bac77a9756f679c5f98 WHIRLPOOL e70e3977d37f1dcbda3541f028c1d45065453f23ec280bba2aaab69386f390a2a2fea5cbfc7050ae16ef5beb0ff3336839e988b6cf8d95235097713d627fba8b
-MISC ChangeLog 36450 SHA256 5917c82a98fc44e883b3c80f1a378dc05ebd7d5ef16ce1bae8ee7dbe07f3398e SHA512 61307f82d47e8b8336bab701048e4446b5b4b0f2e41367a2f99dec246eec7559561373dd6627e8ee341a7045f8d57feeb0f6b74ccd1ee588698904159dc2b146 WHIRLPOOL fbdd9f732d61883f39180e993a4035b0a2c94b82e613021ce0761521ad5a6112779fec9c1fda6fe42a7971c006cacd4a95edb733a92a0e326bac2cca464ff41a
+MISC ChangeLog 36623 SHA256 a1108a138848d014a912f723b56f8d0eeadd83e69d1cf2a1184ea34a78fcda8e SHA512 f84c418730416b6d98205569b19bc785da6db4a3b2a133baf1f161a729eb322d236be6d3b3051587364675c987bc1a9eaa63e6f04b845776acf239f25c71ac73 WHIRLPOOL f1c950813fdabbcb0f787286ba3b6a859e317850ccab2bf7f70f55dfe02083a09294f5b1ddb983f63935a981006e52144d00d1a00606f4d644ce631172300b49
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSls80ACgkQkKaRLQcq0GIuGwCgq+vC1Wh+xSeTfQ/za1YirFkx
-SzAAn1XmIjquYHsAvvk1bbdTC49znpE+
-=LI7G
+iEYEAREIAAYFAlSy15gACgkQX3X2B8XHTomntwCfVZV45AJNM38X/2JAWimDDZ8I
+oN8AoKF+OlmWFey20yKClAzAexi7Vea4
+=pVzl
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/llvm/files/clang-3.4-darwin_old_linker.patch b/sys-devel/llvm/files/clang-3.4-darwin_old_linker.patch
new file mode 100644 (file)
index 0000000..78a7895
--- /dev/null
+++ b/sys-devel/llvm/files/clang-3.4-darwin_old_linker.patch
@@ -0,0 +1,15 @@
+The linker shipped with 10.8 knows to use _main as the entry point,
+however, we (Prefix) couldn't keep up with linkers, so we can't assume
+the linker is able to do this.
+
+--- tools/clang/lib/Driver/Tools.cpp
++++ tools/clang/lib/Driver/Tools.cpp
+@@ -5006,7 +5006,7 @@
+                 CmdArgs.push_back("-lcrt1.o");
+               else if (getDarwinToolChain().isMacosxVersionLT(10, 6))
+                 CmdArgs.push_back("-lcrt1.10.5.o");
+-              else if (getDarwinToolChain().isMacosxVersionLT(10, 8))
++              else
+                 CmdArgs.push_back("-lcrt1.10.6.o");
+ 
+               // darwin_crt2 spec is empty.

diff --git a/sys-devel/llvm/llvm-3.4.2.ebuild b/sys-devel/llvm/llvm-3.4.2.ebuild
index 6356305ffd8c5b6ee8f8d32514c8007f34cab088..a994c39fa8d9672f1849b00e958ce4e54b28b689 100644 (file)
--- a/sys-devel/llvm/llvm-3.4.2.ebuild
+++ b/sys-devel/llvm/llvm-3.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.5 2014/11/26 16:13:33 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.6 2015/01/11 20:05:43 grobian Exp $
 
 EAPI=5
 
@@ -180,6 +180,7 @@ src_prepare() {
 
                epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
                epatch "${FILESDIR}"/clang-3.4-darwin_build_fix.patch
+               epatch "${FILESDIR}"/clang-3.4-darwin_old_linker.patch
                epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
                eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
        fi