commit: e63ee31ad20bfd2d7e2159c63b62913bfd001353
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 27 22:35:24 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Jan 27 22:35:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e63ee31a
sys-devel/llvm: add (masked) 3.8 release candidate for testing
Package-Manager: portage-2.2.27
profiles/package.mask | 5 +
sys-devel/clang/clang-3.8.0_rc1-r100.ebuild | 36 ++++++
sys-devel/llvm/Manifest | 5 +
.../llvm-3.8.0-compiler_rt_arm_march_flags.patch | 17 +++
.../{llvm-9999.ebuild => llvm-3.8.0_rc1.ebuild} | 134 ++++++++++++++-------
sys-devel/llvm/llvm-9999.ebuild | 4 +-
6 files changed, 158 insertions(+), 43 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index e11faa4..520c128 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,11 @@
#--- END OF EXAMPLES ---
+# Bernard Cafarelli <voyag...@gentoo.org> (27 Jan 2016)
+# New llvm version, masked for testing
+=sys-devel/llvm-3.8.0*
+=sys-devel/clang-3.8.0*
+
# James Le Cuirot <ch...@gentoo.org> (26 Jan 2016)
# No new release since 2008. Removal in 30 days.
app-cdr/webcdwriter
diff --git a/sys-devel/clang/clang-3.8.0_rc1-r100.ebuild
b/sys-devel/clang/clang-3.8.0_rc1-r100.ebuild
new file mode 100644
index 0000000..1ba7a70
--- /dev/null
+++ b/sys-devel/clang/clang-3.8.0_rc1-r100.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib-build
+
+DESCRIPTION="C language family frontend for LLVM (meta-ebuild)"
+HOMEPAGE="http://clang.llvm.org/";
+SRC_URI=""
+
+LICENSE="UoI-NCSA"
+SLOT="0/3.7"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="debug multitarget python +static-analyzer"
+
+RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
+
+# Please keep this package around since it's quite likely that we'll
+# return to separate LLVM & clang ebuilds when the cmake build system
+# is complete.
+
+pkg_postinst() {
+ if has_version ">=dev-util/ccache-3.1.9-r2" ; then
+ #add ccache links as clang might get installed after ccache
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ fi
+}
+
+pkg_postrm() {
+ if has_version ">=dev-util/ccache-3.1.9-r2" && [[ -z
${REPLACED_BY_VERSION} ]]; then
+ # --remove-links would remove all links, --install-links
updates them
+ "${EROOT}"/usr/bin/ccache-config --install-links
+ fi
+}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 6112cab..177b034 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -5,12 +5,14 @@ DIST cfe-3.5.2.src.tar.xz 8268008 SHA256
4feb575f74fb3a74b6245400460230141bf610f
DIST cfe-3.6.2.src.tar.xz 8617576 SHA256
ae9180466a23acb426d12444d866b266ff2289b266064d362462e44f8d4699f3 SHA512
ed837c48f38d8998efd675b56477c8681dcedfcf3f71bba65930f145501289bebb6fe6a6d9de336548f94c381d016b99f10c58e046b885449755d44ac782de03
WHIRLPOOL
a17419cea329999c8662c0008dbd0391ed5f52045d0175488979e7620f6a9a21b08e451a5e21d3bf944597bb37934a8228fa89c09d773882359822d59bd447a8
DIST cfe-3.7.0.src.tar.xz 9147204 SHA256
4ed740c5a91df1c90a4118c5154851d6a475f39a91346bdf268c1c29c13aa1cc SHA512
099d34cb019ea548c6ee85efd22b150beba0aa92061394fa3e423b1ebfe4a5c98c0586e5d56fc5c39e2b1606d36db59f442c056cc59473e32df76c8790c9d0ae
WHIRLPOOL
1078d962edfb1b90044f19921f64a28c32259e34d983ddf9f9c198d13c8cd0679778a640d7a06c0bf1224d982602294c79a510034276216e3a6de21c739e6c39
DIST cfe-3.7.1.src.tar.xz 9110616 SHA256
56e2164c7c2a1772d5ed2a3e57485ff73ff06c97dff12edbeea1acc4412b0674 SHA512
8e3285a32ad0fd4721fa77c4fb9709f31bb4e4f7cb5245357aaf57b0767b6ef18a30d902b59d1437a6febffb6c2128214f9ce5aa913bb298743221a28c4f9de5
WHIRLPOOL
ce300f5023bddda59ee055e4dccdca8bf459fae5d4e91c44262d2830c406b798d697d1bf3c6326ff41b969a8439f94a3c83570f1d0151a7f0223eb0d8f324f7b
+DIST cfe-3.8.0rc1.src.tar.xz 9621648 SHA256
11cd5e001fe83a55040a976c8e7d7b2c808534980df16b97b200b3b897df89c3 SHA512
c22ca7630b3433fd5b3e4f81380efd1156111acaf29c94b6010fdf4295e4e08afe8e1d1719e05a6fe524adc6bea087b3a84c54f2052f920719529796c766a63f
WHIRLPOOL
a08e671cc2ac621199e3763585cf0a84ba5f85b7916043242033d654574f2ead217825974b3d235c66cad55f4617b322e16ca5dfe4fa9efb2ee7b55a94b2025b
DIST clang-tools-extra-3.4.src.tar.gz 230729 SHA256
ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 SHA512
9656678acea490fd5674b2d47ad30ec69e5aedb450924e566a90418c94ce6483faa254e7dde0d5163cb0643153113d27b6b000fea7bba08f0ba55741b35873b1
WHIRLPOOL
c41ec11d0b88678c56d77d285c4383a39cabab16aae8a4457666014e0927aa4b04cf77e73af0275e6bfc603a9531598eca98ab61d5d81288e2920682088d9eaf
DIST clang-tools-extra-3.5.0.src.tar.xz 216256 SHA256
2981beb378afb5aa5c50ed017720a42a33e77e902c7086ad2d412ef4fa931f69 SHA512
5ff2cc5d143b78fbe6645486f02e50f738a92aaf6b8e85cfc6f91e659684686b12e61fc8f00b814b4372c5ed2c2b1be5eca61ea696fbe074b815877b799534ee
WHIRLPOOL
10b5afc550fa6a8c33739fbf9268e934732b2892842d398152676e66ab90aed3c6e1bae02bc1b8aa0a9a917b6b450f60950317a9eda3f9e377971cbe00164b11
DIST clang-tools-extra-3.5.2.src.tar.xz 215804 SHA256
f21a374d74b194d8c984546266491b518859b5f12ed9abd49337b8060d3fc004 SHA512
6a8e662d2704147296c13626fbc5885911c646c67404f12eacc67ee2995221445bf4f6122b271b9cb3a56b716f550a651024822f72358d400b9052bf50423669
WHIRLPOOL
088d2725a88a439a1a2c4048e0eaf540587078078bd1c9823a4804200265cab4d32606abf5e72be76da45ea4aa6e7a7201a2bdbddc78d5f9e0024b0d7b59e222
DIST clang-tools-extra-3.6.2.src.tar.xz 248624 SHA256
6a0ec627d398f501ddf347060f7a2ccea4802b2494f1d4fd7bda3e0442d04feb SHA512
1b7710a7deee30cefb6a3b4edb026a96d8935a0c6f3056ccdb7a45564d10baf01a4f6722ae853ad9a3bad17e8de32a3c0ec99c5cf6144647a5e182809d403f7a
WHIRLPOOL
3dc8888c302bac84f53b673784dec092a2c59ea2985d9983e87f057b9aa7b5d3e34cf13d2b0f1f60ea44f342b8167377204a510036872a087037cf02335c19cd
DIST clang-tools-extra-3.7.0.src.tar.xz 276628 SHA256
8ae8a0a3a96b7a700412d67df0af172cb2fc1326beec575fcc0f71d2e72709cd SHA512
c266eb327e2f50767b7d37c9d5713d6c70f590b59e4fe09d997f2eba0d54c9229ef6c8a2a903196380f67dffa7e35ebb47a9e5f2f097fd2a3c363481b72202eb
WHIRLPOOL
681a5c14301990bb945e26375d0d31fa22b795101f342bcaaeb9d3e015c0f0f6b260b913388d086cb3054fc357845b34a6813e34614cdfa0de2c58fc6db7c64c
DIST clang-tools-extra-3.7.1.src.tar.xz 277476 SHA256
4a91edaccad1ce984c7c49a4a87db186b7f7b21267b2b03bcf4bd7820715bc6b SHA512
06e2db8af75f1e6ee82da6ee723b5256b9e3f6ba196428f18944ec02d07df26d04329ca8824a083c5f25274ce7e3469aa75e3a29ccfbdb6375524841d65e3ad7
WHIRLPOOL
2c1a459d6aff6bc24d5c8d38120ab665adbef61394050781a9707d50e83dae1b4997ed19459086e9bd7f6dd38a09c295d135e33515c947d64a7f1ab714ad8beb
+DIST clang-tools-extra-3.8.0rc1.src.tar.xz 323524 SHA256
7c2331c03af4013bd2a0ce5033044c1577f2f7bdd138638ebe7c2310ea14df02 SHA512
da94b3841b173068a7a0d345a7731cff714c0d316c86323327bc4481d087c363f634e0dbfbf90bbfdadcb1ff3fb75bcffb2d0669f20bbebfaa8e6195826c88d9
WHIRLPOOL
654be27b51979f872630a30dd5c92e5e543125d997fc9db567ad2ba98a5c781d1314b97db17a97c2afc1c06d2717ee694463e1623b16201419bcfc6a979ebb83
DIST compiler-rt-3.3.src.tar.gz 1568034 SHA256
0e2f3180d6316e6c43f064fdd406c5c6515e682c5f31c57c28335b68c7525423 SHA512
3e86aa8ab9810b4fbac54a40fc93a717a55c642520858c0db215a5324c1e495b4d8fcec9620251cca8e4e5f9afa34bc14364d7f785880a0700469d0201827929
WHIRLPOOL
fcfd06bc860dfd901a7576cd4309f863e9d4363e36ab4c67e9e08fe3c8a37d627ee95eb96b9ed53eb6047dec06e73181b3c3e1555b1b49f1e893e6382f21ddc1
DIST compiler-rt-3.4.src.tar.gz 1858593 SHA256
f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c SHA512
70efffaf12ff7c15befa87ce808489c6f6b6eb421d0ab5d8ecd525239efc8aab850c7ed34b31a993ff5e499657b72598619945cc4461fe3e5359e9a94aaac0c8
WHIRLPOOL
ad558b5877a01e476d30d2757959ab04be0c385b2fe3442bcc578bf36c6f3214cd78b4adda24fcb1f3b2b84353db213b82e8d7d4c40e66c3f57aed3a49322dbc
DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256
a4b3e655832bf8d9a357ea2c771db347237460e131988cbb96cda40ff39a8136 SHA512
862cce2d6b398bd1a8399496a547e6ab976a31f676528beebfbea5fd7dc54aa72e1c25deefa12f6167096521eba74090565b0168806451da02ddac04e922fc48
WHIRLPOOL
248acf997d70d7904aa79bf83e0c02ba4e5f8c2812c03f44a8e1e31b845a654f250c09ec6a123f9245d0db8713e8cc5a4087b9ce785af4f5eb7e55d9dbd362a2
@@ -18,8 +20,10 @@ DIST compiler-rt-3.5.2.src.tar.xz 1093000 SHA256
542d7aadd21e7fe35bea0a7912bc965
DIST compiler-rt-3.6.2.src.tar.xz 1128080 SHA256
0f2ff37d80a64575fecd8cf0d5c50f7ac1f837ddf700d1855412bb7547431d87 SHA512
7dafcc5bd4822475de649d8a84ae51af3c4ed4d0958f76b1b55ba79219638f3e78eb94a1986c6e9ba0e7f1ccf3ec834d546b5ca60e8b08083fea5880ecdf17a3
WHIRLPOOL
dd77e7df43c9028a6873ed903da67560fdb04968013016a7f0ad2d2e9a81b3a3d890b95e4f49a6bdef349806d6507defcd80a0a9fb50c1c9f778e7eff42dbc5d
DIST compiler-rt-3.7.0.src.tar.xz 1192832 SHA256
227fa998520bc94974a428dc8e7654d9bdf277e5bc70d4064ebc05691bd62b0b SHA512
2ba6abb3d6ec7f1469cfe1d48fde2069e9a767d19144f80f05516ac63f353ace90a9df3e9d1c1f708f3c397aba0ec61b12e4f105b25a2e1cd26b25b0dd252bc9
WHIRLPOOL
8bb535b667a7fdc1710d32e0912daee3798049f78cf70a03abc409157f02602b77f290b66185a35c464e512e55d57aab0125be6ae4843f6233f4017228afb579
DIST compiler-rt-3.7.1.src.tar.xz 1181772 SHA256
9d4769e4a927d3824bcb7a9c82b01e307c68588e6de4e7f04ab82d82c5af8181 SHA512
bf434519ea0838264c30de1e1e8681320aa868df0ecc825a45c659077b963a4120c18216946558cbf8aea24a8ac8ec39af2066dab906bc7cabc0894d51d61325
WHIRLPOOL
0bea047e48622884a6fc6bb3826046e9de5b3192006cc41c0ccd9d6c611674869c3c15988b531a0f7d9fea2cf951b90ecef385b85db765c6f99a48692fdcf223
+DIST compiler-rt-3.8.0rc1.src.tar.xz 1266132 SHA256
770925debdb35985423835fcb6ac7b572ee273ff8a175f580d37e3ee930c2f9b SHA512
fcf77e1b9130b4b43894340f7bae10ebe465a036115bee8fedc672035437d54e1b3f768e471778c76f0e0e78dd5928e4de76b04074529b1528ef2b22845acc01
WHIRLPOOL
ff92947a6ba1039c5b7b81d8404a08c90a107ec498182ac2b72f493a8a67dea7aa120fb0da8f7f8a3bc9347cf5c132c026202df666c59be764b0c2213ad98f5f
DIST lldb-3.7.0.src.tar.xz 10649660 SHA256
f4d7505bc111044eaa4033af012221e492938405b62522b8e3e354c20c4b71e9 SHA512
52157782ef13e2c8b7b35ff3ccc05887195fe46ddb6bafcf0707a3c46c1e034734b55342b8dbfc46cae7a8c3cb1012345284e4bedb2344c5016b8d19a12e90df
WHIRLPOOL
8c0803a51820ec67944e27061c858e95a92aefa38a1540241fead2b63c5b065c1268cf958b14d8841f62fc8aea5da1e20204704426598bfc2c4e61bcda135c43
DIST lldb-3.7.1.src.tar.xz 10650524 SHA256
9a0bc315ef55f44c98cdf92d064df0847f453ed156dd0ef6a87e04f5fd6a0e01 SHA512
d2d3e1052026edd6ef9113ff5362acb4a32cef598098b4031c35e389301130ef2e1bda594f30de4d65c9fdc0beaecdd35afcf36676eb540baad34015aca294d1
WHIRLPOOL
bba9c700788f0cf86ac1de51383a223e1c92f724719cdd327d83189cb77714c1e10fb78569aeed3b3c639062a3410bb114f646a271fd0d9e8c9a8e45d090330a
+DIST lldb-3.8.0rc1.src.tar.xz 10928688 SHA256
12a6bf9362a6a8a2affe18420543605f8128de3cd0ebd4cd65a075d2c6995ddd SHA512
acb7755308dfb4bbd78732b1e7e0ac12b61f5c72bdb30be737549c14abd0ed8b31fc80d3f592890b47312b670cfe3f8f9d493531ad19e1bd4fdcd15406241362
WHIRLPOOL
d3e31bf763b95b4066f6b9c08c159b021f11dc2cebe8a4c4c763f24db4ae72c25587af46d3c45b6002b6d607a09f1b91053e3a7ed647a273fdb62927955d3b9a
DIST llvm-3.3-manpages.tar.bz2 27098 SHA256
46bb22d63d5fe7dd04e1a7bb7e16c03d93f2ed51d31540cfb9d97ed70059aa77 SHA512
6f24b66b13025d0606908f91ad9b4fc6de1b4aac2d97d261f6b989065476cf153d2f84792f8dd4972b95fb1a45a3931c328df3bcf8ce5ab21170a7a912a39783
WHIRLPOOL
31b9c3635b698f404b75b87c7891b4b6be9cbeb6062bcb6fba5476b0b3069a486ba60c27ab2b12b8a2da9404f666617162041860f023951050a9fc4c7d27748a
DIST llvm-3.3.src.tar.gz 13602421 SHA256
68766b1e70d05a25e2f502e997a3cb3937187a3296595cf6e0977d5cd6727578 SHA512
1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038
WHIRLPOOL
a89c0b470fde562a3402e7878b91bc0573d433ca0a60e62c9c46946d7948a4fb657b116b6bac032555e29c70d82c751876adb398fe240f5c8d0a9a2378ce1866
DIST llvm-3.4-manpages.tar.bz2 33753 SHA256
dc2616104cf333dd9ef56b2d31f9a36e81303e2c5756ff8bc221e05b46f7e1cb SHA512
8e438a9392c9b896ccb2b1460a8f57ffa01633e3a6bba61e2bf2f718d970ff96c17d63b0bc0d4da1162e1d1dc4cb9b2a9e9a14a722e8a5b5d2f205f037ae665d
WHIRLPOOL
1c037a9972442937f84bc3147d77d4bbc6d6c0812c3025f3107c2ee5f6259afab990f6e1bca564237fdca8089e2372df4b7ca45cbdea686fbf891f92d1bfbbe6
@@ -32,3 +36,4 @@ DIST llvm-3.6.2.src.tar.xz 12802380 SHA256
f60dc158bfda6822de167e87275848969f055
DIST llvm-3.7.0-manpages.tar.bz2 38095 SHA256
8597fa532464c6336aefbbef0b1ce452aaa98d474fa58108c6a6f57a9ccd6785 SHA512
ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643
WHIRLPOOL
743b339b0df7c52d270a5197e9e765dfd92d4b5acee94cf9d9d7713e1a75aa9d987b3f5adab0952e7267febf88b318d0f31cb45847e2b0b42c7c7373b2358358
DIST llvm-3.7.0.src.tar.xz 14636252 SHA256
ab45895f9dcdad1e140a3a79fd709f64b05ad7364e308c0e582c5b02e9cc3153 SHA512
fe3bfefd3d49423831ad12b89f944ac9f469aaaaafdea1dd94fc7fb6d5cc9fbe66b6463796aeaabfc145ae474ec3ad68da41c4a011e8aa4bc650f1835af75388
WHIRLPOOL
4787fc417042cbb4470887358225c367c6617ccd6cb90f1e4f226ec1565b302e4d70458fc13ceedca5b3ac270523637398bb7503c8c423c81fd9682a41c0289f
DIST llvm-3.7.1.src.tar.xz 14592544 SHA256
be7794ed0cec42d6c682ca8e3517535b54555a3defabec83554dbc74db545ad5 SHA512
ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90
WHIRLPOOL
788ce0907b906ebee595c766713bec5067563c8aba7460211f5830e116df7c830de84704834c0df2f2f2c90354d75521e4a4aff57e769a2d8ab590778c1e4a70
+DIST llvm-3.8.0rc1.src.tar.xz 16559376 SHA256
41809e45cb3a97908c5741b4c15c90d801793e09d75858a6cfaa9582f233249b SHA512
0fbb2a5c16aad989a00b0068ab094882eb6f945237f1b82e102835321dc74cdbdaaa2d16dbc73df93ad466b3221ad440c18bd79e70e1f3de92e0a11de717d20e
WHIRLPOOL
ae25d7b12c359aaab53dafeb0dd737b564d6fceac95443049118ec8cb7a308836572243c77cfb0a6018fa2600b2844f252d95870fed79e11e3cc5ae5b5dbfe0d
diff --git
a/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
b/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
new file mode 100644
index 0000000..d82236e
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.8.0-compiler_rt_arm_march_flags.patch
@@ -0,0 +1,17 @@
+diff -Naur llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake
llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake
+--- llvm-3.8.0rc1.src.orig/projects/compiler-rt/cmake/config-ix.cmake
2016-01-13 17:56:15.000000000 +0100
++++ llvm-3.8.0rc1.src/projects/compiler-rt/cmake/config-ix.cmake
2016-01-27 19:43:21.265315207 +0100
+@@ -219,13 +219,6 @@
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "mips")
+ test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu")
+ test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu"
"-mabi=n64")
+- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm")
+- test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft")
+- test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard")
+- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32")
+- test_target_arch(aarch32 "" "-march=armv8-a")
+- elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64")
+- test_target_arch(aarch64 "" "-march=armv8-a")
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm32")
+ test_target_arch(wasm32 "" "--target=wasm32-unknown-unknown")
+ elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "wasm64")
diff --git a/sys-devel/llvm/llvm-9999.ebuild
b/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
similarity index 77%
copy from sys-devel/llvm/llvm-9999.ebuild
copy to sys-devel/llvm/llvm-3.8.0_rc1.ebuild
index d9adc68..c39a17f 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-3.8.0_rc1.ebuild
@@ -7,27 +7,33 @@ EAPI=5
: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
PYTHON_COMPAT=( python2_7 )
-inherit check-reqs cmake-utils eutils flag-o-matic git-r3 multilib \
- multilib-minimal python-single-r1 toolchain-funcs pax-utils
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+ multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
DESCRIPTION="Low Level Virtual Machine"
HOMEPAGE="http://llvm.org/";
-SRC_URI=""
-EGIT_REPO_URI="http://llvm.org/git/llvm.git
- https://github.com/llvm-mirror/llvm.git";
+SRC_URI="http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/${P/_}.src.tar.xz
+ clang? (
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/compiler-rt-${PV/_}.src.tar.xz
+
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/cfe-${PV/_}.src.tar.xz
+
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/clang-tools-extra-${PV/_}.src.tar.xz
)
+ lldb? (
http://llvm.org/pre-releases/${PV/_rc*}/${PV/3.8.0_}/lldb-${PV/_}.src.tar.xz )"
+# !doc? (
http://dev.gentoo.org/~voyageur/distfiles/${P/_rc*}-manpages.tar.bz2 )"
LICENSE="UoI-NCSA"
SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="clang debug +doc gold libedit +libffi lldb multitarget ncurses ocaml
+KEYWORDS="~amd64 ~arm ~arm64 ~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 lldb multitarget ncurses ocaml
python +static-analyzer test xml video_cards_radeon kernel_Darwin"
COMMON_DEPEND="
sys-libs/zlib:0=
clang? (
- static-analyzer? ( dev-lang/perl:* )
+ python? ( ${PYTHON_DEPS} )
+ static-analyzer? (
+ dev-lang/perl:*
+ ${PYTHON_DEPS}
+ )
xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
- ${PYTHON_DEPS}
)
gold? ( >=sys-devel/binutils-2.22:*[cxx] )
libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
@@ -36,7 +42,8 @@ COMMON_DEPEND="
ocaml? (
>=dev-lang/ocaml-4.00.0:0=
dev-ml/findlib
- dev-ml/ocaml-ctypes )"
+ dev-ml/ocaml-ctypes
+ !!<=sys-devel/llvm-3.7.0-r1[ocaml] )"
# configparser-3.2 breaks the build (3.3 or none at all are fine)
DEPEND="${COMMON_DEPEND}
dev-lang/perl
@@ -67,6 +74,8 @@ PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
lldb? ( clang xml )"
+S=${WORKDIR}/${P/_}.src
+
pkg_pretend() {
# in megs
# !clang !debug !multitarget -O2 400
@@ -101,6 +110,18 @@ pkg_pretend() {
local CHECKREQS_DISK_BUILD=${build_size}M
check-reqs_pkg_pretend
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+ ebegin "Trying to build a C++11 test program"
+ if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+ eerror "LLVM-${PV} requires C++11-capable C++ compiler.
Your current compiler"
+ eerror "does not seem to support -std=c++11 option.
Please upgrade your compiler"
+ eerror "to gcc-4.7 or an equivalent version supporting
C++11."
+ die "Currently active compiler does not support
-std=c++11"
+ fi
+ eend ${?}
+ fi
}
pkg_setup() {
@@ -108,33 +129,21 @@ pkg_setup() {
}
src_unpack() {
- if use clang; then
- git-r3_fetch "http://llvm.org/git/compiler-rt.git
- https://github.com/llvm-mirror/compiler-rt.git";
- git-r3_fetch "http://llvm.org/git/clang.git
- https://github.com/llvm-mirror/clang.git";
- git-r3_fetch "http://llvm.org/git/clang-tools-extra.git
- https://github.com/llvm-mirror/clang-tools-extra.git";
- fi
- if use lldb; then
- git-r3_fetch "http://llvm.org/git/lldb.git
- https://github.com/llvm-mirror/lldb.git";
- fi
- git-r3_fetch
+ default
if use clang; then
- git-r3_checkout http://llvm.org/git/compiler-rt.git \
- "${S}"/projects/compiler-rt
- git-r3_checkout http://llvm.org/git/clang.git \
- "${S}"/tools/clang
- git-r3_checkout http://llvm.org/git/clang-tools-extra.git \
- "${S}"/tools/clang/tools/extra
+ mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+ || die "clang source directory move failed"
+ mv "${WORKDIR}"/compiler-rt-${PV/_}.src
"${S}"/projects/compiler-rt \
+ || die "compiler-rt source directory move failed"
+ mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src
"${S}"/tools/clang/tools/extra \
+ || die "clang-tools-extra source directory move failed"
fi
+
if use lldb; then
- git-r3_checkout http://llvm.org/git/lldb.git \
- "${S}"/tools/lldb
+ mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
+ || die "lldb source directory move failed"
fi
- git-r3_checkout
}
src_prepare() {
@@ -142,6 +151,8 @@ src_prepare() {
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
# Fix libdir for ocaml bindings install, bug #559134
epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+ # Do not build/install ocaml docs with USE=-doc, bug #562008
+ epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
# Make it possible to override Sphinx HTML install dirs
# https://llvm.org/bugs/show_bug.cgi?id=23780
@@ -160,7 +171,7 @@ src_prepare() {
# Fix llvm-config for shared linking and sane flags
# https://bugs.gentoo.org/show_bug.cgi?id=565358
- epatch "${FILESDIR}"/llvm-3.9-llvm-config.patch
+ epatch "${FILESDIR}"/llvm-3.8-llvm-config.patch
# disable use of SDK on OSX, bug #568758
sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
@@ -169,20 +180,34 @@ src_prepare() {
# Automatically select active system GCC's libraries, bugs
#406163 and #417913
epatch
"${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+ epatch "${FILESDIR}"/clang-3.4-darwin_prefix-include-paths.patch
+ eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
+
+ sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+ tools/clang/tools/scan-build/bin/scan-build || die
+
# Install clang runtime into /usr/lib/clang
# https://llvm.org/bugs/show_bug.cgi?id=23792
epatch
"${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix-3.8.patch
epatch
"${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+ # Do not force -march flags on arm platforms
+ # https://bugs.gentoo.org/show_bug.cgi?id=562706
+ epatch
"${FILESDIR}"/cmake/${PN}-3.8.0-compiler_rt_arm_march_flags.patch
+
# Make it possible to override CLANG_LIBDIR_SUFFIX
# (that is used only to find LLVMgold.so)
# https://llvm.org/bugs/show_bug.cgi?id=23793
epatch
"${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+ pushd projects/compiler-rt >/dev/null || die
+
# Fix WX sections, bug #421527
- find "${S}"/projects/compiler-rt/lib/builtins -type f -name
\*.S -exec sed \
+ find lib/builtins -type f -name '*.S' -exec sed \
-e '$a\\n#if defined(__linux__) &&
defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
- -i {} \; || die
+ -i {} + || die
+
+ popd >/dev/null || die
fi
if use lldb; then
@@ -221,7 +246,7 @@ multilib_src_configure() {
"${mycmakeargs[@]}"
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
- -DBUILD_SHARED_LIBS=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
-DLLVM_ENABLE_TIMESTAMPS=OFF
-DLLVM_TARGETS_TO_BUILD="${targets}"
-DLLVM_BUILD_TESTS=$(usex test)
@@ -374,7 +399,7 @@ src_install() {
if use clang; then
# note: magic applied in multilib_src_install()!
- CLANG_VERSION=3.9
+ CLANG_VERSION=${PV%.*}
MULTILIB_CHOST_TOOLS+=(
/usr/bin/clang
@@ -397,8 +422,8 @@ multilib_src_install() {
cmake-utils_src_install
if multilib_is_native_abi; then
- # Install docs.
- #use doc && dohtml -r "${S}"/docs/_build/html/
+ # Install man pages.
+ use doc || doman "${WORKDIR}"/${PN}-3.8.0-manpages/*.1
# Symlink the gold plugin.
if use gold; then
@@ -453,6 +478,31 @@ multilib_src_install_all() {
if use clang; then
pushd tools/clang >/dev/null || die
+ if use static-analyzer ; then
+ pushd tools/scan-build >/dev/null || die
+
+ dobin ccc-analyzer scan-build
+ dosym ccc-analyzer /usr/bin/c++-analyzer
+ doman scan-build.1
+
+ insinto /usr/share/llvm
+ doins scanview.css sorttable.js
+
+ popd >/dev/null || die
+ fi
+
+ if use static-analyzer ; then
+ pushd tools/scan-view >/dev/null || die
+
+ python_doscript scan-view
+
+ touch __init__.py || die
+ python_moduleinto clang
+ python_domodule *.py Resources
+
+ popd >/dev/null || die
+ fi
+
if use python ; then
pushd bindings/python/clang >/dev/null || die
@@ -468,14 +518,14 @@ multilib_src_install_all() {
popd >/dev/null || die
python_fix_shebang "${ED}"
- if use static-analyzer; then
- python_optimize "${ED}"usr/share/scan-view
+ if use lldb && use python; then
+ python_optimize
fi
fi
}
pkg_postinst() {
- if use clang && ! has_version 'sys-libs/libomp'; then
+ if use clang && ! has_version sys-libs/libomp; then
elog "To enable OpenMP support in clang, install
sys-libs/libomp."
fi
}
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index d9adc68..c0f1cfc 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -142,6 +142,8 @@ src_prepare() {
sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
# Fix libdir for ocaml bindings install, bug #559134
epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-multilib.patch
+ # Do not build/install ocaml docs with USE=-doc, bug #562008
+ epatch "${FILESDIR}"/cmake/${PN}-3.7.0-ocaml-build_doc.patch
# Make it possible to override Sphinx HTML install dirs
# https://llvm.org/bugs/show_bug.cgi?id=23780
@@ -221,7 +223,7 @@ multilib_src_configure() {
"${mycmakeargs[@]}"
-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
- -DBUILD_SHARED_LIBS=ON
+ -DLLVM_LINK_LLVM_DYLIB=ON
-DLLVM_ENABLE_TIMESTAMPS=OFF
-DLLVM_TARGETS_TO_BUILD="${targets}"
-DLLVM_BUILD_TESTS=$(usex test)
