Make clang 3.4.2 find Prefix headers on Darwin, force for virtual deps in untouched...
authorFabian Groffen <grobian@gentoo.org>
Mon, 10 Nov 2014 20:38:05 +0000 (20:38 +0000)
committerFabian Groffen <grobian@gentoo.org>
Mon, 10 Nov 2014 20:38:05 +0000 (20:38 +0000)
Package-Manager: portage-2.2.14_rc1-prefix/cvs/Darwin i386
RepoMan-Options: --force
Manifest-Sign-Key: 0x5F75F607C5C74E89

sys-devel/llvm/ChangeLog
sys-devel/llvm/Manifest
sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch [new file with mode: 0644]
sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch [new file with mode: 0644]
sys-devel/llvm/llvm-3.4.2.ebuild
sys-devel/llvm/llvm-3.5.0.ebuild
sys-devel/llvm/llvm-9999.ebuild

index a4db6a8fba5eb8bcf6a44774c2f34516c99bcfa3..de56b4f82165a67f872a30577f380d5623f6a92c 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/llvm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.209 2014/10/20 07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/ChangeLog,v 1.210 2014/11/10 20:37:57 grobian Exp $
+
+  10 Nov 2014; Fabian Groffen <grobian@gentoo.org> llvm-3.4.2.ebuild,
+  llvm-3.5.0.ebuild, llvm-9999.ebuild, +files/clang-3.4-darwin_build_fix.patch,
+  +files/clang-3.4-darwin_prefix-include-paths.patch:
+  Make clang 3.4.2 find Prefix headers on Darwin
 
   20 Oct 2014; Michał Górny <mgorny@gentoo.org> llvm-3.5.0.ebuild,
   llvm-9999.ebuild:
index 6dfcb19d19b5073eafe02283305839e14f12cb72..4ca2c2c830dfc49bf8856d7428b385c26d612603 100644 (file)
@@ -6,6 +6,8 @@ AUX cl-patches/0002-r600-Add-get_global_size-and-get_local_size-intrinsi.patch 1
 AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 SHA256 f4b22281d21e39bc4681519cec90243c0e50262ce56ae68b0a8d9e7d92ce0375 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763 WHIRLPOOL bb68797804c89f8797561964697a72a015daf2c951d92f490f8c83f38aac6f50ce1527f39b53ccc6a3d93f84ec8f868e40340a5472b9e7ee4c34ceaa4b9ca845
 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_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
 AUX clang-3.5-gentoo-runtime-gcc-detection-v3.patch 1694 SHA256 24691db819d08f87f0144a67900ae6797c0df4d180b55acc5c377d890ac2e72e SHA512 a34f694560ef0c7366ad0dc243a479afc74b6122d624b8681538da69c70d0d1869245a89c61d49add890c5f76134281470f5e75a59e6fc9ac963230fc56fe8e6 WHIRLPOOL 4f4af09e08c7d5af89558e77d0a2a4542f77ae505e9020ca6e48e20ef71c4db6016ed0211b2a303b756994f62949c91c216cc2f81b16ff65c71414d354977c8f
@@ -66,27 +68,15 @@ EBUILD llvm-3.2.ebuild 6534 SHA256 eb16cc91887fdb035722d268caaa3e4843825403786fc
 EBUILD llvm-3.3-r3.ebuild 14190 SHA256 d16d933d6791ef7dbe08aa43340bb9924e063af11fa9e13ca8230509240d2c15 SHA512 c986e970f489f7ff79188043db397383e3c567735c8f4a1e8a13b89ef6a3a9f4b8550218444eadd04ef3a14143ab05dc839b3dbe935128f5437157d3aaec02cf WHIRLPOOL 910f7d65902548270835371a5076c746534c0b57487fb8fb149a893454e86e942beed284d6b7491cfb2f043a6e19554f97aec829067938192e75f64bd0fd7a7c
 EBUILD llvm-3.3.ebuild 6798 SHA256 4e53042e76ce97e6a460cda74c5dbadc1cee9009345e8f0232e28d53c8f77579 SHA512 5513887c3b5a25a678713b68c216a40801ddecbf5a4dc58d7ad01c1ec8411589e20d8662c34f117e6d64924302504c8ce74b48f3edca1f292b56881eb6176271 WHIRLPOOL 79d6adefc281699477a271f76cb8eb7992d0946b6fcda9149a0976c30138ac882f735eff08c25c0edf37ccc8e31700f6d2d51d38c354c82c06695962e8f9243b
 EBUILD llvm-3.4.1-r2.ebuild 15077 SHA256 94f31817c9f0a2aedb4414b4eacaae095b5d5ee5f8b6da3428f82b6d952666a2 SHA512 f20735560a5a549123923baa313345c619f23dacb07e8fa39f25f0a3eb3e3bce602fb5d28c575b5cc770f42cb958715268868ca6935a66f3ab3a48d60aa4da1f WHIRLPOOL cb91ad2052864bd5cd5ad34891fbf9cbb357796b5798ed0d751e254cd3689fb31cbd5d58e47f9a98759706306983ea2f70972a0717cb38b46258efea187b3e9d
-EBUILD llvm-3.4.2.ebuild 15095 SHA256 4207332bf36b6ea4e4f29e82c48a57e24d532b09ab62d938cfae8aa1a8fbdf2b SHA512 bedd3bc2d442a8f0a062105da5e585460115c8f267dae1c6b0faf378675747619b1bd7c238294094c7ebb7bf74cea794ee8695c6f2f2b27517e40c0c988627c5 WHIRLPOOL 467b3c0900868145a05059566f53158560f512b2ef715593bd6edf49e4346a6bd2f980c4445e679efdf19463c5cd3b657eb5ad3ecdb09f7a75f6a3b6444e94ab
-EBUILD llvm-3.5.0.ebuild 14582 SHA256 78f436e67de1ac3b9f98991598eecf7e91b2fe1c923e0264bc65a162d39d0200 SHA512 37f46d947f9b1fe1f908dbbaf93edfacf6fa3eaad008098329b073cc61caad07e6faa822a4f1e5095de9efe5cc4bfb40bfb588a45452dc5eb0659091a0c51f83 WHIRLPOOL 0a64272139c4e95c83962f954304b87c4fc6c473427b9514b90e2de18fd2af7c84971043cb750117d4cd129de620057e591bef3e093b1c8f34e9f2dbc84a1961
-EBUILD llvm-9999.ebuild 13776 SHA256 3f93b355bed256dd03d2f7a8e79b718f1d10d35f993d0b03bb7fa2dcca761ae0 SHA512 781d1880aa1833c5f5c1466c5f5695896b6426ff2bc21ce1eee60b103b1f4009f6fff185d3458996696e226db9dedcfdfad273ec7984ede6b93a3332f42e78ce WHIRLPOOL 0f9d94ec61aae58955477cda3b861dc6d4c91477927452b39059212df68b169deb5f2d596d1289cf4bdb0d788c4ded63f833a286dedb1d97bcfbc91d39cc3a8e
-MISC ChangeLog 35229 SHA256 c6daf0ad7ac32d624da8a64bb7dd550da855828a17f606d1a009339bf1fe0900 SHA512 32fe9998f34b4380181e5fb60561363e2d13c8ede1adf409a4f1448401d74e8a903c5c0389e127c3dbdf87ed69bb15ea8d95c388f359f6b0efc38259ed79e44a WHIRLPOOL 52a72e25cf2dbcfd33250c2e206e32b2fa3285403f54d3e49b41ee8dc6fdac7e32c5015d57f013c16d0ceb337e8ef8c042ea5f2e6c7d174a5bbca457860e9638
+EBUILD llvm-3.4.2.ebuild 15530 SHA256 a3afbf82934d4a4386ec7c476b6bc0549a31d2629ceba3e03f45f2efc607c0a7 SHA512 d6d0bbbd705af2209cc1b8949a5ecd3db780fb98d0a9a8c3c55b08cc1e445a557e4442e4cfe9e68aa989798bf8c2190f6808c3b3486b7e4447d9a9cb002d6efa WHIRLPOOL 7649d1f9dd8f1d45cf6fab4b1e5270376ec9dea49593e478f2c604e544a07fe81ac74c905ccb22ff394894dac4e080b4571d68da1acc998a025744bcca6f0cb4
+EBUILD llvm-3.5.0.ebuild 15013 SHA256 cdcb1b3e3bd83f947c4741d5304c8c05eb5efe5e37e436116b30c6f5e3f0b1af SHA512 91c174381d58daa320623a6c7a79a2d775922e91f13078aca52f85f2ae3ed6b193f095523d12471715e1d76be818da8582e8c2067d0a361c5981101c205207d3 WHIRLPOOL 5ed99698fdd07673e713644d11c5c6da7746290206632b5d8fc7918eafba96ecaad350f511407c87531a3dee1e9e315f2a1240a472b84d6bbb7f0f03cfdecb46
+EBUILD llvm-9999.ebuild 13770 SHA256 6370af2eecfdb0005b592bec23885d76f538ef737bf1a77dca6436074a4bad13 SHA512 ea546191ed55812b78874fe23c9b08efc42989a276518e2f6c62bec6bd946afeac889414521f0b033f6d027730cb2cdd73103bf92c7a6eb63af9b2a9c8673bd3 WHIRLPOOL f1de58be1bc263b7bc39ba180c5eb236c7116516e8799cea32f5e7316db43e4d3fb8e387e2a42c08ad39e468ab10dd2c252453bdbd790b1b61d01216549df0e9
+MISC ChangeLog 35484 SHA256 3e95dcb444757e86a44c795bdd0cfc886c1100aa70859e47ed391c6b9ba20947 SHA512 cf0b21bdb207f2957d37000b5cd4d2536117bb8d50413d607d4ec919ec153280470f69f3bac2f66a5203858ce32cd9e1593e3e5cf428e8ae5b84f9498f62d99e WHIRLPOOL f5955f8dd4df7a49bce1a2c44ca0c140b1c977e76e0c7cb4d11813f831ab6443280e9ae2428c3be0c752d05889bb946c0675b9620b11ce195677f2b2ab0a3cc8
 MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJURLTmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzCIQAKNWaIh7NiNVKxPDFt6EQf35
-2LdOmuey4ZIVZmGCr1b5/9rDilEdy+UfRp2qGL0xgk9OGvO5+fD/0rN6/yaevs9h
-GYJxAHZa4z831LiJtga9iCc1o9VIWhlu/R+dmWxAlo76sekbzcqpBg9FrcGjoN4n
-iak+G+lyO1a7v05pfi8+vUWi8sEVTVy1GdbP9gsRomtZWBsxLbKwb5OPRrxaypNY
-pPTQCKby0I8WeY+SMja5QZvoGXGZyi2JKf9DSN36XD/9WpxjQjDSZsceZbSBG0vi
-ETct0+e3z5RAJHCKCTZNCKCKyBo5tox5MsL/FZa991VxGPY1y/z463UxeV3eZSZf
-en+8VAqjycFpzOsg5PpseBD0F7VvAq13q5yh7lhbgrdXzO6IELK+KNTsb9COQ14l
-+bTN2nzOdMAWsnqU8lzLrqe/Ak/oXHQkYo5neOT83Aj0soHKThVdO3ndjI2euAoz
-UVQL6K28VeNWtX39khLuz5yHPSwH+/7x92gFA3VQTEGN8RHfaY8DXuT9FBd1WCW8
-/WaviNgS9KYxsh0Z15IWL4UumfDCoRVGeThOptCmCZxyZ4OYL82J3qe4q22KaplY
-m0clD9pk9eV6dCundB79B4CFisen2oidWtTetH4v8gTpSEMkDmS25xqHSpfid7ZM
-DNHMBlbyWhN/WeJrqLxU
-=9o0R
+iEYEAREIAAYFAlRhIigACgkQX3X2B8XHTomTawCdEEA6BKlWINagNOJ8tPDLJsfF
+lNgAn0aR+SEwX8uGkFtF844CeGpbKsPA
+=Y58J
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch b/sys-devel/llvm/files/clang-3.4-darwin_build_fix.patch
new file mode 100644 (file)
index 0000000..113b04b
--- /dev/null
@@ -0,0 +1,47 @@
+Our (gcc/binutils) toolchain doesn't do ARM targets, hence we will get
+"unable to interface with target machine" errors while building if we
+attempt to.  Disable those targets.
+
+Patch by Reza Jelveh from
+https://github.com/fishman/timebomb-gentoo-osx-overlay/blob/master/sys-devel/llvm/files/llvm-3.4-fix_darwin_build.patch
+
+--- a/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
++++ b/projects/compiler-rt/make/platform/clang_darwin_embedded.mk
+@@ -27,20 +27,20 @@ UniversalArchs :=
+ # Soft-float version of the runtime. No floating-point instructions will be used
+ # and the ABI (out of necessity) passes floating values in normal registers:
+ # non-VFP variant of the AAPCS.
+-Configs += soft_static
+-UniversalArchs.soft_static := armv6m armv7m armv7em armv7
++# Configs += soft_static
++# UniversalArchs.soft_static := armv6m armv7m armv7em armv7
+ 
+ # Hard-float version of the runtime. On ARM VFP instructions and registers are
+ # allowed, and floating point values get passed in them. VFP variant of the
+ # AAPCS.
+ Configs += hard_static
+-UniversalArchs.hard_static := armv7em armv7 i386 x86_64
++UniversalArchs.hard_static := i386 x86_64
+ 
+-Configs += soft_pic
+-UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
++# Configs += soft_pic
++# UniversalArchs.soft_pic := armv6m armv7m armv7em armv7
+ 
+ Configs += hard_pic
+-UniversalArchs.hard_pic := armv7em armv7 i386 x86_64
++UniversalArchs.hard_pic := i386 x86_64
+ 
+ CFLAGS := -Wall -Werror -Oz -fomit-frame-pointer -ffreestanding
+ 
+--- a/tools/clang/runtime/compiler-rt/Makefile
++++ b/tools/clang/runtime/compiler-rt/Makefile
+@@ -85,7 +85,7 @@ RuntimeLibrary.darwin.Configs := \
+       profile_osx.a profile_ios.a \
+       ubsan_osx.a
+ RuntimeLibrary.darwin_embedded.Configs := \
+-      soft_static.a hard_static.a soft_pic.a hard_pic.a
++       hard_static.a  hard_pic.a
+ 
+ # Support building compiler-rt with relocatable SDKs.
+ #
diff --git a/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch b/sys-devel/llvm/files/clang-3.4-darwin_prefix-include-paths.patch
new file mode 100644 (file)
index 0000000..f5f1d9e
--- /dev/null
@@ -0,0 +1,18 @@
+--- tools/clang/lib/Frontend/InitHeaderSearch.cpp
++++ tools/clang/lib/Frontend/InitHeaderSearch.cpp
+@@ -233,6 +233,7 @@
+     case llvm::Triple::Bitrig:
+       break;
+     default:
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/usr/include", System, false);
+       // FIXME: temporary hack: hard-coded paths.
+       AddPath("/usr/local/include", System, false);
+       break;
+@@ -505,6 +506,7 @@
+   // Add the default framework include paths on Darwin.
+   if (HSOpts.UseStandardSystemIncludes) {
+     if (triple.isOSDarwin()) {
++      AddPath("@GENTOO_PORTAGE_EPREFIX@/Frameworks", System, true);
+       AddPath("/System/Library/Frameworks", System, true);
+       AddPath("/Library/Frameworks", System, true);
+     }
index 4002db0aaca9f1ca8a27ab0e454c0e485cca8dc6..9c1bb5ee6d3f07d3578040216432d48007d0e28e 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.3 2014/09/17 23:29:09 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.4.2.ebuild,v 1.4 2014/11/10 20:37:57 grobian Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 pypy )
 WANT_CMAKE=cmake
 
 inherit cmake-utils eutils flag-o-matic multibuild multilib \
-       multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
+       multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -22,7 +22,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.gz
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold +libffi multitarget ncurses ocaml python
        +static-analyzer test udis86 xml video_cards_radeon
        kernel_Darwin kernel_FreeBSD"
@@ -179,11 +179,14 @@ src_prepare() {
                epatch "${FILESDIR}"/clang-3.1-gentoo-runtime-gcc-detection-v3.patch
 
                epatch "${FILESDIR}"/clang-3.4-gentoo-install.patch
+               epatch "${FILESDIR}"/clang-3.4-darwin_build_fix.patch
+               epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+               eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
        fi
 
        if use prefix && use clang; then
-               sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-                               -i 'projects/compiler-rt/make/platform/clang_linux.mk' || die
+               sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+                       projects/compiler-rt/make/platform/clang_*.mk || die
        fi
 
        local sub_files=(
@@ -442,11 +445,11 @@ multilib_src_install() {
 
        # Fix install_names on Darwin.  The build system is too complicated
        # to just fix this, so we correct it post-install
-       local lib= f= odylib= libpv=${PV}
+       local lib= f= odylib= ndylib= libpv=${PV}
        if [[ ${CHOST} == *-darwin* ]] ; then
                eval $(grep PACKAGE_VERSION= configure)
                [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-               for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do
+               for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
                        # libEnhancedDisassembly is Darwin10 only, so non-fatal
                        # + omit clang libs if not enabled
                        [[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -457,21 +460,32 @@ multilib_src_install() {
                                "${ED}"/usr/lib/${lib}
                        eend $?
                done
-               for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do
+               for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
                        # omit clang libs if not enabled
                        [[ -f ${ED}/usr/lib/${lib} ]] || continue
 
-                       odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib)
-                       ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-                       install_name_tool \
-                               -change "${odylib}" \
-                                       "${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
-                               -change "@rpath/libclang.dylib" \
-                                       "${EPREFIX}"/usr/lib/libclang.dylib \
-                               -change "${S}"/Release/lib/libclang.dylib \
-                                       "${EPREFIX}"/usr/lib/libclang.dylib \
-                               "${f}"
-                       eend $?
+                       scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+                       while read odylib ; do
+                               ndylib=
+                               case ${odylib} in
+                                       */libclang.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+                                               ;;
+                                       */libLLVM-${libpv}.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+                                               ;;
+                                       */libLTO.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+                                               ;;
+                               esac
+                               if [[ -n ${ndylib} ]] ; then
+                                       ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+                                       install_name_tool \
+                                               -change "${odylib}" "${ndylib}" \
+                                               "${f}"
+                                       eend $?
+                               fi
+                       done
                done
        fi
 }
index 72cdedab1f5f3c53f16b44d3b72389d701760081..f63f50a8995e75ef7f155476304fb0e69431663b 100644 (file)
@@ -1,13 +1,13 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.4 2014/10/20 07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-3.5.0.ebuild,v 1.5 2014/11/10 20:37:57 grobian Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 pypy )
 
 inherit eutils flag-o-matic multibuild multilib \
-       multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs
+       multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix
 
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="http://llvm.org/"
@@ -19,7 +19,7 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.5"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold libedit +libffi multitarget ncurses ocaml python
        +static-analyzer test xml video_cards_radeon
        kernel_Darwin kernel_FreeBSD"
@@ -75,6 +75,7 @@ S=${WORKDIR}/${P}.src
 CMAKE_MAKEFILE_GENERATOR=emake
 
 pkg_pretend() {
+               $(tc-is-static-only && echo --disable-shared) \
        # in megs
        # !clang !debug !multitarget -O2       400
        # !clang !debug  multitarget -O2       550
@@ -154,11 +155,13 @@ src_prepare() {
                epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
 
                epatch "${FILESDIR}"/clang-3.5-gentoo-install.patch
+               epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+               eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
        fi
 
        if use prefix && use clang; then
-               sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-                               -i 'projects/compiler-rt/make/platform/clang_linux.mk' || die
+               sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+                       projects/compiler-rt/make/platform/clang_*.mk || die
        fi
 
        local sub_files=(
@@ -429,11 +432,11 @@ multilib_src_install() {
 
        # Fix install_names on Darwin.  The build system is too complicated
        # to just fix this, so we correct it post-install
-       local lib= f= odylib= libpv=${PV}
+       local lib= f= odylib= ndylib= libpv=${PV}
        if [[ ${CHOST} == *-darwin* ]] ; then
                eval $(grep PACKAGE_VERSION= configure)
                [[ -n ${PACKAGE_VERSION} ]] && libpv=${PACKAGE_VERSION}
-               for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib ; do
+               for lib in lib{EnhancedDisassembly,LLVM-${libpv},LTO,profile_rt,clang}.dylib LLVMHello.dylib clang/${libpv}/lib/darwin/libclang_rt.asan_osx_dynamic.dylib; do
                        # libEnhancedDisassembly is Darwin10 only, so non-fatal
                        # + omit clang libs if not enabled
                        [[ -f ${ED}/usr/lib/${lib} ]] || continue
@@ -444,21 +447,32 @@ multilib_src_install() {
                                "${ED}"/usr/lib/${lib}
                        eend $?
                done
-               for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib{LTO,clang}.dylib ; do
+               for f in "${ED}"/usr/bin/* "${ED}"/usr/lib/lib*.dylib "${ED}"/usr/lib/clang/${libpv}/lib/darwin/*.dylib ; do
                        # omit clang libs if not enabled
                        [[ -f ${ED}/usr/lib/${lib} ]] || continue
 
-                       odylib=$(scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | grep libLLVM-${libpv}.dylib)
-                       ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
-                       install_name_tool \
-                               -change "${odylib}" \
-                                       "${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib \
-                               -change "@rpath/libclang.dylib" \
-                                       "${EPREFIX}"/usr/lib/libclang.dylib \
-                               -change "${S}"/Release/lib/libclang.dylib \
-                                       "${EPREFIX}"/usr/lib/libclang.dylib \
-                               "${f}"
-                       eend $?
+                       scanmacho -BF'%n#f' "${f}" | tr ',' '\n' | \
+                       while read odylib ; do
+                               ndylib=
+                               case ${odylib} in
+                                       */libclang.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libclang.dylib
+                                               ;;
+                                       */libLLVM-${libpv}.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libLLVM-${libpv}.dylib
+                                               ;;
+                                       */libLTO.dylib)
+                                               ndylib="${EPREFIX}"/usr/lib/libLTO.dylib
+                                               ;;
+                               esac
+                               if [[ -n ${ndylib} ]] ; then
+                                       ebegin "fixing install_name reference to ${odylib} of ${f##*/}"
+                                       install_name_tool \
+                                               -change "${odylib}" "${ndylib}" \
+                                               "${f}"
+                                       eend $?
+                               fi
+                       done
                done
        fi
 }
index e3d1aa4429c6a02a9d0ae4f57ca897e6cc8de315..e84f45b3b8c519aae8679abf07d9656e72bf8e8d 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.92 2014/10/20 07:08:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/llvm/llvm-9999.ebuild,v 1.93 2014/11/10 20:37:57 grobian Exp $
 
 EAPI=5
 
@@ -155,8 +155,8 @@ src_prepare() {
        fi
 
        if use prefix && use clang; then
-               sed -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
-                               -i 'projects/compiler-rt/make/platform/clang_linux.mk' || die
+               sed -i -e "/^CFLAGS /s@-Werror@-I${EPREFIX}/usr/include@" \
+                       projects/compiler-rt/make/platform/clang_*.mk || die
        fi
 
        local sub_files=(