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