Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/
Date: Fri, 11 Oct 2019 18:57:36
Message-Id: 1570820235.ae4686ebc8107f253d31ede4bb35cb0e132efcd3.mgorny@gentoo
1 commit: ae4686ebc8107f253d31ede4bb35cb0e132efcd3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 18:27:58 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 18:57:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae4686eb
7
8 sys-libs/compiler-rt-sanitizers: Drop redundant 8.0.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt-sanitizers/Manifest | 2 -
13 .../compiler-rt-sanitizers-8.0.0.ebuild | 171 ---------------------
14 2 files changed, 173 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index 3f501698109..eca2eed4e41 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,11 +1,9 @@
21 DIST compiler-rt-6.0.1.src.tar.xz 1686820 BLAKE2B 59fa3f6e478bd4d6dfa056c85dcdc4349cbce7cea7fc56519feddc9d66c88c9ca48bad7967432ceb81d754213577f12707035afd827cf630a58627575b73b798 SHA512 69850c1ad92c66977fa217cbfb42a6a3f502fbe3d1a08daa7fc4cfeb617a7736d231f8ad8d93b10b1ae29bd753315d2a2d70f9ff1f4d18a9a7cc81758d91f963
22 DIST compiler-rt-7.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
23 -DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
24 DIST compiler-rt-8.0.1.src.tar.xz 1954204 BLAKE2B cbba1d5fb37385116920da39dea26739d09e3f11c392503f8bc45293f1ef00c97f6a9fbd3ba67094d7f1e532410d0eca461943dadfdb10646110470a8e3b5f1f SHA512 12bf1bdabe25c0c3a84cc73a718fe154573dd729ec3ff5e099bd5f74c6bec9c80521b87ded646d3b20dfdb9aa51dea0234281418c7eb81805e1dd5d3107d3d8e
25 DIST compiler-rt-9.0.0.src.tar.xz 1993084 BLAKE2B 4aece9570df4cc38aaa58a3740aa0e1b5cbfe0bfc2d1a590e9e95871fda6ba4dcdeab6125d243c31ce5130386235475339f13da9f900b505eb2fec850a711646 SHA512 a7bb0a67165d29317cee58c22ed79f0d6a9cb9279dcd355d4267f3cd6c531a7be455a28267c591d6e2c0f9c56e363d40c10a405391e07d02ab3e30f00ffef2a8
26 DIST compiler-rt-sanitizers-6.0.1-patchset.tar.xz 8820 BLAKE2B d53ca357e060d058c7f20c51e74684f4c032fdf3ccec4c9f227dc7a5757206f331b9eda25a72c5c66faf4c44b2cc63eb439bd21bdd55d37a93918ab428fd7cd4 SHA512 782a34c56134bd061da30c1f598ddb9e90cb34a4e4ef058fa9634f6da372fd8693ff5e6cf98b59700942273240f83052b89ee2736b22f4e19bc8b519fbec8cad
27 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
28 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
29 -DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
30 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
31 DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658
32
33 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild
34 deleted file mode 100644
35 index cd8873227ef..00000000000
36 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-8.0.0.ebuild
37 +++ /dev/null
38 @@ -1,171 +0,0 @@
39 -# Copyright 1999-2019 Gentoo Authors
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
45 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
46 -CMAKE_MIN_VERSION=3.7.0-r1
47 -PYTHON_COMPAT=( python2_7 )
48 -
49 -inherit check-reqs cmake-utils flag-o-matic llvm \
50 - multiprocessing python-any-r1
51 -
52 -MY_P=compiler-rt-${PV/_/}.src
53 -LLVM_P=llvm-${PV/_/}.src
54 -
55 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
56 -HOMEPAGE="https://llvm.org/"
57 -SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
58 - test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
59 -
60 -LICENSE="|| ( UoI-NCSA MIT )"
61 -SLOT="${PV%_*}"
62 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
63 -IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
64 -# FIXME: libfuzzer does not enable all its necessary dependencies
65 -REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
66 -RESTRICT="!test? ( test ) !clang? ( test )"
67 -
68 -CLANG_SLOT=${SLOT%%.*}
69 -# llvm-6 for new lit options
70 -DEPEND="
71 - >=sys-devel/llvm-6
72 - clang? ( sys-devel/clang )
73 - elibc_glibc? ( net-libs/libtirpc )
74 - test? (
75 - !<sys-apps/sandbox-2.13
76 - $(python_gen_any_dep ">=dev-python/lit-5[\${PYTHON_USEDEP}]")
77 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
78 - sys-libs/compiler-rt:${SLOT} )
79 - ${PYTHON_DEPS}"
80 -
81 -S=${WORKDIR}/${MY_P}
82 -
83 -# least intrusive of all
84 -CMAKE_BUILD_TYPE=RelWithDebInfo
85 -
86 -check_space() {
87 - if use test; then
88 - local CHECKREQS_DISK_BUILD=11G
89 - check-reqs_pkg_pretend
90 - fi
91 -}
92 -
93 -pkg_pretend() {
94 - check_space
95 -}
96 -
97 -pkg_setup() {
98 - check_space
99 - llvm_pkg_setup
100 - python-any-r1_pkg_setup
101 -}
102 -
103 -src_unpack() {
104 - einfo "Unpacking ${MY_P}.tar.xz ..."
105 - tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
106 -
107 - if use test; then
108 - einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
109 - tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
110 - "${LLVM_P}"/utils/unittest || die
111 - mv "${LLVM_P}" llvm || die
112 - fi
113 -}
114 -
115 -src_prepare() {
116 - cmake-utils_src_prepare
117 -
118 - if use test; then
119 - # remove tests that are (still) broken by new glibc
120 - # https://bugs.llvm.org/show_bug.cgi?id=36065
121 - if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
122 - rm test/lsan/TestCases/Linux/fork_and_leak.cc || die
123 - fi
124 - fi
125 -}
126 -
127 -src_configure() {
128 - # pre-set since we need to pass it to cmake
129 - BUILD_DIR=${WORKDIR}/${P}_build
130 -
131 - if use clang; then
132 - local -x CC=${CHOST}-clang
133 - local -x CXX=${CHOST}-clang++
134 - strip-unsupported-flags
135 - fi
136 -
137 - local mycmakeargs=(
138 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
139 - # use a build dir structure consistent with install
140 - # this makes it possible to easily deploy test-friendly clang
141 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
142 -
143 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
144 - # built-ins installed by sys-libs/compiler-rt
145 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
146 - -DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
147 - -DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
148 - -DCOMPILER_RT_BUILD_SANITIZERS=$(usex sanitize)
149 - -DCOMPILER_RT_BUILD_XRAY=$(usex xray)
150 - )
151 - if use test; then
152 - mycmakeargs+=(
153 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
154 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
155 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
156 -
157 - # they are created during src_test()
158 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
159 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
160 - )
161 -
162 - # same flags are passed for build & tests, so we need to strip
163 - # them down to a subset supported by clang
164 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
165 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
166 - strip-unsupported-flags
167 - fi
168 -
169 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
170 - mycmakeargs+=(
171 - # disable use of SDK for the system itself
172 - -DDARWIN_macosx_CACHED_SYSROOT=/
173 - )
174 - fi
175 -
176 - cmake-utils_src_configure
177 -
178 - if use test; then
179 - local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* )
180 - [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
181 - [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
182 -
183 - # copy clang over since resource_dir is located relatively to binary
184 - # therefore, we can put our new libraries in it
185 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die
186 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
187 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
188 - cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \
189 - "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die
190 - cp "${sys_dir}"/*builtins*.a \
191 - "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die
192 - # we also need LLVMgold.so for gold-based tests
193 - if [[ -f ${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so ]]; then
194 - ln -s "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/$(get_libdir)/LLVMgold.so \
195 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/$(get_libdir)/ || die
196 - fi
197 - fi
198 -}
199 -
200 -src_test() {
201 - # respect TMPDIR!
202 - local -x LIT_PRESERVES_TMP=1
203 - # disable sandbox to have it stop clobbering LD_PRELOAD
204 - local -x SANDBOX_ON=0
205 - # wipe LD_PRELOAD to make ASAN happy
206 - local -x LD_PRELOAD=
207 -
208 - cmake-utils_src_make check-all
209 -}