Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-libs/compiler-rt-sanitizers/
Date: Wed, 23 Jan 2019 19:40:21
Message-Id: 1548271719.e434cf4a9620f5bc8e156896bcfb2755f7ebe17d.blueness@gentoo
1 commit: e434cf4a9620f5bc8e156896bcfb2755f7ebe17d
2 Author: stefson <herrtimson <AT> yahoo <DOT> de>
3 AuthorDate: Sat Jan 19 08:49:59 2019 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 23 19:28:39 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e434cf4a
7
8 sys-libs/compiler-rt-sanitizers: sync with tree
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 .../compiler-rt-sanitizers-6.0.1.ebuild | 14 ++++++++------
13 sys-libs/compiler-rt-sanitizers/metadata.xml | 4 ++++
14 2 files changed, 12 insertions(+), 6 deletions(-)
15
16 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
17 index 7fe9367..f9dd2c1 100644
18 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
19 +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-6.0.1.ebuild
20 @@ -23,7 +23,9 @@ SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
21 LICENSE="|| ( UoI-NCSA MIT )"
22 SLOT="${PV%_*}"
23 KEYWORDS="amd64 x86"
24 -IUSE="+clang test elibc_glibc"
25 +IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
26 +# FIXME: libfuzzer does not enable all its necessary dependencies
27 +REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
28 RESTRICT="!test? ( test ) !clang? ( test )"
29
30 CLANG_SLOT=${SLOT%%.*}
31 @@ -40,7 +42,7 @@ DEPEND="
32
33 S=${WORKDIR}/${MY_P}
34
35 -PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch
36 +PATCHES=( "${FILESDIR}"/${PN}-6.0.1-musl-patches.patch
37 "${FILESDIR}"/0001-fixup-for-interception_type_test.patch
38 )
39
40 @@ -114,10 +116,10 @@ src_configure() {
41 -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
42 # built-ins installed by sys-libs/compiler-rt
43 -DCOMPILER_RT_BUILD_BUILTINS=OFF
44 - -DCOMPILER_RT_BUILD_LIBFUZZER=ON
45 - -DCOMPILER_RT_BUILD_PROFILE=ON
46 - -DCOMPILER_RT_BUILD_SANITIZERS=ON
47 - -DCOMPILER_RT_BUILD_XRAY=ON
48 + -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
49 + -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
50 + -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
51 + -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
52 )
53 if use test; then
54 mycmakeargs+=(
55
56 diff --git a/sys-libs/compiler-rt-sanitizers/metadata.xml b/sys-libs/compiler-rt-sanitizers/metadata.xml
57 index 3b99602..8f5cbb8 100644
58 --- a/sys-libs/compiler-rt-sanitizers/metadata.xml
59 +++ b/sys-libs/compiler-rt-sanitizers/metadata.xml
60 @@ -7,5 +7,9 @@
61 <use>
62 <flag name='clang'>Force building using installed clang (rather
63 than the default CC/CXX).</flag>
64 + <flag name='libfuzzer'>Build fuzzing runtime.</flag>
65 + <flag name='profile'>Build profiling runtime.</flag>
66 + <flag name='sanitize'>Build sanitizer runtimes.</flag>
67 + <flag name='xray'>Build XRay runtime.</flag>
68 </use>
69 </pkgmetadata>