From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- sys-libs/compiler-rt-sanitizers/Manifest | 10 ++++---- .../compiler-rt-sanitizers-13.0.1.ebuild | 27 +++++++++++----------- .../compiler-rt-sanitizers-14.0.6.ebuild | 27 +++++++++++----------- .../compiler-rt-sanitizers-15.0.0.9999.ebuild | 27 +++++++++++----------- .../compiler-rt-sanitizers-15.0.0.ebuild | 27 +++++++++++----------- .../compiler-rt-sanitizers-16.0.0.9999.ebuild | 27 +++++++++++----------- 6 files changed, 70 insertions(+), 75 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 83211db13e48..d9307e734991 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -7,9 +7,9 @@ DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf DIST llvm-project-15.0.0.src.tar.xz 112062796 BLAKE2B 947917b6c75cbd8882133dc01f57013523274962371ac5ae4a22b010f8a7d5d31288c1d9847bf19ba919fa3110fe34a8ff937107fe19bd064ed87bf4d08d8a51 SHA512 e5aacbe7574dcec62017cc03c9fa2ee4cf075125a3d6c3975c38f06e91adcebb1ff92bcf40c6dd67db087813c60b15a04f1424c713d751199518b58025ce87fc DIST llvm-project-15.0.0.src.tar.xz.sig 438 BLAKE2B 8eb12c259f94d8f867a31dbe05128adc1f9cc7ec8bcbdbe1738d2fad461f5d214e674f080f7f29b639a7a75f9c5b56c0f959f538697d647b94b97dc56b036e5f SHA512 4096464a46e07575b7cff448ff8bbc38fe972505f366b744419a06339cf32b93266b0fae5390879859041ce6710e4b675ed3ea7561d6a817623d7ece0e969661 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f -EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6349 BLAKE2B b7e80a51911933d2c7433f5eadaced30ac32de9238a0837d23537a118672c207d753b3f0390b249caf8c2de54b5b6334698816c1b52d34d818b61e3a02c122fc SHA512 d2afec410d307ade0ebe5fc44118e99463b16e808f6a99e578fc62c442b9e56cc57120415bcd8fd777932f20f365ef84d185f84075daa78ae64f22e40514e78e -EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6361 BLAKE2B 34ab6b3a9df8f1ce2716d74a467ef7445706a7b89f1d2fb072209a7e4d84fe51353b7a7d0519c71fedf617c5cd9a907f960d049f04cd6215c0e251c15afa1c27 SHA512 3ac48115437a88787d4d850bcba21d95af60d35435bd2fc24bd6f65056dec57de503125ffbf98127aba3206abfee0af7d7e446f819eb694bc0ac39236db495c8 -EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6305 BLAKE2B 3d026779132983c345b0fdb5f04b0a200c0b113e1cd5786cb7db6be4d1b73a2da48cb0a80930ce782c9bedcb00c873de5d4c50ae3d4169a0d5170d31889f8a69 SHA512 a1ed017a8a4aab07af52f9558e8c2e7e7f898ec6f35e92287c0bb82990157a9cc59c2964f71ba1c80525b2948077cdb564836689158235b0aeb2ff60efe04ff1 -EBUILD compiler-rt-sanitizers-15.0.0.ebuild 6383 BLAKE2B 18622257c86a1dcf286f24f4d2561f72bdc93e95ffb229f0c1b0786e43af06f641db7509422921f7ac7f09e2f10ca7233f4a82abc2d58ddc4b64a861d9878e6e SHA512 2fb93f73369642e4d2c55542c54c1c6aa6f60d934e9d72083ee9a74d0c772afb154c8daa8a85373ab9dc94e4e3d62154601bbf89bd6fc0dec4c5f5abd58f3538 -EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6305 BLAKE2B 3d026779132983c345b0fdb5f04b0a200c0b113e1cd5786cb7db6be4d1b73a2da48cb0a80930ce782c9bedcb00c873de5d4c50ae3d4169a0d5170d31889f8a69 SHA512 a1ed017a8a4aab07af52f9558e8c2e7e7f898ec6f35e92287c0bb82990157a9cc59c2964f71ba1c80525b2948077cdb564836689158235b0aeb2ff60efe04ff1 +EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66 +EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6f4af6e680f2596106768e3b40bffd3c221df20b565c565793ff14a46b2a96b080a696a9217be0f547c2e85430e9031bd86adc2b90 SHA512 d68b96a7458c8b0d1946523a7c1b20e413de38b7f53bd87b8729103935cdb9ad8fc38863138ba36ffc8da57e0ddcf591c7deeb23fba0d76003adea978b262e37 +EBUILD compiler-rt-sanitizers-15.0.0.9999.ebuild 6325 BLAKE2B 6477a9afca51d95071229d9959af18ac6afebbc1348cbb26a4a9e1253e4a40d57604f74a138b027cf3ec07bffe7e001543a356e5fc5d173e5f83fadd8e646d4e SHA512 9c553af9ff3f8ad99ef2da81a86362abcfcadcbf5407565a60be6c79f9fb89f2ae1f536f8df03cc4f3f797d8019f29d0e949dcbf82f59d2e1b1fa316d9074db2 +EBUILD compiler-rt-sanitizers-15.0.0.ebuild 6403 BLAKE2B ec6435ff9186e093602e7304aa3199583bb631d1faf1a872e82ba2123f76a427682eaceb090bf2042bea6fa9f4515b4b0e1ed5543f8398c3de3071a902e883f6 SHA512 74d4d8f0a372703bcbe2f2de63adf24352e68ee46aa332cf942a6df7090c5cd5bac8ed868307244e4d27f2dcd8f1530285c48049495b056f3c09d1d0291fbb22 +EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6325 BLAKE2B 6477a9afca51d95071229d9959af18ac6afebbc1348cbb26a4a9e1253e4a40d57604f74a138b027cf3ec07bffe7e001543a356e5fc5d173e5f83fadd8e646d4e SHA512 9c553af9ff3f8ad99ef2da81a86362abcfcadcbf5407565a60be6c79f9fb89f2ae1f536f8df03cc4f3f797d8019f29d0e949dcbf82f59d2e1b1fa316d9074db2 MISC metadata.xml 1412 BLAKE2B 75675507000fa6a6b8182e6b45a08a2716ae7fb9a7e3428dc8420464e4c1d1bdb5bea62cc2f553c579de5a4faa752b35cb3529d980fb07a055ff4ddf6e752707 SHA512 f05ea5168b923db72f4f5b53e9b748ebbcdae9eff09d86323313055933b47fc0089e1b2d73cd997d73dcfb2dca032344955816425fbddc09d27ca751463aadbb diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild index 31db6dab462c..d30653aef2a7 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.ebuild @@ -30,10 +30,9 @@ REQUIRED_USE=" )" RESTRICT="!test? ( test ) !clang? ( test )" -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]" BDEPEND=" >=dev-util/cmake-3.16 @@ -42,7 +41,7 @@ BDEPEND=" test? ( !!=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} sys-libs/compiler-rt:${SLOT} ) !test? ( @@ -154,14 +153,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -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++" + -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++" ) # 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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -188,17 +187,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/${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 + 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 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/${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 + 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 fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild index a2820bf91977..39ddc77f00f3 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.6.ebuild @@ -34,10 +34,9 @@ RESTRICT=" !test? ( test ) " -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -47,7 +46,7 @@ BDEPEND=" test? ( !!=dev-python/lit-5[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} sys-libs/compiler-rt:${SLOT} ) !test? ( @@ -160,14 +159,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -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++" + -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++" ) # 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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -194,17 +193,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/${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 + 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 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/${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 + 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 fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild index 0583125b7515..f716dc74b423 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.9999.ebuild @@ -34,10 +34,9 @@ RESTRICT=" !test? ( test ) " -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -47,7 +46,7 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} sys-libs/compiler-rt:${SLOT} ) !test? ( @@ -160,14 +159,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -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++" + -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++" ) # 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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -194,17 +193,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/${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 + 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 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/${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 + 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 fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild index bf3e9bca305f..6e0758b7c6c1 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.0.ebuild @@ -34,10 +34,9 @@ RESTRICT=" !test? ( test ) " -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -47,7 +46,7 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} sys-libs/compiler-rt:${SLOT} ) !test? ( @@ -160,14 +159,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -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++" + -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++" ) # 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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -194,17 +193,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/${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 + 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 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/${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 + 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 fi fi } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild index 0583125b7515..f716dc74b423 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-16.0.0.9999.ebuild @@ -34,10 +34,9 @@ RESTRICT=" !test? ( test ) " -CLANG_SLOT=${SLOT%%.*} -# llvm-6 for new lit options +LLVM_MAX_SLOT=${SLOT%%.*} DEPEND=" - >=sys-devel/llvm-6 + sys-devel/llvm:${LLVM_MAX_SLOT} virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] " BDEPEND=" @@ -47,7 +46,7 @@ BDEPEND=" test? ( !!=dev-python/lit-15[\${PYTHON_USEDEP}]") - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} + =sys-devel/clang-${PV%_*}*:${LLVM_MAX_SLOT} sys-libs/compiler-rt:${SLOT} ) !test? ( @@ -160,14 +159,14 @@ src_configure() { -DLLVM_LIT_ARGS="$(get_lit_flags)" # they are created during src_test() - -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++" + -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++" ) # 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/${CLANG_SLOT}/bin/clang \ - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \ + CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang \ + CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/bin/clang++ \ strip-unsupported-flags fi @@ -194,17 +193,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/${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 + 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 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/${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 + 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 fi fi } -- cgit v1.2.3