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-devel/clang/files/4.0.1/, sys-devel/clang/files/4.0.1/extra/, ...
Date: Sun, 02 Jun 2019 07:20:22
Message-Id: 1559459955.f6dc64a96ee1e5bab24de17d1bf7ba9ea0269dba.mgorny@gentoo
1 commit: f6dc64a96ee1e5bab24de17d1bf7ba9ea0269dba
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 2 06:19:38 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 2 07:19:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6dc64a9
7
8 sys-devel/clang: Remove 4.0.1
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-devel/clang/Manifest | 4 -
13 sys-devel/clang/clang-4.0.1.ebuild | 299 ---------------------
14 ...rrect-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch | 87 ------
15 ...port-stand-alone-Sphinx-doxygen-doc-build.patch | 64 -----
16 ...st-dependencies-when-using-installed-tool.patch | 48 ----
17 ...ang-library-dir-in-LD_LIBRARY_PATH-For-st.patch | 83 ------
18 6 files changed, 585 deletions(-)
19
20 diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
21 index b11c3c5b87e..21f251c0a92 100644
22 --- a/sys-devel/clang/Manifest
23 +++ b/sys-devel/clang/Manifest
24 @@ -1,14 +1,11 @@
25 -DIST cfe-4.0.1.src.tar.xz 10933628 BLAKE2B bc1bb8875e83ccecd446a48cfa41f5c98a09d6ad24ff439a983f629711b4513b9c4bee4070f8df13b6b2a52d673b0706733a4c151ce5021a0233147debff14ac SHA512 936c9e1626b27e63a4fb11f3c0cb998eeaf9a520ad6e2bcd67cb4352e59e7781ecc700df79794f3fd70473d90b7e2ba418a39038eb0146b68e843f0705c1f964
26 DIST cfe-5.0.2.src.tar.xz 11459216 BLAKE2B 80d9b2ab70b00c0dfd5c5386a44e0c15d8252e6175c9da55a0519c4f9b8192e32e215110d7d3808225786e2c7f906f2dfbe11dd09bdf21574e99709ae237ed0b SHA512 9931afceb5569ad6caec85d506180c810f7fea94af8c997143b0a37cbf413fcea0d92520478610627eeee1efb65fde684066ace0dfcbbf7b61ecd709d22dd0b1
27 DIST cfe-6.0.1.src.tar.xz 11905772 BLAKE2B abb60e9f9827d1d8a24f0aaf8a1d1e32979293cc401258d230f93290e633645747fd0344af189ac7081b06be2cada503364e1e432b37110ade4b3578e40c7605 SHA512 f64ba9290059f6e36fee41c8f32bf483609d31c291fcd2f77d41fecfdf3c8233a5e23b93a1c73fed03683823bd6e72757ed993dd32527de3d5f2b7a64bb031b9
28 DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd
29 DIST cfe-8.0.0.src.tar.xz 12868468 BLAKE2B 3cb96c95c4d9713feb7011e4f1ca24be3e7f6c9b458f6cd9e6905f99737312ca44cb701ed5871e47dd583145e5898d53a65c4cda6456af3d4ca31b670ed84409 SHA512 98e540222719716985e5d8439116e47469cb01201ea91d1da7e46cb6633da099688d9352c3b65e5c5f660cbbae353b3d79bb803fc66b3be663f2b04b1feed1c3
30 -DIST clang-tools-extra-4.0.1.src.tar.xz 581788 BLAKE2B 52ca89eda6fe1e0fbbdc46e17f4067f03a9a9440dcdcc98811651087d0c9ab24dfe3eefb0b80a32ec41abe0766cb3e47031de61c4cff02b7d0e08c8fd03e3faa SHA512 ea26d926f428e62e76cf8a073e63ffe05645f6592e05d7717d5c257908870ae9217727d3e1578227b14eda5937085872463f1a8e99970256179c68b8a92e69e0
31 DIST clang-tools-extra-5.0.2.src.tar.xz 646272 BLAKE2B 8a15a0c3ed9e8c31706d744017aa8be52616037790075c2314c3a613c9e1aa86b0b980c4e3bd9a775b234440f17436392196b41f1691ab25a33b432a25affb68 SHA512 241d85652e7c3ad5d77754ad9a694bddab3c14098067da4119223007c5a4a765d1cd7e7c7dba91666ccd5506f8703c82c9ee487f28249a00c2c4edbd0d1f2640
32 DIST clang-tools-extra-6.0.1.src.tar.xz 757256 BLAKE2B 1d91d7459a34e7251007af91db1803ee6d04f1ef3e0fcf134a7e0d1d3456b094a80339ee60db3f0bdd12961f3a05caee7edfc5c6b9c48d49cd55a5dc3c102c3a SHA512 cf29d117b6dabcb7a8e5f6dab5016ce5a5c8f475679001a43fd5c935f2c368f37cdef50aae2080a1e4524f647f6d83458d4a5dec5b45d03fb374f463caf7c3f5
33 DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b
34 DIST clang-tools-extra-8.0.0.src.tar.xz 1996156 BLAKE2B 26c839669ce4cf531a56e8527c9d507ce458861c00aaf563fa5e58cfa2fa3897d820643746802198c8e77c9e46fc8f4b833fc3746b32d8adc0d4a09dbe3ace7c SHA512 434e4cb7b76f89b0a0af25f05f32f2f2e8edb9e9f14547be845df75f5032c1d9dbf475be408bb989c476ec667c10af54a15d40e42559b05e52d24c5fd416b517
35 -DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
36 DIST llvm-5.0.2-manpages.tar.bz2 93977 BLAKE2B 8c5e8899e0df9d6037fb7d5c373de6492ccdc9fd2c26cc7dfbd8fb2b9e68418ca8fdf42cdc303c361e649cc6939bf5229cbad017bdccbd5d791e92752328252f SHA512 568615bce5a75d42e4b6d592557472d366d49a99f8e81be10ae679804f1fe674c7fd0bbdac09af44fc67ee5aa34c4ed2153c2767c536ac8e45dd15c811c92dcb
37 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
38 DIST llvm-6.0.1-manpages.tar.bz2 102656 BLAKE2B 9088ca0bdda69f63354e61b7495df54505d5db2504bc61860a7260343722ec8cdd5e937d0843263a5bf5077b9cf386c337fa127039b996bab10d2ca5c2caeb59 SHA512 c468e97a2d5610aee9e72cb795e4e65375a079d733550f05380230fb44ba0ed67d407ad06e2340b66f13d19c06583b657e8d01fcdca2146ae43964cea309e0b3
39 @@ -17,4 +14,3 @@ DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f
40 DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
41 DIST llvm-8.0.0-manpages.tar.bz2 140542 BLAKE2B e6c58865ace0b8848ffe825e931a639daa5b22099317b3263acf8df4b8d5e1e97ed54a85b9241e6874b112c67114bda5617c3014c3bc1430c179bdf389e77269 SHA512 198f5bde8c610aa7953b325fc29c2bebe5c3d81469af6273975ed32cd739a9936813fca7399acc49809c322cf73fbdaa77a834f889bd78fe4672024965ea47fb
42 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
43 -DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
44
45 diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
46 deleted file mode 100644
47 index 469a613db91..00000000000
48 --- a/sys-devel/clang/clang-4.0.1.ebuild
49 +++ /dev/null
50 @@ -1,299 +0,0 @@
51 -# Copyright 1999-2018 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=6
55 -
56 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
57 -# (needed due to CMAKE_BUILD_TYPE != Gentoo)
58 -CMAKE_MIN_VERSION=3.7.0-r1
59 -PYTHON_COMPAT=( python2_7 )
60 -
61 -inherit cmake-utils flag-o-matic llvm multilib-minimal \
62 - python-single-r1 toolchain-funcs pax-utils versionator
63 -
64 -DESCRIPTION="C language family frontend for LLVM"
65 -HOMEPAGE="https://llvm.org/"
66 -SRC_URI="https://releases.llvm.org/${PV/_//}/cfe-${PV/_/}.src.tar.xz
67 - https://releases.llvm.org/${PV/_//}/clang-tools-extra-${PV/_/}.src.tar.xz
68 - !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-${PV}.tar.bz2 )
69 - test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
70 -
71 -# Keep in sync with sys-devel/llvm
72 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
73 - NVPTX PowerPC RISCV Sparc SystemZ X86 XCore )
74 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
75 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
76 -
77 -LICENSE="UoI-NCSA"
78 -SLOT="$(get_major_version)"
79 -KEYWORDS="amd64 ~arm64 x86"
80 -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
81 - test xml elibc_musl kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
82 -
83 -RDEPEND="
84 - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
85 - static-analyzer? ( dev-lang/perl:* )
86 - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
87 - ${PYTHON_DEPS}"
88 -# configparser-3.2 breaks the build (3.3 or none at all are fine)
89 -DEPEND="${RDEPEND}
90 - doc? ( dev-python/sphinx )
91 - xml? ( virtual/pkgconfig )
92 - !!<dev-python/configparser-3.3.0.2
93 - ${PYTHON_DEPS}"
94 -RDEPEND="${RDEPEND}
95 - !<sys-devel/llvm-4.0.0_rc:0
96 - !sys-devel/clang:0"
97 -PDEPEND="
98 - ~sys-devel/clang-runtime-${PV}
99 - default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
100 - default-libcxx? ( >=sys-libs/libcxx-${PV} )"
101 -
102 -REQUIRED_USE="${PYTHON_REQUIRED_USE}
103 - || ( ${ALL_LLVM_TARGETS[*]} )"
104 -
105 -# We need extra level of indirection for CLANG_RESOURCE_DIR
106 -S=${WORKDIR}/x/y/cfe-${PV/_/}.src
107 -
108 -# least intrusive of all
109 -CMAKE_BUILD_TYPE=RelWithDebInfo
110 -
111 -# Multilib notes:
112 -# 1. ABI_* flags control ABIs libclang* is built for only.
113 -# 2. clang is always capable of compiling code for all ABIs for enabled
114 -# target. However, you will need appropriate crt* files (installed
115 -# e.g. by sys-devel/gcc and sys-libs/glibc).
116 -# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
117 -# in the current profile (i.e. alike supported by sys-devel/gcc).
118 -#
119 -# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
120 -# multilib clang* libraries (not runtime, not wrappers).
121 -
122 -pkg_setup() {
123 - LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
124 - python-single-r1_pkg_setup
125 -}
126 -
127 -src_unpack() {
128 - # create extra parent dirs for CLANG_RESOURCE_DIR
129 - mkdir -p x/y || die
130 - cd x/y || die
131 -
132 - default
133 -
134 - mv clang-tools-extra-*.src "${S}"/tools/extra || die
135 - if use test; then
136 - mv llvm-*.src "${WORKDIR}"/llvm || die
137 - fi
138 -}
139 -
140 -src_prepare() {
141 - # fix finding compiler-rt libs
142 - eapply "${FILESDIR}"/5.0.2/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
143 -
144 - # fix stand-alone doc build
145 - eapply "${FILESDIR}"/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
146 -
147 - # fix value of ATOMIC_*_LOCK_FREE
148 - # (backport, temporary reverted upstream because of FreeBSD issues)
149 - eapply "${FILESDIR}"/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
150 -
151 - cd tools/extra || die
152 - # fix stand-alone test build for extra tools
153 - eapply "${FILESDIR}"/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
154 - eapply "${FILESDIR}"/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
155 - cd - >/dev/null || die
156 -
157 - # User patches
158 - cmake-utils_src_prepare
159 -}
160 -
161 -multilib_src_configure() {
162 - local llvm_version=$(llvm-config --version) || die
163 - local clang_version=$(get_version_component_range 1-3 "${llvm_version}")
164 -
165 - local mycmakeargs=(
166 - # ensure that the correct llvm-config is used
167 - -DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
168 - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
169 - -DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
170 - # relative to bindir
171 - -DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
172 -
173 - -DBUILD_SHARED_LIBS=ON
174 - -DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
175 - -DLLVM_BUILD_TESTS=$(usex test)
176 -
177 - # these are not propagated reliably, so redefine them
178 - -DLLVM_ENABLE_EH=ON
179 - -DLLVM_ENABLE_RTTI=ON
180 -
181 - -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
182 - # libgomp support fails to find headers without explicit -I
183 - # furthermore, it provides only syntax checking
184 - -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
185 -
186 - # override default stdlib and rtlib
187 - -DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
188 - -DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
189 -
190 - -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
191 - -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
192 - )
193 - use test && mycmakeargs+=(
194 - -DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
195 - )
196 -
197 - if multilib_is_native_abi; then
198 - mycmakeargs+=(
199 - -DLLVM_BUILD_DOCS=$(usex doc)
200 - -DLLVM_ENABLE_SPHINX=$(usex doc)
201 - -DLLVM_ENABLE_DOXYGEN=OFF
202 -
203 - # workaround pthread
204 - -DPTHREAD_LIB=-pthread
205 - )
206 - use doc && mycmakeargs+=(
207 - -DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
208 - -DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
209 - -DSPHINX_WARNINGS_AS_ERRORS=OFF
210 - )
211 - else
212 - mycmakeargs+=(
213 - -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
214 - )
215 - fi
216 -
217 - if [[ -n ${EPREFIX} ]]; then
218 - mycmakeargs+=(
219 - -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
220 - )
221 - fi
222 -
223 - if tc-is-cross-compiler; then
224 - [[ -x "/usr/bin/clang-tblgen" ]] \
225 - || die "/usr/bin/clang-tblgen not found or usable"
226 - mycmakeargs+=(
227 - -DCMAKE_CROSSCOMPILING=ON
228 - -DCLANG_TABLEGEN=/usr/bin/clang-tblgen
229 - )
230 - fi
231 -
232 - # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
233 - use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
234 - cmake-utils_src_configure
235 -}
236 -
237 -multilib_src_compile() {
238 - cmake-utils_src_compile
239 -
240 - # provide a symlink for tests
241 - if [[ ! -L ${WORKDIR}/lib/clang ]]; then
242 - mkdir -p "${WORKDIR}"/lib || die
243 - ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
244 - fi
245 -}
246 -
247 -multilib_src_test() {
248 - # respect TMPDIR!
249 - local -x LIT_PRESERVES_TMP=1
250 - cmake-utils_src_make check-clang
251 - # clang-tidy requires [static-analyzer] and tests are not split
252 - # correctly, so they are all disabled when static-analyzer is off
253 - if multilib_is_native_abi && use static-analyzer; then
254 - cmake-utils_src_make check-clang-tools
255 - fi
256 -}
257 -
258 -src_install() {
259 - MULTILIB_WRAPPED_HEADERS=(
260 - /usr/include/clang/Config/config.h
261 - )
262 -
263 - multilib-minimal_src_install
264 -
265 - # Move runtime headers to /usr/lib/clang, where they belong
266 - mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
267 - # move (remaining) wrapped headers back
268 - mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
269 -
270 - # Apply CHOST and version suffix to clang tools
271 - # note: we use two version components here (vs 3 in runtime path)
272 - local llvm_version=$(llvm-config --version) || die
273 - local clang_version=$(get_version_component_range 1-2 "${llvm_version}")
274 - local clang_full_version=$(get_version_component_range 1-3 "${llvm_version}")
275 - local clang_tools=( clang clang++ clang-cl clang-cpp )
276 - local abi i
277 -
278 - # cmake gives us:
279 - # - clang-X.Y
280 - # - clang -> clang-X.Y
281 - # - clang++, clang-cl, clang-cpp -> clang
282 - # we want to have:
283 - # - clang-X.Y
284 - # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
285 - # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
286 - # also in CHOST variant
287 - for i in "${clang_tools[@]:1}"; do
288 - rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
289 - dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
290 - dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
291 - done
292 -
293 - # now create target symlinks for all supported ABIs
294 - for abi in $(get_all_abis); do
295 - local abi_chost=$(get_abi_CHOST "${abi}")
296 - for i in "${clang_tools[@]}"; do
297 - dosym "${i}-${clang_version}" \
298 - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
299 - dosym "${abi_chost}-${i}-${clang_version}" \
300 - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
301 - done
302 - done
303 -
304 - # Remove unnecessary headers on FreeBSD, bug #417171
305 - if use kernel_FreeBSD; then
306 - rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
307 - fi
308 -}
309 -
310 -multilib_src_install() {
311 - cmake-utils_src_install
312 -
313 - # move headers to /usr/include for wrapping & ABI mismatch checks
314 - # (also drop the version suffix from runtime headers)
315 - rm -rf "${ED%/}"/usr/include || die
316 - mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
317 - mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
318 -}
319 -
320 -multilib_src_install_all() {
321 - python_fix_shebang "${ED}"
322 - if use static-analyzer; then
323 - python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
324 - fi
325 -
326 - # install pre-generated manpages
327 - if ! use doc; then
328 - insinto "/usr/lib/llvm/${SLOT}/share/man/man1"
329 - doins "${WORKDIR}/x/y/llvm-manpages-${PV}/clang"/*.1
330 - fi
331 -
332 - docompress "/usr/lib/llvm/${SLOT}/share/man"
333 - # match 'html' non-compression
334 - use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
335 - # +x for some reason; TODO: investigate
336 - use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
337 -}
338 -
339 -pkg_postinst() {
340 - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
341 - eselect compiler-shadow update all
342 - fi
343 -}
344 -
345 -pkg_postrm() {
346 - if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
347 - eselect compiler-shadow clean all
348 - fi
349 -}
350
351 diff --git a/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch b/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
352 deleted file mode 100644
353 index f52d445eb05..00000000000
354 --- a/sys-devel/clang/files/4.0.1/0001-Frontend-Correct-values-of-ATOMIC_-_LOCK_FREE-to-mat.patch
355 +++ /dev/null
356 @@ -1,87 +0,0 @@
357 -From f1ea62e93cba334828c427146cc2ca7718a9ffb3 Mon Sep 17 00:00:00 2001
358 -From: Michal Gorny <mgorny@g.o>
359 -Date: Mon, 9 Jan 2017 20:54:20 +0000
360 -Subject: [PATCH] [Frontend] Correct values of ATOMIC_*_LOCK_FREE to match
361 - builtin
362 -
363 -Correct the logic used to set ATOMIC_*_LOCK_FREE preprocessor macros not
364 -to rely on the ABI alignment of types. Instead, just assume all those
365 -types are aligned correctly by default since clang uses safe alignment
366 -for _Atomic types even if the underlying types are aligned to a lower
367 -boundary by default.
368 -
369 -For example, the 'long long' and 'double' types on x86 are aligned to
370 -32-bit boundary by default. However, '_Atomic long long' and '_Atomic
371 -double' are aligned to 64-bit boundary, therefore satisfying
372 -the requirements of lock-free atomic operations.
373 -
374 -This fixes PR #19355 by correcting the value of
375 -__GCC_ATOMIC_LLONG_LOCK_FREE on x86, and therefore also fixing
376 -the assumption made in libc++ tests. This also fixes PR #30581 by
377 -applying a consistent logic between the functions used to implement
378 -both interfaces.
379 -
380 -Differential Revision: https://reviews.llvm.org/D28213
381 -
382 -git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@291477 91177308-0d34-0410-b5e6-96231b3b80d8
383 ----
384 - lib/Frontend/InitPreprocessor.cpp | 10 ++++------
385 - test/Sema/atomic-ops.c | 4 ----
386 - 2 files changed, 4 insertions(+), 10 deletions(-)
387 -
388 -diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
389 -index 17603ada11..4502c92499 100644
390 ---- a/lib/Frontend/InitPreprocessor.cpp
391 -+++ b/lib/Frontend/InitPreprocessor.cpp
392 -@@ -286,12 +286,12 @@ static void DefineFastIntType(unsigned TypeWidth, bool IsSigned,
393 -
394 - /// Get the value the ATOMIC_*_LOCK_FREE macro should have for a type with
395 - /// the specified properties.
396 --static const char *getLockFreeValue(unsigned TypeWidth, unsigned TypeAlign,
397 -- unsigned InlineWidth) {
398 -+static const char *getLockFreeValue(unsigned TypeWidth, unsigned InlineWidth) {
399 - // Fully-aligned, power-of-2 sizes no larger than the inline
400 - // width will be inlined as lock-free operations.
401 -- if (TypeWidth == TypeAlign && (TypeWidth & (TypeWidth - 1)) == 0 &&
402 -- TypeWidth <= InlineWidth)
403 -+ // Note: we do not need to check alignment since _Atomic(T) is always
404 -+ // appropriately-aligned in clang.
405 -+ if ((TypeWidth & (TypeWidth - 1)) == 0 && TypeWidth <= InlineWidth)
406 - return "2"; // "always lock free"
407 - // We cannot be certain what operations the lib calls might be
408 - // able to implement as lock-free on future processors.
409 -@@ -881,7 +881,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
410 - #define DEFINE_LOCK_FREE_MACRO(TYPE, Type) \
411 - Builder.defineMacro("__GCC_ATOMIC_" #TYPE "_LOCK_FREE", \
412 - getLockFreeValue(TI.get##Type##Width(), \
413 -- TI.get##Type##Align(), \
414 - InlineWidthBits));
415 - DEFINE_LOCK_FREE_MACRO(BOOL, Bool);
416 - DEFINE_LOCK_FREE_MACRO(CHAR, Char);
417 -@@ -894,7 +893,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
418 - DEFINE_LOCK_FREE_MACRO(LLONG, LongLong);
419 - Builder.defineMacro("__GCC_ATOMIC_POINTER_LOCK_FREE",
420 - getLockFreeValue(TI.getPointerWidth(0),
421 -- TI.getPointerAlign(0),
422 - InlineWidthBits));
423 - #undef DEFINE_LOCK_FREE_MACRO
424 - }
425 -diff --git a/test/Sema/atomic-ops.c b/test/Sema/atomic-ops.c
426 -index 8ebf3eaed4..d3ebdf67db 100644
427 ---- a/test/Sema/atomic-ops.c
428 -+++ b/test/Sema/atomic-ops.c
429 -@@ -14,11 +14,7 @@ _Static_assert(__GCC_ATOMIC_WCHAR_T_LOCK_FREE == 2, "");
430 - _Static_assert(__GCC_ATOMIC_SHORT_LOCK_FREE == 2, "");
431 - _Static_assert(__GCC_ATOMIC_INT_LOCK_FREE == 2, "");
432 - _Static_assert(__GCC_ATOMIC_LONG_LOCK_FREE == 2, "");
433 --#ifdef __i386__
434 --_Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 1, "");
435 --#else
436 - _Static_assert(__GCC_ATOMIC_LLONG_LOCK_FREE == 2, "");
437 --#endif
438 - _Static_assert(__GCC_ATOMIC_POINTER_LOCK_FREE == 2, "");
439 -
440 - _Static_assert(__c11_atomic_is_lock_free(1), "");
441 ---
442 -2.12.0
443 -
444
445 diff --git a/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch b/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
446 deleted file mode 100644
447 index 0ecd5bc0e8c..00000000000
448 --- a/sys-devel/clang/files/4.0.1/0007-cmake-Support-stand-alone-Sphinx-doxygen-doc-build.patch
449 +++ /dev/null
450 @@ -1,64 +0,0 @@
451 -From 8dd12df445c9a35f7b1c0202eb7c74b954b0980d Mon Sep 17 00:00:00 2001
452 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
453 -Date: Sun, 21 Aug 2016 23:31:55 +0200
454 -Subject: [PATCH 7/7] cmake: Support stand-alone Sphinx & doxygen doc build
455 -
456 -Copy the necessary options and configuration checks from LLVM to clang,
457 -to support stand-alone documentation builds.
458 -
459 -Patch: https://reviews.llvm.org/D23758
460 ----
461 - CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++++++
462 - 1 file changed, 37 insertions(+)
463 -
464 -diff --git a/CMakeLists.txt b/CMakeLists.txt
465 -index 8ed8c10..3f34d8c 100644
466 ---- a/CMakeLists.txt
467 -+++ b/CMakeLists.txt
468 -@@ -162,6 +162,43 @@ Please install Python or specify the PYTHON_EXECUTABLE CMake variable.")
469 - endif()
470 - endif()
471 -
472 -+ option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
473 -+ option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)
474 -+ option (LLVM_ENABLE_DOXYGEN "Use doxygen to generate llvm API documentation." OFF)
475 -+ option (LLVM_ENABLE_SPHINX "Use Sphinx to generate llvm documentation." OFF)
476 -+
477 -+ if (LLVM_ENABLE_DOXYGEN)
478 -+ message(STATUS "Doxygen enabled.")
479 -+ find_package(Doxygen REQUIRED)
480 -+
481 -+ if (DOXYGEN_FOUND)
482 -+ # If we find doxygen and we want to enable doxygen by default create a
483 -+ # global aggregate doxygen target for generating llvm and any/all
484 -+ # subprojects doxygen documentation.
485 -+ if (LLVM_BUILD_DOCS)
486 -+ add_custom_target(doxygen ALL)
487 -+ endif()
488 -+
489 -+ option(LLVM_DOXYGEN_EXTERNAL_SEARCH "Enable doxygen external search." OFF)
490 -+ if (LLVM_DOXYGEN_EXTERNAL_SEARCH)
491 -+ set(LLVM_DOXYGEN_SEARCHENGINE_URL "" CACHE STRING "URL to use for external search.")
492 -+ set(LLVM_DOXYGEN_SEARCH_MAPPINGS "" CACHE STRING "Doxygen Search Mappings")
493 -+ endif()
494 -+ endif()
495 -+ else()
496 -+ message(STATUS "Doxygen disabled.")
497 -+ endif()
498 -+
499 -+ if (LLVM_ENABLE_SPHINX)
500 -+ message(STATUS "Sphinx enabled.")
501 -+ find_package(Sphinx REQUIRED)
502 -+ if (LLVM_BUILD_DOCS)
503 -+ add_custom_target(sphinx ALL)
504 -+ endif()
505 -+ else()
506 -+ message(STATUS "Sphinx disabled.")
507 -+ endif()
508 -+
509 - set( CLANG_BUILT_STANDALONE 1 )
510 - set(BACKEND_PACKAGE_STRING "LLVM ${LLVM_PACKAGE_VERSION}")
511 - else()
512 ---
513 -2.9.3
514 -
515
516 diff --git a/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch b/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
517 deleted file mode 100644
518 index 3779bc62031..00000000000
519 --- a/sys-devel/clang/files/4.0.1/extra/0001-test-Fix-test-dependencies-when-using-installed-tool.patch
520 +++ /dev/null
521 @@ -1,48 +0,0 @@
522 -From f1355920fbe819c5b1f5a870fc76cffcdd6328f0 Mon Sep 17 00:00:00 2001
523 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
524 -Date: Fri, 10 Feb 2017 22:44:53 +0100
525 -Subject: [PATCH 1/2] [test] Fix test dependencies when using installed tools
526 -
527 -Use the LLVM_UTILS_PROVIDED variable to determine whether test tool
528 -dependencies should be exposed for clang-tools-extra tests. If clang is
529 -being built stand-alone and LLVM test tools (FileCheck, count and not)
530 -are installed, the top-level CMakeLists.txt of clang sets this variable
531 -to indicate that they will not be built as a part of this build,
532 -and therefore no dependencies should be emitted for them. This fixes
533 -the dependency errors when building clang stand-alone with tests
534 -enabled.
535 ----
536 - test/CMakeLists.txt | 10 +++++++---
537 - 1 file changed, 7 insertions(+), 3 deletions(-)
538 -
539 -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
540 -index a852ef60..c26bd5c4 100644
541 ---- a/test/CMakeLists.txt
542 -+++ b/test/CMakeLists.txt
543 -@@ -31,9 +31,6 @@ if(CLANG_TOOLS_TEST_USE_VG)
544 - endif()
545 -
546 - set(CLANG_TOOLS_TEST_DEPS
547 -- # Base line deps.
548 -- FileCheck count not
549 --
550 - # clang-tidy tests require it.
551 - clang-headers
552 -
553 -@@ -58,6 +55,13 @@ set(CLANG_TOOLS_TEST_DEPS
554 - ExtraToolsUnitTests
555 - )
556 -
557 -+if(NOT LLVM_UTILS_PROVIDED)
558 -+ list(APPEND CLANG_TOOLS_TEST_DEPS
559 -+ # Base line deps.
560 -+ FileCheck count not
561 -+ )
562 -+endif()
563 -+
564 - add_lit_testsuite(check-clang-tools "Running the Clang extra tools' regression tests"
565 - ${CMAKE_CURRENT_BINARY_DIR}
566 - DEPENDS ${CLANG_TOOLS_TEST_DEPS}
567 ---
568 -2.12.0
569 -
570
571 diff --git a/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch b/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
572 deleted file mode 100644
573 index 22f6d5685f3..00000000000
574 --- a/sys-devel/clang/files/4.0.1/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
575 +++ /dev/null
576 @@ -1,83 +0,0 @@
577 -From f3ff810e81c35133f6a7e463d860bcd4ca30be84 Mon Sep 17 00:00:00 2001
578 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@g.o>
579 -Date: Sun, 19 Feb 2017 12:13:04 +0100
580 -Subject: [PATCH 2/2] [test] Fix clang library dir in LD_LIBRARY_PATH For
581 - stand-alone build
582 -
583 -Prepend the clang library directory (determined using SHLIBDIR, alike
584 -in clang) to the LD_LIBRARY_PATH to ensure that just-built clang
585 -libraries will be used instead of a previous installed version.
586 -
587 -When a stand-alone build is performed, LLVM_LIBS_DIR contains the path
588 -to installed LLVM library directory. The same directory frequently
589 -contains a previously installed version of clang. SHLIBDIR, on the other
590 -hand, is always the build-tree directory, and therefore contains
591 -the freshly built clang libraries.
592 -
593 -In a non-stand-alone build, both paths will be the same and therefore
594 -including them both will not cause any issues.
595 ----
596 - test/Unit/lit.cfg | 9 ++++++---
597 - test/lit.cfg | 5 ++++-
598 - test/lit.site.cfg.in | 1 +
599 - 3 files changed, 11 insertions(+), 4 deletions(-)
600 -
601 -diff --git a/test/Unit/lit.cfg b/test/Unit/lit.cfg
602 -index ff70123c..3a1da187 100644
603 ---- a/test/Unit/lit.cfg
604 -+++ b/test/Unit/lit.cfg
605 -@@ -41,14 +41,17 @@ elif platform.system() == 'Windows':
606 - shlibpath_var = 'PATH'
607 -
608 - # Point the dynamic loader at dynamic libraries in 'lib'.
609 -+shlibdir = getattr(config, 'shlibdir', None)
610 -+if not shlibdir:
611 -+ lit_config.fatal('No shlibdir set!')
612 - llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
613 - if not llvm_libs_dir:
614 - lit_config.fatal('No LLVM libs dir set!')
615 --shlibpath = os.path.pathsep.join((llvm_libs_dir,
616 -+shlibpath = os.path.pathsep.join((shlibdir, llvm_libs_dir,
617 - config.environment.get(shlibpath_var,'')))
618 -
619 - # Win32 seeks DLLs along %PATH%.
620 --if sys.platform in ['win32', 'cygwin'] and os.path.isdir(config.shlibdir):
621 -- shlibpath = os.path.pathsep.join((config.shlibdir, shlibpath))
622 -+if sys.platform in ['win32', 'cygwin'] and os.path.isdir(shlibdir):
623 -+ shlibpath = os.path.pathsep.join((shlibdir, shlibpath))
624 -
625 - config.environment[shlibpath_var] = shlibpath
626 -diff --git a/test/lit.cfg b/test/lit.cfg
627 -index bb592936..0e7de849 100644
628 ---- a/test/lit.cfg
629 -+++ b/test/lit.cfg
630 -@@ -99,10 +99,13 @@ if clang_tools_binary_dir is not None:
631 - clang_tools_dir, llvm_tools_dir, config.environment['PATH']))
632 - config.environment['PATH'] = path
633 -
634 -+ clang_libs_dir = getattr(config, 'clang_libs_dir', None)
635 -+ if not clang_libs_dir:
636 -+ lit_config.fatal('No Clang libs dir set!')
637 - llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
638 - if not llvm_libs_dir:
639 - lit_config.fatal('No LLVM libs dir set!')
640 -- path = os.path.pathsep.join((llvm_libs_dir,
641 -+ path = os.path.pathsep.join((clang_libs_dir, llvm_libs_dir,
642 - config.environment.get('LD_LIBRARY_PATH','')))
643 - config.environment['LD_LIBRARY_PATH'] = path
644 -
645 -diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
646 -index dfd0164c..f310b59a 100644
647 ---- a/test/lit.site.cfg.in
648 -+++ b/test/lit.site.cfg.in
649 -@@ -7,6 +7,7 @@ config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
650 - config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
651 - config.clang_tools_binary_dir = "@CLANG_TOOLS_BINARY_DIR@"
652 - config.clang_tools_dir = "@CLANG_TOOLS_DIR@"
653 -+config.clang_libs_dir = "@SHLIBDIR@"
654 - config.python_executable = "@PYTHON_EXECUTABLE@"
655 - config.target_triple = "@TARGET_TRIPLE@"
656 -
657 ---
658 -2.12.0
659 -