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, 02 Jun 2019 07:20:20
Message-Id: 1559459950.2ddc8543232745706fc18f417def544712455bad.mgorny@gentoo
1 commit: 2ddc8543232745706fc18f417def544712455bad
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 06:19:31 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 07:19:10 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ddc8543
7
8 sys-libs/compiler-rt-sanitizers: Remove 4.0.1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt-sanitizers/Manifest | 3 -
13 .../compiler-rt-sanitizers-4.0.1.ebuild | 171 ---------------------
14 2 files changed, 174 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
17 index aafbd3fb71f..305db448e32 100644
18 --- a/sys-libs/compiler-rt-sanitizers/Manifest
19 +++ b/sys-libs/compiler-rt-sanitizers/Manifest
20 @@ -1,11 +1,8 @@
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.1.0.src.tar.xz 1864248 BLAKE2B 42ab86416f7f85c5833cf85dbfb66b18a5d5cf53fa0560ad43b2ef39f5a2cd7ec1dbe4192cc8dac9b3f658b828c8306f26745c4d0e8f846d9f550ac22717eb33 SHA512 54d3ad80936f011dbf2ecebba3f1b7d4a156044b178228411ba855be5ec48eb646155b74dea1a96674adab6f93803456ae1435395e3240a4423a3f65f4566b55
25 DIST compiler-rt-8.0.0.src.tar.xz 1903020 BLAKE2B dc42c4772132fee5e225bb94805cd6917214c1d830b8ba4f1c774e6e1726ec7846432d1d6881085676b6d094ec04060ec2a95749eb7d93be79268ee7de1bd828 SHA512 fe9f69fe2269fa3d560ae97fdacd462f855fb0b7a5f647f5b8595206ff7febca6496725adc953de411a827c761e2b3ca11a2149f25707d6c62af0722b68ba913
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.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
32
33 diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
34 deleted file mode 100644
35 index b57164e921d..00000000000
36 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-4.0.1.ebuild
37 +++ /dev/null
38 @@ -1,171 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Foundation
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 python-any-r1
50 -
51 -DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
52 -HOMEPAGE="https://llvm.org/"
53 -SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz
54 - https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.xz
55 - test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
56 -
57 -LICENSE="|| ( UoI-NCSA MIT )"
58 -SLOT="${PV%_*}"
59 -KEYWORDS="amd64 ~arm64 x86"
60 -IUSE="+clang test"
61 -
62 -CLANG_SLOT=${SLOT%%.*}
63 -RDEPEND="!=sys-libs/compiler-rt-sanitizers-${SLOT}*:0"
64 -# llvm-4 needed for --cmakedir
65 -DEPEND="
66 - >=sys-devel/llvm-4
67 - clang? ( sys-devel/clang )
68 - test? (
69 - !<sys-apps/sandbox-2.13
70 - $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
71 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT}
72 - sys-libs/compiler-rt:${SLOT} )
73 - ${PYTHON_DEPS}"
74 -
75 -S=${WORKDIR}/compiler-rt-${PV/_/}.src
76 -
77 -# least intrusive of all
78 -CMAKE_BUILD_TYPE=RelWithDebInfo
79 -
80 -check_space() {
81 - if use test; then
82 - local CHECKREQS_DISK_BUILD=11G
83 - check-reqs_pkg_pretend
84 - fi
85 -}
86 -
87 -pkg_pretend() {
88 - check_space
89 -}
90 -
91 -pkg_setup() {
92 - check_space
93 - llvm_pkg_setup
94 - python-any-r1_pkg_setup
95 -}
96 -
97 -src_unpack() {
98 - default
99 -
100 - if use test; then
101 - mv llvm-* llvm || die
102 - fi
103 -}
104 -
105 -src_prepare() {
106 - eapply "${WORKDIR}/${P}-patchset"
107 - cmake-utils_src_prepare
108 -
109 - # sys/ustat.h removed in glibc 2.28
110 - # https://bugs.gentoo.org/675654
111 - eapply "${FILESDIR}"/5.0.2/0001-sanitizer-Use-pre-computed-size-of-struct-ustat-for-.patch
112 -
113 - if use test; then
114 - # remove tests that are broken by new glibc
115 - # (disabled in 6.0.0+, r313069)
116 - if use elibc_glibc && has_version '>=sys-libs/glibc-2.24'; then
117 - rm test/tsan/Linux/user_malloc.cc || die
118 - fi
119 - # https://bugs.llvm.org/show_bug.cgi?id=36065
120 - if use elibc_glibc && has_version '>=sys-libs/glibc-2.25'; then
121 - rm test/lsan/TestCases/use_tls_dynamic.cc || die
122 - rm test/msan/dtls_test.c || die
123 - rm test/sanitizer_common/TestCases/Posix/sanitizer_set_death_callback_test.cc || die
124 - fi
125 - fi
126 -}
127 -
128 -src_configure() {
129 - # pre-set since we need to pass it to cmake
130 - BUILD_DIR=${WORKDIR}/${P}_build
131 -
132 - if use clang; then
133 - local -x CC=${CHOST}-clang
134 - local -x CXX=${CHOST}-clang++
135 - strip-unsupported-flags
136 - fi
137 -
138 - local mycmakeargs=(
139 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
140 - # use a build dir structure consistent with install
141 - # this makes it possible to easily deploy test-friendly clang
142 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
143 -
144 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
145 - # built-ins installed by sys-libs/compiler-rt
146 - -DCOMPILER_RT_BUILD_BUILTINS=OFF
147 - -DCOMPILER_RT_BUILD_SANITIZERS=ON
148 - -DCOMPILER_RT_BUILD_XRAY=ON
149 - )
150 - if use test; then
151 - if has_version '>=sys-devel/llvm-6'; then
152 - mycmakeargs+=(
153 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
154 - )
155 - else
156 - mycmakeargs+=(
157 - -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit
158 - )
159 - fi
160 -
161 - mycmakeargs+=(
162 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
163 -
164 - # they are created during src_test()
165 - -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang"
166 - -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang++"
167 - )
168 -
169 - # same flags are passed for build & tests, so we need to strip
170 - # them down to a subset supported by clang
171 - CC=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang \
172 - CXX=${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++ \
173 - strip-unsupported-flags
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 -}