From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6CA781382C5 for ; Mon, 19 Feb 2018 17:55:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 935FFE0966; Mon, 19 Feb 2018 17:55:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F316E0966 for ; Mon, 19 Feb 2018 17:55:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF4EB335C2E for ; Mon, 19 Feb 2018 17:55:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B2B71DF for ; Mon, 19 Feb 2018 17:55:39 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1519062924.a696cac905cc854b61b5c91515c48f7e1b476ed9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild X-VCS-Directories: sys-libs/compiler-rt-sanitizers/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a696cac905cc854b61b5c91515c48f7e1b476ed9 X-VCS-Branch: master Date: Mon, 19 Feb 2018 17:55:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: acbd10ed-3b65-498b-9824-1efa2a94c5c8 X-Archives-Hash: 218b8c96270e2e3e72fa2e8c42bef6f1 commit: a696cac905cc854b61b5c91515c48f7e1b476ed9 Author: Michał Górny gentoo org> AuthorDate: Mon Feb 19 17:54:02 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Feb 19 17:55:24 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a696cac9 sys-libs/compiler-rt-sanitizers: Stop using unsandbox in 6.0+ Stop relying on app-portage/unsandbox in the live ebuilds. Instead, rely on sys-apps/sandbox-2.13 that supports stopping to clobber LD_PRELOAD on its own! .../compiler-rt-sanitizers-6.0.0_rc2.ebuild | 13 ++++++------- .../compiler-rt-sanitizers-6.0.9999.ebuild | 13 ++++++------- .../compiler-rt-sanitizers-9999.ebuild | 13 ++++++------- 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild index 19492d445c2..8a7c7cce683 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.0_rc2.ebuild @@ -30,7 +30,7 @@ DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + ! "${T}"/unsandbox-lit.py <<-EOF || die - import os, sys - os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:]) - EOF - mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py" + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv" # they are created during src_test() @@ -151,6 +146,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-6.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.9999.ebuild index b3850e773be..b263b10f2f7 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 @@ -30,7 +30,7 @@ DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + ! "${T}"/unsandbox-lit.py <<-EOF || die - import os, sys - os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:]) - EOF - mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py" + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv" # they are created during src_test() @@ -152,6 +147,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-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild index 2b85804e799..f83cb210e4e 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild @@ -29,7 +29,7 @@ DEPEND=" >=sys-devel/llvm-6 clang? ( sys-devel/clang ) test? ( - app-portage/unsandbox + ! "${T}"/unsandbox-lit.py <<-EOF || die - import os, sys - os.execlp("unsandbox", sys.argv[0], "lit", *sys.argv[1:]) - EOF - mycmakeargs+=( -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" - -DLLVM_EXTERNAL_LIT="${T}/unsandbox-lit.py" + -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" -DLLVM_LIT_ARGS="-vv" # they are created during src_test() @@ -151,6 +146,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 }