commit: d1df34c0bb5ed0edce61f7e9329ab454d551810b Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Sat Nov 28 09:59:07 2015 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Sat Nov 28 09:59:07 2015 +0000 URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=d1df34c0
llvm-3.6.2.ebuild: remove compiler-rt on older kernels. sys-devel/llvm/Manifest | 4 ++-- sys-devel/llvm/llvm-3.6.2.ebuild | 15 ++++++++++++--- sys-devel/llvm/llvm-3.7.0-r1.ebuild | 6 +++++- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest index 715e76b..634651d 100644 --- a/sys-devel/llvm/Manifest +++ b/sys-devel/llvm/Manifest @@ -112,8 +112,8 @@ EBUILD llvm-3.5.1.ebuild 15222 SHA256 46bee55510ab7e3e021f15e57e7f54d31bc3fd5d52 EBUILD llvm-3.5.2.ebuild 15292 SHA256 cd65a205c753831553aef88c2473fc99f7ac1b7d851af884578f7c182736a8a3 SHA512 1b0b45e02ea39621b1a7417fbc93a901b48a5a5551b6d7e1f9490a155c4d0ad98812af8fd45bb36482541268f32f36aba2663602e042f728f08285dc5ea2fa18 WHIRLPOOL ba1ba8c77bbb4b78708f69106fc6a59180d73e51fd579038547c065f23dd81794a5266df543845480652b458e0ee92b179fd512342d602b10eda8e4b727a125f EBUILD llvm-3.6.0.ebuild 15285 SHA256 f9dc886bcd3163182f9366952e2ba6efc55c2b798b615ea33620912260dd922f SHA512 7e372b0fdd2ddce4ad4f1814c593a6e47e1d962fa24e983d8db101251662e64ed723edee83b27d11a35de71bd7c3170ad6992ad44c770533b845d77b3ebc9272 WHIRLPOOL 7d67c7bc55c0734bee38ed3fc2dfa3677eac1a11df8d0e533f62afc5f32c55a08931fe1371b86e3774b704ba26cf08c15eed7efd5620bd387c077391e5bbbcfa EBUILD llvm-3.6.1.ebuild 15554 SHA256 f1f007fa874bc33f5c1cdc9622ba17badc64d03fa91f3d4b690cb8faaddfcfd8 SHA512 5f18a894cfd0f8687f8ddc0fdca4de85ddeff1f06a662e0830cfe36c6adb2add2a2871059fd78354ece0b527638e4ba08e73e22cfc05e8738feca10002bacaf5 WHIRLPOOL d851589c993b8711e62b1fe7317f31bc009561fa541da68259d812ecb3202e2649b21333fb86fba74c410fea5d1233d6be5fc010497f588f42fdcd50493fe6b6 -EBUILD llvm-3.6.2.ebuild 15575 SHA256 88b3ec82fbb47565a671857d824f53b5a2c5a1f0b3d6b472e9c7790d551d03da SHA512 8321368e71c96ddd8868dae7368c62e096bb974fba0d293c7d67a4a4ae54603ccc851232d1c216b1cd5e63ced7bf1060aed99afeeedc22eca0230ea4e2912d47 WHIRLPOOL 2355533fb2a7bc5115dc7ba1aa20494335a1b9c3cefba33d9589370acc0c368f95931b11d3efb75d517d4d0211e4625f10af2c751b51f24539ddad1a218a9e3a -EBUILD llvm-3.7.0-r1.ebuild 14585 SHA256 020933286b03a17665de28143614f7653baf8abdad2c4d59fd4235cf1e95ff84 SHA512 fdae45263ab6ed3380479c6cda191b1b11112e3d87e858cc932cd6c2ea48dd4807a4bdc15107b1d94f0a6ef791a58a75409e5f72900c7f686f64edbc93b55653 WHIRLPOOL 7995b1936e83ff82a6e06fa877d25d3a5d8ccfd6d29dab1359e8866cf2ab09d02fa5d28c634fc8f8edbf6b1e2bf0e4e2ffe22a5b9640cc5d5d2e745fb7c8e44b +EBUILD llvm-3.6.2.ebuild 15928 SHA256 7610c92e92259a921e0adc0b3812838f8bb6a97b5923f640c8b4ae02d334fd21 SHA512 c94a9697a98292d11c06f67e058f7ec3a686eb5bc7d59b3749c307158b7ca134b137f8cc5d1fdb5fd2094a26890132782bbcb9650178a01d64dd47e3f1a85cbf WHIRLPOOL 85b1b3d203885c0c5f6b5d3132c543310c17370f8198ba6bf89397e0c3216cd376f741181ffea1499cdf536ebfe308b35d7ec0d324ee1cecc5b258aa92b3ce42 +EBUILD llvm-3.7.0-r1.ebuild 14656 SHA256 fe5040ed23d8d368e812be09f200767e914849fd300edfc1c80bd7bba10d99a4 SHA512 0d1c09b05f9e6b57f13f6ca1a6f26f523f25e2b57d56e8199c78706a670be489fe9e6b4da0e7c473bcb79bfc60e9daf6e90673e6445fa8da79341e9644a7ae32 WHIRLPOOL 84ddcc6c94f51e59d8b6444e89bdd2d72d4411a3bb5c38d010a0560993e0ed36235b67209d389e361e9e645c2c151337414eb3db634aba4851372c15320268d8 EBUILD llvm-3.7.0.ebuild 14056 SHA256 12f9a4b1a178b193a5cab94c00f448eb538d31056d5e34915a173caf52ea0b87 SHA512 1951a8ab684aaa9de60a2a1b86534cc57ea56bf4d3deb82a8638685f09b0ff3b01c86fafeb8514d4df24892119eba1a69cf2bf99ca12d584f9eb455f3a74448f WHIRLPOOL 9ebf4aa05d6fdaf3e5fb690d75a3996229214197f057dd4695dff0e7dac49492b4b292ce0497dcd8dcd64bdc2975b08540cbc3f458350b1f412f040a6505e7b8 EBUILD llvm-9999.ebuild 14197 SHA256 ffef165a5ff340631817283b6cad6f4df21cf78a0d4196c5fa2918e9fc390bfb SHA512 4011a7b5507c31b09eaae49cdc6488981dfed92a63f11c6f7e3e1e6608da343b15eda4f62372f9e882dbcc37fa87352ed35752728c35e9ee93f5565529382709 WHIRLPOOL 3b104d8aa520bfd967c6697661dfb4ea35c0205518dc9ac406a274d4cd79a1e35ac3ccdd6e9275cb41c7ab9dc64fb5e9d193834bd7e27ff422b0472ac628a6e4 MISC metadata.xml 2761 SHA256 1118fce576ccb1bf73ddb832a43ce1991d28b36d9775943ad7009d7a9a795ef9 SHA512 662b95a0c374a6f6873c15f0b06a6e16a53c52cd7c231f56710a43bfdb4663d5b98d84c191b8cce06ee473a0fea9622f7dae7afa70b6461ad02b0fd742a04302 WHIRLPOOL b7d697e632ad6d9d74db8db2c8a376d71fba9ed1b90a4f78ba15d3768cd334e69271e10f21a9fe9f5224fd0b1e541ff5a743fd5f275067f847ea96bed37cefd4 diff --git a/sys-devel/llvm/llvm-3.6.2.ebuild b/sys-devel/llvm/llvm-3.6.2.ebuild index 2e7bc9a..6040887 100644 --- a/sys-devel/llvm/llvm-3.6.2.ebuild +++ b/sys-devel/llvm/llvm-3.6.2.ebuild @@ -6,8 +6,8 @@ EAPI=5 PYTHON_COMPAT=( python2_7 pypy ) -inherit eutils flag-o-matic multibuild multilib \ - multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix +inherit eutils flag-o-matic multibuild multilib linux-info \ + multilib-minimal python-r1 toolchain-funcs pax-utils check-reqs prefix \ DESCRIPTION="Low Level Virtual Machine" HOMEPAGE="http://llvm.org/"; @@ -22,7 +22,7 @@ SLOT="0/3.6" 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 multitarget ncurses ocaml python +static-analyzer test xml video_cards_radeon - kernel_Darwin kernel_FreeBSD" + kernel_Darwin kernel_FreeBSD rap" COMMON_DEPEND=" sys-libs/zlib:0= @@ -201,6 +201,13 @@ src_prepare() { # User patches epatch_user + if kernel_is -lt 2 6 32; then + # on RHEL5, linux/perf_event.h (needing kernel >=2.6.32) is not available. + # https://llvm.org/bugs/show_bug.cgi?id=17901 + elog "Removing compiler-rt on RHEL 5..." + rm -r projects/compiler-rt || die "Removing compiler-rt failed." + fi + python_setup } @@ -236,6 +243,8 @@ multilib_src_configure() { fi conf_flags+=( --enable-targets=${targets} ) + use rap && conf_flags+=( --with-default-sysroot="${EPREFIX}" ) + if multilib_is_native_abi; then use gold && conf_flags+=( --with-binutils-include="${EPREFIX}"/usr/include/ ) # extra commas don't hurt diff --git a/sys-devel/llvm/llvm-3.7.0-r1.ebuild b/sys-devel/llvm/llvm-3.7.0-r1.ebuild index 931796d..d894da0 100644 --- a/sys-devel/llvm/llvm-3.7.0-r1.ebuild +++ b/sys-devel/llvm/llvm-3.7.0-r1.ebuild @@ -24,7 +24,7 @@ LICENSE="UoI-NCSA" SLOT="0/${PV}" 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" + python +static-analyzer test xml video_cards_radeon kernel_Darwin rap" COMMON_DEPEND=" sys-libs/zlib:0= @@ -284,6 +284,10 @@ multilib_src_configure() { -DLLVM_INSTALL_UTILS=ON ) + use rap && mycmakeargs+=( + -DDEFAULT_SYSROOT="${EPREFIX}" + ) + if use clang; then mycmakeargs+=( -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
