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: Sun, 02 Jun 2019 07:20:21
Message-Id: 1559459952.53c2aaed46d7192bdeba07799fa76d5b0c5ce8b1.mgorny@gentoo
1 commit: 53c2aaed46d7192bdeba07799fa76d5b0c5ce8b1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 06:19:33 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 07:19:12 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c2aaed
7
8 sys-libs/compiler-rt: Remove 4.0.1
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-4.0.1.ebuild | 144 --------------------------
14 2 files changed, 145 deletions(-)
15
16 diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
17 index 60bcfea3088..3574134d6ff 100644
18 --- a/sys-libs/compiler-rt/Manifest
19 +++ b/sys-libs/compiler-rt/Manifest
20 @@ -1,4 +1,3 @@
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
26 diff --git a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild b/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
27 deleted file mode 100644
28 index bb00a9d93c6..00000000000
29 --- a/sys-libs/compiler-rt/compiler-rt-4.0.1.ebuild
30 +++ /dev/null
31 @@ -1,144 +0,0 @@
32 -# Copyright 1999-2017 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
38 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
39 -CMAKE_MIN_VERSION=3.7.0-r1
40 -PYTHON_COMPAT=( python2_7 )
41 -
42 -# TODO: fix unnecessary dep on Python upstream
43 -inherit cmake-utils flag-o-matic llvm python-any-r1 toolchain-funcs
44 -
45 -DESCRIPTION="Compiler runtime library for clang (built-in part)"
46 -HOMEPAGE="https://llvm.org/"
47 -SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz"
48 -
49 -LICENSE="|| ( UoI-NCSA MIT )"
50 -SLOT="${PV%_*}"
51 -KEYWORDS="amd64 ~arm64 x86"
52 -IUSE="+clang test"
53 -
54 -CLANG_SLOT=${SLOT%%.*}
55 -RDEPEND="!=sys-libs/compiler-rt-${SLOT}*:0"
56 -# llvm-4 needed for --cmakedir
57 -DEPEND="
58 - >=sys-devel/llvm-4
59 - clang? ( sys-devel/clang )
60 - test? ( =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} )
61 - ${PYTHON_DEPS}"
62 -
63 -S=${WORKDIR}/${P/_/}.src
64 -
65 -# least intrusive of all
66 -CMAKE_BUILD_TYPE=RelWithDebInfo
67 -
68 -pkg_pretend() {
69 - if ! use clang && ! tc-is-clang; then
70 - ewarn "Building using a compiler other than clang may result in broken atomics"
71 - ewarn "library. Enable USE=clang unless you have a very good reason not to."
72 - fi
73 -}
74 -
75 -pkg_setup() {
76 - llvm_pkg_setup
77 - python-any-r1_pkg_setup
78 -}
79 -
80 -test_compiler() {
81 - $(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
82 - <<<'int main() { return 0; }' &>/dev/null
83 -}
84 -
85 -src_configure() {
86 - # pre-set since we need to pass it to cmake
87 - BUILD_DIR=${WORKDIR}/${P}_build
88 -
89 - local nolib_flags=( -nodefaultlibs -lc )
90 - if use clang; then
91 - local -x CC=${CHOST}-clang
92 - local -x CXX=${CHOST}-clang++
93 - # ensure we can use clang before installing compiler-rt
94 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
95 - strip-unsupported-flags
96 - elif ! test_compiler; then
97 - if test_compiler "${nolib_flags[@]}"; then
98 - local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
99 - ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
100 - fi
101 - fi
102 -
103 - local mycmakeargs=(
104 - -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}"
105 - # use a build dir structure consistent with install
106 - # this makes it possible to easily deploy test-friendly clang
107 - -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}"
108 -
109 - # currently lit covers only sanitizer tests
110 - -DCOMPILER_RT_INCLUDE_TESTS=OFF
111 - -DCOMPILER_RT_BUILD_SANITIZERS=OFF
112 - -DCOMPILER_RT_BUILD_XRAY=OFF
113 - )
114 -
115 - cmake-utils_src_configure
116 -}
117 -
118 -src_test() {
119 - # prepare a test compiler
120 - # copy clang over since resource_dir is located relatively to binary
121 - # therefore, we can put our new libraries in it
122 - mkdir -p "${BUILD_DIR}"/lib/{llvm/${CLANG_SLOT}{/bin,$(get_libdir)},clang/${SLOT}/include} || die
123 - cp "${EPREFIX}"/usr/lib/llvm/${CLANG_SLOT}/bin/clang{,++} \
124 - "${BUILD_DIR}"/lib/llvm/${CLANG_SLOT}/bin/ || die
125 - cp "${EPREFIX}/usr/lib/clang/${SLOT}/include"/*.h \
126 - "${BUILD_DIR}/lib/clang/${SLOT}/include/" || die
127 -
128 - # builtins are not converted to lit yet, so run them manually
129 - local tests=() f
130 - cd "${S}"/test/builtins/Unit || die
131 - while read -r -d '' f; do
132 - # ppc subdir is unmaintained and lacks proper guards
133 - # (and ppc builtins do not seem to be used anyway)
134 - [[ ${f} == ./ppc/* ]] && continue
135 - # these are special
136 - [[ ${f} == ./cpu_model_test.c ]] && continue
137 - [[ ${f} == ./gcc_personality_test.c ]] && continue
138 - # unsupported
139 - [[ ${f} == ./trampoline_setup_test.c ]] && continue
140 - tests+=( "${f%.c}" )
141 - done < <(find -name '*.c' -print0)
142 -
143 - {
144 - echo "check: ${tests[*]/#/check-}" &&
145 - echo ".PHONY: check ${tests[*]/#/check-}" &&
146 - for f in "${tests[@]}"; do
147 - echo "check-${f}: ${f}" &&
148 - echo " ${f}"
149 - done
150 - } > Makefile || die
151 -
152 - local ABI
153 - for ABI in $(get_all_abis); do
154 - # not supported at all at the moment
155 - [[ ${ABI} == x32 ]] && continue
156 -
157 - rm -f "${tests[@]}" || die
158 -
159 - einfo "Running tests for ABI=${ABI}"
160 - # use -k to run all tests even if some fail
161 - emake -k \
162 - CC="${BUILD_DIR}/lib/llvm/${CLANG_SLOT}/bin/clang" \
163 - CFLAGS="$(get_abi_CFLAGS)" \
164 - CPPFLAGS='-I../../../lib/builtins' \
165 - LDFLAGS='-rtlib=compiler-rt' \
166 - LDLIBS='-lm'
167 - done
168 -}
169 -
170 -src_install() {
171 - cmake-utils_src_install
172 -
173 - # includes are mistakenly installed for all sanitizers and xray
174 - rm -rf "${ED}"usr/lib/clang/*/include || die
175 -}