From b279bbe94522565b8feb19b8e5f377d3ea76f157 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Mar 2018 10:19:03 +0000 Subject: gentoo resync : 24.03.2018 --- sys-libs/compiler-rt-sanitizers/Manifest | 10 ++++----- .../compiler-rt-sanitizers-4.0.1.ebuild | 24 +++++++++++----------- .../compiler-rt-sanitizers-5.0.1.ebuild | 24 +++++++++++----------- .../compiler-rt-sanitizers-6.0.0.ebuild | 24 +++++++++++----------- .../compiler-rt-sanitizers-6.0.9999.ebuild | 24 +++++++++++----------- .../compiler-rt-sanitizers-9999.ebuild | 24 +++++++++++----------- 6 files changed, 65 insertions(+), 65 deletions(-) (limited to 'sys-libs/compiler-rt-sanitizers') diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest index 3bd1bcc6eb71..b120a8c6856a 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -5,9 +5,9 @@ DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c8357076 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c -EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4548 BLAKE2B 92ab6b7854a5d8bfc5da3160e6d1bcaa4347ae4faa5ac4ad095902b61051a1b89afd74e6c7827958184ff9d5668efa226344bf0e631a8c85542e48ea6cfd659e SHA512 0f4f9b0497b17f0fabaa74c83ff946ffe55b828fc286c4e82ade53e54b10491f92bef91d06567d9d7e5dc50ea150f2b0ed5484ff599b01892428966ea630e121 -EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4846 BLAKE2B b7723034964cf81192ac1d232ec35c099c5755d38fe7ed52b24413075fe1c4915015e69b0efb62dc4d84bfc0f64d1f9ff1ca7f6f7bf70d32e7f121e316382ac1 SHA512 1ee73ca6024f753ec05ff3bae518abf15587cd991c5917bb462ec5e87d27ad49038c572f6b936c3fd06410e8ae428c1b97d9c49b21804f26d09a180a1937bf81 -EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5046 BLAKE2B 2f98d0b4e136b478d831a45632693f19f0e8c8dde47772d258180e8d868bab3950430fdf671584adc4feaa45055e3f32ca435afc94d4c7f9045f3b5800ecd92e SHA512 d4f6d2a8552100029a29b2e7a94bb017c4914da314bba8118c3610513c6dc53173af30bc50555cb12a47da15222e97d796bb1e03e8c0497dc45f5f10f4654d17 -EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4996 BLAKE2B d52e5a1144f4699793fe459521f1192c2ca2f0f469e3c9992f7b04eec3352f63b448ea98c552e55c2c2e868dc09d5d30cbd4be737d7d8eaaf0b837b7b67c6df8 SHA512 6259320ff164c440e120a755e4bb65b07c196fb0f40ddbcbaf860c17838f0c42e9ec7ad6c9f5ae8aa66fc29712a4bafc98c7bfca33c3add8aa0d4ca4b4ce53d4 -EBUILD compiler-rt-sanitizers-9999.ebuild 4971 BLAKE2B e2fe4f691f01c37c73ca93864d358d1091f976b69ae3c84f96ec8e50a7a584a4ec468f3e9127ee02be1ee0192b0cac54499951d53ee82f1177fa60a23b8f3017 SHA512 e8586923d94c8105a8b896365dbe4e7379a04277d0849aa1d16ab6099b7c5f6a9841a680e72ac2487386fb967fc84d4e6d8d049a4b01cbe0945f1eaf20bf4faf +EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4512 BLAKE2B 4398fb881d8fe73b7ccdc37f733c9e221b84be6c32ff015e2be285fc9b14d371ca4d3587e2691b68b128f5df6617d265a21442e2bcc9f631d76f8efbe7313c3e SHA512 c7c74c9ee92e2e85973bdde728d6f2ca9ae8e3fe990b975290fa31ca085a36ea1eca0a4fbd4118c62372af8bd3f2f6a2107c7b884300f30202bca013b4d9e21a +EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4810 BLAKE2B 2145a3ecac6a17a5ccce7ecf819d61ce23b24c21118e2320ced34e2c7ceb54bd4194fe9194cb685275ab2f8804a7f9d7624800ff0260ac821c14887787e73659 SHA512 7a14dafba5fd7919c0f1f2a692f2a6f66553655bf238be18017de5be91a416f512426210bac166ae36a80557b277bdb1e12ba8198cb3a8b0db6b3519cf59e4cf +EBUILD compiler-rt-sanitizers-6.0.0.ebuild 5010 BLAKE2B ed42f30c2bb225f949ae4fbb5e1cf17feace321101ea52d46eace6ce77e3d33daf59bef5c7e65e6b0a4aba5c51254a6673b8df909b792a4b25dc1b13c616c1b6 SHA512 2831e0d85ec4c9861da756c5816de481a978efb704fb2223dba078033eae0f65fec2f912d1557481b3449cabc7c62e4e88e2031500136d32cf4bba93b445b7a2 +EBUILD compiler-rt-sanitizers-6.0.9999.ebuild 4960 BLAKE2B d2d1003d38f235d793df9d22a6f73bdc143fd914dec37026699820ff7ece486a55ba8bfa372b9d0045cc193ef691a40648cb5eb8b254ecf0e1e13ba7057556b7 SHA512 b946abeb441caa9ff6bd67210313384dc2ee7ee37c3bd1c8b6fef7db375388c12901c3552d400be401281284d25ba11b405e1894f938c084669005fcc9b01098 +EBUILD compiler-rt-sanitizers-9999.ebuild 4935 BLAKE2B 92426b7c2e68887ad859fdf773f0ac601cb7e15df506ab590e106f26ea729721d0425fab4326d14936ef8a21bfd0d8889fa5b6706e1f44f60ce0107f565c826a SHA512 942b386808a78e1f5bb701daff9e590a0b16cd477fa014456f0f6b41cc45a682e71d2f2c15e05cc282c6fec011a260e22ba642cd8ffc9f86ebed1332432c5f8e MISC metadata.xml 333 BLAKE2B 24e417cb7b8ab7730b18a3e1e5e29d008042e4fd53cf1ba3cc9d18719160b0410854ddfae52315c690138e61fb0196015968fa09b98af6470cd8bdecc09205ef SHA512 97daa7452a696b7297c47f5f637a33425f82b51426060a75b3de6bc812f9ddcd3c70ae068bc3e88ce937ab1eb10d59b0ab48a2d2c0397a112b8b6a754e333bdc diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild index 632e36150ded..2dc0d7cb40bd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild @@ -21,7 +21,7 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86" IUSE="+clang test" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0" # llvm-4 needed for --cmakedir DEPEND=" @@ -30,7 +30,7 @@ DEPEND=" test? ( app-portage/unsandbox $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -111,14 +111,14 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -131,17 +131,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild index db4e4d049b52..b09a0573d92a 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.1.ebuild @@ -23,7 +23,7 @@ SLOT="${PV%_*}" KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+clang test elibc_glibc" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-4 needed for --cmakedir DEPEND=" >=sys-devel/llvm-4 @@ -31,7 +31,7 @@ DEPEND=" test? ( app-portage/unsandbox $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -115,14 +115,14 @@ src_configure() { -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -142,17 +142,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild index ca7cb14d19fc..cb0a84d01c62 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0.ebuild @@ -25,7 +25,7 @@ KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86 IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -33,7 +33,7 @@ DEPEND=" test? ( !=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -116,14 +116,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -143,17 +143,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild index 52cda5eedce6..c9bd5cbb5820 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild @@ -25,7 +25,7 @@ KEYWORDS="" IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -33,7 +33,7 @@ DEPEND=" test? ( !=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -117,14 +117,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -144,17 +144,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild index b232680519be..8b127c7f41aa 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild @@ -24,7 +24,7 @@ KEYWORDS="" IUSE="+clang test elibc_glibc" RESTRICT="!test? ( test ) !clang? ( test )" -LLVM_MAX_SLOT=${SLOT%%.*} +CLANG_SLOT=${SLOT%%.*} # llvm-6 for new lit options DEPEND=" >=sys-devel/llvm-6 @@ -32,7 +32,7 @@ DEPEND=" test? ( !=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} + =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) ${PYTHON_DEPS}" @@ -116,14 +116,14 @@ src_configure() { -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}" # they are created during src_test() - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang" - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++" + -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" + -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++" ) # same flags are passed for build & tests, so we need to strip # them down to a subset supported by clang - CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -143,17 +143,17 @@ src_configure() { # copy clang over since resource_dir is located relatively to binary # therefore, we can put our new libraries in it - mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAX_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die - cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang{,++} \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/bin/ || die + mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die + cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die cp "${sys_dir}"/*builtins*.a \ "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die # we also need LLVMgold.so for gold-based tests - if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so ]]; then - ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/LLVMgold.so \ - "${BUILD_DIR}"/lib/llvm/${LLVM_MAX_SLOT}/$(get_libdir)/ || die + if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then + ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \ + "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die fi fi } -- cgit v1.2.3