[gentoo-commits] proj/musl:master commit in: sys-libs/compiler-rt-sanitizers/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     e434cf4a9620f5bc8e156896bcfb2755f7ebe17d
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat Jan 19 08:49:59 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Jan 23 19:28:39 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=e434cf4a

sys-libs/compiler-rt-sanitizers: sync with tree

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 .../compiler-rt-sanitizers-6.0.1.ebuild                    | 14 ++++++++------
 sys-libs/compiler-rt-sanitizers/metadata.xml               |  4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
index 7fe9367..f9dd2c1 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
@@ -23,7 +23,9 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
 LICENSE="|| ( UoI-NCSA MIT )"
 SLOT="${PV%_*}"
 KEYWORDS="amd64 x86"
-IUSE="+clang test elibc_glibc"
+IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
+# FIXME: libfuzzer does not enable all its necessary dependencies
+REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
 CLANG_SLOT=${SLOT%%.*}
@@ -40,7 +42,7 @@ DEPEND="
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch 
+PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch
 	"${FILESDIR}"/0001-fixup-for-interception_type_test.patch
 	)
 
@@ -114,10 +116,10 @@ src_configure() {
 		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
 		# built-ins installed by sys-libs/compiler-rt
 		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=ON
-		-DCOMPILER_RT_BUILD_PROFILE=ON
-		-DCOMPILER_RT_BUILD_SANITIZERS=ON
-		-DCOMPILER_RT_BUILD_XRAY=ON
+		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
+		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
+		-DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
+		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
 	)
 	if use test; then
 		mycmakeargs+=(

diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
index 3b99602..8f5cbb8 100644
--- a/sys-libs/compiler-rt-sanitizers/metadata.xml
+++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
@@ -7,5 +7,9 @@
 	<use>
 		<flag name='clang'>Force building using installed clang (rather
 			than the default CC/CXX).</flag>
+		<flag name='libfuzzer'>Build fuzzing runtime.</flag>
+		<flag name='profile'>Build profiling runtime.</flag>
+		<flag name='sanitize'>Build sanitizer runtimes.</flag>
+		<flag name='xray'>Build XRay runtime.</flag>
 	</use>
 </pkgmetadata>