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/
Date: Fri, 11 Oct 2019 18:57:36
Message-Id: 1570820234.3faf3619e7afbc23e59e1a7ea67b9d0a1bd2d824.mgorny@gentoo
1 commit: 3faf3619e7afbc23e59e1a7ea67b9d0a1bd2d824
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 18:27:57 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 18:57:14 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3faf3619
7
8 sys-libs/compiler-rt: Drop redundant 8.0.0
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-libs/compiler-rt/Manifest | 1 -
13 sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild | 109 --------------------------
14 2 files changed, 110 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index 577425a9702..5626461949d 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -1,5 +1,4 @@
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
27 diff --git a/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild
28 deleted file mode 100644
29 index e76c62c6b20..00000000000
30 --- a/sys-libs/compiler-rt/compiler-rt-8.0.0.ebuild
31 +++ /dev/null
32 @@ -1,109 +0,0 @@
33 -# Copyright 1999-2019 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 cmake-utils flag-o-matic llvm multiprocessing \
44 - python-any-r1 toolchain-funcs
45 -
46 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
47 -HOMEPAGE="https://llvm.org/"
48 -SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
49 -
50 -LICENSE="|| ( UoI-NCSA MIT )"
51 -SLOT="${PV%_*}"
52 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
53 -IUSE="+clang test"
54 -RESTRICT="!test? ( test ) !clang? ( test )"
55 -
56 -CLANG_SLOT=${SLOT%%.*}
57 -# llvm-6 for new lit options
58 -DEPEND="
59 - >=sys-devel/llvm-6
60 - clang? ( sys-devel/clang )
61 - test? (
62 - $(python_gen_any_dep "dev-python/lit[\${PYTHON_USEDEP}]")
63 - =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
64 - ${PYTHON_DEPS}"
65 -
66 -S=${WORKDIR}/${P/_/}.src
67 -
68 -# least intrusive of all
69 -CMAKE_BUILD_TYPE=RelWithDebInfo
70 -
71 -pkg_pretend() {
72 - if ! use clang && ! tc-is-clang; then
73 - ewarn "Building using a compiler other than clang may result in broken atomics"
74 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
75 - fi
76 -}
77 -
78 -pkg_setup() {
79 - llvm_pkg_setup
80 - python-any-r1_pkg_setup
81 -}
82 -
83 -test_compiler() {
84 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
85 - <<<'int main() { return 0; }' &>/dev/null
86 -}
87 -
88 -src_configure() {
89 - # pre-set since we need to pass it to cmake
90 - BUILD_DIR=${WORKDIR}/${P}_build
91 -
92 - local nolib_flags=( -nodefaultlibs -lc )
93 - if use clang; then
94 - local -x CC=${CHOST}-clang
95 - local -x CXX=${CHOST}-clang++
96 - # ensure we can use clang before installing compiler-rt
97 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
98 - strip-unsupported-flags
99 - elif ! test_compiler; then
100 - if test_compiler "${nolib_flags[@]}"; then
101 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
102 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
103 - fi
104 - fi
105 -
106 - local mycmakeargs=(
107 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
108 -
109 - -DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
110 - -DCOMPILER_RT_BUILD_LIBFUZZER=OFF
111 - -DCOMPILER_RT_BUILD_PROFILE=OFF
112 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
113 - -DCOMPILER_RT_BUILD_XRAY=OFF
114 - )
115 -
116 - if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
117 - mycmakeargs+=(
118 - # disable use of SDK for the system itself
119 - -DDARWIN_macosx_CACHED_SYSROOT=/
120 - )
121 - fi
122 -
123 - if use test; then
124 - mycmakeargs+=(
125 - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
126 - -DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
127 -
128 - -DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang"
129 - -DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${CLANG_SLOT}/bin/clang++"
130 - )
131 - fi
132 -
133 - cmake-utils_src_configure
134 -}
135 -
136 -src_test() {
137 - # respect TMPDIR!
138 - local -x LIT_PRESERVES_TMP=1
139 -
140 - cmake-utils_src_make check-builtins
141 -}