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