1 |
commit: 1ff0f6f2f0972797f880d13d713f7b0c6063cf2b |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 25 01:42:24 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 25 01:42:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=1ff0f6f2 |
7 |
|
8 |
sys-libs/compiler-rt-sanitizers: version 5.0.0 breaks the tree |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
11 |
|
12 |
sys-libs/compiler-rt-sanitizers/Manifest | 2 - |
13 |
.../compiler-rt-sanitizers-5.0.0.ebuild | 128 --------------------- |
14 |
2 files changed, 130 deletions(-) |
15 |
|
16 |
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest |
17 |
index 2b8b4a3..cb8ead5 100644 |
18 |
--- a/sys-libs/compiler-rt-sanitizers/Manifest |
19 |
+++ b/sys-libs/compiler-rt-sanitizers/Manifest |
20 |
@@ -1,7 +1,5 @@ |
21 |
DIST compiler-rt-4.0.1.src.tar.xz 1434100 BLAKE2B ca6bf78fc07f387b7244a52ef648b06a5685effb46a66b241a9ee847ecafb17d02602f49b0dbe473d47202586874a043a6d75141400062f526d2f808da323e1e SHA512 cfeb625884b273f7c0e6767b81a8d3e5f24e0b96a510d5764d9d47a0e215fc841b4cb9d1843c8fb428cd21def720cfbfe8d3593ff5bb390548ebc8c32a902649 |
22 |
-DIST compiler-rt-5.0.0.src.tar.xz 1507996 BLAKE2B 7294b7c4fee6401baaf2a9c9bd22d3f94d57334575ae0d5c599b613990d6f139b72acee8c2c66f6c7bc17378d5258290e749f691cc6c6c5bf9f204e3a76b37a0 SHA512 5f3fd49736fba35232b0baa19a5f03c4ab3bf85ec16f23355eb3c516fe6d861c14272c224ca2f2092a80636df4307e49a3df1b60a3791949b3f1ba4a0c8c81fb |
23 |
DIST compiler-rt-5.0.1.src.tar.xz 1498220 BLAKE2B 61503df8a4075c2fe1e42d480753b861321b5de127e340f48d648fc38d81c7967cead17e136beaa5235cc92540f158915fccec77cf39aa7c336d106c9d265222 SHA512 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4 |
24 |
DIST compiler-rt-sanitizers-4.0.1-patchset.tar.xz 2384 BLAKE2B 6f9eee711c83570767f0bb634d0f91c18ee7f2af93a478938b8d5b6ce6f2c2fbaadb7bd5c7ee94a14dc1834359a046187db6bc7005b7c2efa539325dc0701ad9 SHA512 72d7357b4c27bbf8fa8b34803ddea905a9f1054e8fc7bf99a4ead9dc00408989ea2709f04be9cf45a27eeb4b9386c89feeb25b53a84f3cac9739196b89813887 |
25 |
DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d |
26 |
-DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a |
27 |
DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb |
28 |
|
29 |
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild |
30 |
deleted file mode 100644 |
31 |
index 9076a13..0000000 |
32 |
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.0.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,128 +0,0 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
41 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
42 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
43 |
-PYTHON_COMPAT=( python2_7 ) |
44 |
- |
45 |
-inherit check-reqs cmake-utils flag-o-matic llvm python-any-r1 |
46 |
- |
47 |
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)" |
48 |
-HOMEPAGE="https://llvm.org/" |
49 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/compiler-rt-${PV/_/}.src.tar.xz |
50 |
- test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )" |
51 |
- |
52 |
-LICENSE="|| ( UoI-NCSA MIT )" |
53 |
-SLOT="${PV%_*}" |
54 |
-KEYWORDS="~amd64 ~x86" |
55 |
-IUSE="test" |
56 |
- |
57 |
-LLVM_SLOT=${SLOT%%.*} |
58 |
-# llvm-4 needed for --cmakedir |
59 |
-DEPEND=" |
60 |
- >=sys-devel/llvm-4 |
61 |
- test? ( |
62 |
- app-portage/unsandbox |
63 |
- $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") |
64 |
- =sys-devel/clang-${PV%_*}*:${LLVM_SLOT} |
65 |
- sys-libs/compiler-rt:${SLOT} ) |
66 |
- ${PYTHON_DEPS}" |
67 |
- |
68 |
-S=${WORKDIR}/compiler-rt-${PV/_/}.src |
69 |
- |
70 |
-PATCHES=( "${FILESDIR}"/${PN}-5.0.0-musl-patches.patch ) |
71 |
- |
72 |
-# least intrusive of all |
73 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
74 |
- |
75 |
-check_space() { |
76 |
- if use test; then |
77 |
- local CHECKREQS_DISK_BUILD=11G |
78 |
- check-reqs_pkg_pretend |
79 |
- fi |
80 |
-} |
81 |
- |
82 |
-pkg_pretend() { |
83 |
- check_space |
84 |
-} |
85 |
- |
86 |
-pkg_setup() { |
87 |
- check_space |
88 |
- llvm_pkg_setup |
89 |
- python-any-r1_pkg_setup |
90 |
-} |
91 |
- |
92 |
-src_unpack() { |
93 |
- default |
94 |
- |
95 |
- if use test; then |
96 |
- mv llvm-* llvm || die |
97 |
- fi |
98 |
-} |
99 |
- |
100 |
-src_configure() { |
101 |
- # pre-set since we need to pass it to cmake |
102 |
- BUILD_DIR=${WORKDIR}/${P}_build |
103 |
- |
104 |
- local mycmakeargs=( |
105 |
- -DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${SLOT}" |
106 |
- # use a build dir structure consistent with install |
107 |
- # this makes it possible to easily deploy test-friendly clang |
108 |
- -DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${SLOT}" |
109 |
- |
110 |
- -DCOMPILER_RT_INCLUDE_TESTS=$(usex test) |
111 |
- # built-ins installed by sys-libs/compiler-rt |
112 |
- -DCOMPILER_RT_BUILD_BUILTINS=OFF |
113 |
- -DCOMPILER_RT_BUILD_SANITIZERS=ON |
114 |
- -DCOMPILER_RT_BUILD_XRAY=ON |
115 |
- ) |
116 |
- if use test; then |
117 |
- mycmakeargs+=( |
118 |
- -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" |
119 |
- -DLIT_COMMAND="${EPREFIX}/usr/bin/unsandbox;${EPREFIX}/usr/bin/lit" |
120 |
- |
121 |
- # they are created during src_test() |
122 |
- -DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang" |
123 |
- -DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_SLOT}/bin/clang++" |
124 |
- ) |
125 |
- |
126 |
- # same flags are passed for build & tests, so we need to strip |
127 |
- # them down to a subset supported by clang |
128 |
- CC=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang \ |
129 |
- CXX=${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/bin/clang++ \ |
130 |
- strip-unsupported-flags |
131 |
- fi |
132 |
- |
133 |
- cmake-utils_src_configure |
134 |
- |
135 |
- if use test; then |
136 |
- local sys_dir=( "${EPREFIX}"/usr/lib/clang/${SLOT}/lib/* ) |
137 |
- [[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}" |
138 |
- [[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}" |
139 |
- |
140 |
- # copy clang over since resource_dir is located relatively to binary |
141 |
- # therefore, we can put our new libraries in it |
142 |
- mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_SLOT}/{bin,$(get_libdir)},clang/${SLOT}/include} || die |
143 |
- cp "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/bin/clang{,++} \ |
144 |
- "${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/bin/ || die |
145 |
- cp "${EPREFIX}"/usr/lib/clang/${SLOT}/include/*.h \ |
146 |
- "${BUILD_DIR}"/lib/clang/${SLOT}/include/ || die |
147 |
- cp "${sys_dir}"/*builtins*.a \ |
148 |
- "${BUILD_DIR}/lib/clang/${SLOT}/lib/${sys_dir##*/}/" || die |
149 |
- # we also need LLVMgold.so for gold-based tests |
150 |
- if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so ]]; then |
151 |
- ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)/LLVMgold.so \ |
152 |
- "${BUILD_DIR}"/lib/llvm/${LLVM_SLOT}/$(get_libdir)/ || die |
153 |
- fi |
154 |
- fi |
155 |
-} |
156 |
- |
157 |
-src_test() { |
158 |
- # respect TMPDIR! |
159 |
- local -x LIT_PRESERVES_TMP=1 |
160 |
- |
161 |
- cmake-utils_src_make check-all |
162 |
-} |