From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Apr 2018 21:52:00 +0100 Subject: gentoo resync : 05.04.2018 --- sys-libs/compiler-rt-sanitizers/Manifest | 4 ++-- .../compiler-rt-sanitizers-4.0.1.ebuild | 17 +++++++++++++++-- .../compiler-rt-sanitizers-5.0.1.ebuild | 19 ++++++++++++++++--- 3 files changed, 33 insertions(+), 7 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 b120a8c6856a..245062e51b75 100644 --- a/sys-libs/compiler-rt-sanitizers/Manifest +++ b/sys-libs/compiler-rt-sanitizers/Manifest @@ -5,8 +5,8 @@ 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 4512 BLAKE2B 4398fb881d8fe73b7ccdc37f733c9e221b84be6c32ff015e2be285fc9b14d371ca4d3587e2691b68b128f5df6617d265a21442e2bcc9f631d76f8efbe7313c3e SHA512 c7c74c9ee92e2e85973bdde728d6f2ca9ae8e3fe990b975290fa31ca085a36ea1eca0a4fbd4118c62372af8bd3f2f6a2107c7b884300f30202bca013b4d9e21a -EBUILD compiler-rt-sanitizers-5.0.1.ebuild 4810 BLAKE2B 2145a3ecac6a17a5ccce7ecf819d61ce23b24c21118e2320ced34e2c7ceb54bd4194fe9194cb685275ab2f8804a7f9d7624800ff0260ac821c14887787e73659 SHA512 7a14dafba5fd7919c0f1f2a692f2a6f66553655bf238be18017de5be91a416f512426210bac166ae36a80557b277bdb1e12ba8198cb3a8b0db6b3519cf59e4cf +EBUILD compiler-rt-sanitizers-4.0.1.ebuild 4778 BLAKE2B 5689080c9783d288206a9a7f4d8cee487ef73a951d95baf7083719c89239b299a7cb71361e060876a7564701c353a857e9a640ff5e8f5054d76c6ede66523b5e SHA512 937fab2e9791bd122005469704e5cbbc8907d0f52cb277d779bd93451178e49c8f369be0dec5bff22338a7ed3920f0e125337e9ede02c957c123f968b69ec442 +EBUILD compiler-rt-sanitizers-5.0.1.ebuild 5088 BLAKE2B 987b66738deed02d6b80f277e3c35db84290fe6c5dfc69c8b7cfaed7cdd5d9741a07c4d049825cd4c18ce1c1494042599ba84d1198064105d2d21e31bff3922d SHA512 6f04614e69ce636c69a80709aacdb0977b2dd670d6895fabef573ea1446bbf1764b9e437d811561a9e4a39f365f80c5a3417528f2f3dba19e55a3b5768de1d44 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 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 2dc0d7cb40bd..00662c398d63 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 @@ -28,7 +28,7 @@ DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + !=sys-devel/llvm-6'; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + ) + else + mycmakeargs+=( + -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit + ) + fi + mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" @@ -149,6 +158,10 @@ src_configure() { src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 + # disable sandbox to have it stop clobbering LD_PRELOAD + local -x SANDBOX_ON=0 + # wipe LD_PRELOAD to make ASAN happy + local -x LD_PRELOAD= cmake-utils_src_make check-all } 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 b09a0573d92a..44f086c5f99e 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 @@ -20,7 +20,7 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz LICENSE="|| ( UoI-NCSA MIT )" SLOT="${PV%_*}" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="+clang test elibc_glibc" CLANG_SLOT=${SLOT%%.*} @@ -29,7 +29,7 @@ DEPEND=" >=sys-devel/llvm-4 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + !=dev-python/lit-5[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) @@ -110,9 +110,18 @@ src_configure() { -DCOMPILER_RT_BUILD_XRAY=ON ) if use test; then + if has_version '>=sys-devel/llvm-6'; then + mycmakeargs+=( + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" + ) + else + mycmakeargs+=( + -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit + ) + fi + mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" # they are created during src_test() -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" @@ -160,6 +169,10 @@ src_configure() { src_test() { # respect TMPDIR! local -x LIT_PRESERVES_TMP=1 + # disable sandbox to have it stop clobbering LD_PRELOAD + local -x SANDBOX_ON=0 + # wipe LD_PRELOAD to make ASAN happy + local -x LD_PRELOAD= cmake-utils_src_make check-all } -- cgit v1.2.3