From bfb9c86dffdb56600ba35241c2a7d66666d1d47a Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Mon, 6 Jan 2020 14:47:25 +0100 Subject: sys-devel/clang: Remove 9.0.0* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-devel/clang/Manifest | 3 - sys-devel/clang/clang-9.0.0.ebuild | 294 --------------------- ...est-Import-LLVMTestingSupport-if-necessar.patch | 39 --- .../0002-Initialize-all-fields-in-ABIArgInfo.patch | 43 --- ...modules.cpp-test-to-work-when-build-direc.patch | 35 --- 5 files changed, 414 deletions(-) delete mode 100644 sys-devel/clang/clang-9.0.0.ebuild delete mode 100644 sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch delete mode 100644 sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch delete mode 100644 sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch (limited to 'sys-devel/clang') diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest index adcb30029b79..4445aeeedf5d 100644 --- a/sys-devel/clang/Manifest +++ b/sys-devel/clang/Manifest @@ -1,13 +1,10 @@ DIST cfe-7.1.0.src.tar.xz 12487872 BLAKE2B ca6ec9e45b94823de1dabf9e68f0c97cdd40b5d2a5e5e15d4b2393f6d7fbdee72a541b957cc22ce4cb726d8ee7190228320941d5713aeb59695673b9e9070ceb SHA512 1cd0b80f32aa4de1118c0c676ba96b1fc78b7ff929b01b6589dfe9b4669e599ac8cfb8f5a0abcd3487594193a7dec06b29530ec3fc03042c20a160f0477a79fd DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d -DIST cfe-9.0.0.src.tar.xz 13533024 BLAKE2B 61fa57245d54930d09c2ff6024cdefb35592f7d1c644657b0aec9e7cc2dca29b45f08b8a2b716812025a438841e83ac3e30bb6f051498aa860533995ef7757b1 SHA512 83fcca5499102b375e620cdac97d75e6111ebed4ef10240859ddd8a88bc5b022703739d2eae0d8693c91892ad11fc6b531c0dbee62fbce68d3be595b94f0b1fe DIST clang-tools-extra-7.1.0.src.tar.xz 901328 BLAKE2B 20865cf188cf08e4eae969d1083d9d69f57159c3dceb71e3e00a3f4dd96814b99e25fe633eb46801923d64cc9f884da24a417c21af71f0b3535bda0cce7d73da SHA512 8c22136324808b42601915e8163e06a90db078693f9e12369050bca6bab8cb971efaddcda82c5abf08e67ba7a5be1ac32e1bef0aff29a1b433e80eca8eba3e7b DIST clang-tools-extra-8.0.1.src.tar.xz 1994068 BLAKE2B 7d312c1a958d9c5b24515067cbb1db3a92b34cdf77c2345c08ef2f327d2ae4ca7f05252d72ede6569e25cda34225963a8d415cc64279e39d542449ba56eae9c9 SHA512 d39962c30ee9d8a1679d8007009b48dea2c8aaeb283bed781a9e22a1a57b8186c2cfe058da046658882ace1c84a30ddf9b4cb75bce988891189e8423b6c6a72c -DIST clang-tools-extra-9.0.0.src.tar.xz 2183436 BLAKE2B d9682cc615ddeb2ac4fba665089658b423bea085e935c54f1e8c8c71807a9c3c910aee60652accbb24fc4dae262c7877fc7c2f7e098b118f7dc3eef9c7e5941e SHA512 70fd5cdeb8d371e5bbc369bdea3b94a1e3f450e1fdc109a2328d75b30a09c56fbed31678e211172e0a1fc1ff82c9ab4dfea4238be2cc0b82598f71ce9b7ab7d3 DIST llvm-7.1.0-manpages.tar.bz2 120786 BLAKE2B b52a7afe7c5c170894e910ef2c651a5f38f0bd41147a2c63dc5b8a92f0ec37512e913e68efce51e1643e8f20cf0f3f088d31d19c541d2ff361ecb7d89b234b6c SHA512 78a526d889a8e62accf422655acbb4d17e3c22b0f0830003db0068b3c01c367ac32ce4f4be4cbb2966274440865557c25795205af2a59a054a6f6964294d289f DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a DIST llvm-8.0.1-manpages.tar.bz2 140915 BLAKE2B 13ac9e172728d643dac1d12ac06909b6db3dd9a1a380a92a07867e3cb835f94b265da5d75c4712b5409405a65795d2cb6b32da4098e38cbb95d7023b56bcbbc1 SHA512 23994a2374659fbbf8d9b5160f4d77e9be7c4c9fc14963e8186bbede78b0ee9257f6b6a9c484bc75d72443d65bb24e598841e64af500336283de0f454d6a2073 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16 DIST llvm-9.0.0-manpages.tar.bz2 158546 BLAKE2B eed6235698a0b5993affe305f7fd22cd4cf444adf931275a1685f2049a5f17cf2933907577d9ce142348a3c579769b0436aa2b5a9a953958504125a8c3e83b7d SHA512 64c8d18061eb2870b379a1df485be0b61eac07cb10b3f97347b54b2ee326faa63437ca04466776be282e120dd3f6147e14fffdd38ca370db85748fe5eb54d764 -DIST llvm-9.0.0.src.tar.xz 32994768 BLAKE2B 7f09bff9bcada95ab9c920c78aef92b57e665d9188bab39c734084ceb03a801c942fed48ea77fabeeb6110c648cb69363c659a6ce93ebf67dbba5c187219b13b SHA512 1bb3341e1d231559b948f1505b33c2e2e03989f9b8bbfef0e0cdaff5ac43f85574c9ec5ac53399b914f497d6899425d861411024e8d7e1d1a338c1c6951ac658 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 diff --git a/sys-devel/clang/clang-9.0.0.ebuild b/sys-devel/clang/clang-9.0.0.ebuild deleted file mode 100644 index b9a8fd171342..000000000000 --- a/sys-devel/clang/clang-9.0.0.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python{2_7,3_{6,7}} ) -inherit cmake-utils llvm llvm.org multilib-minimal multiprocessing \ - pax-utils python-single-r1 toolchain-funcs - -DESCRIPTION="C language family frontend for LLVM" -HOMEPAGE="https://llvm.org/" -SRC_URI=" - !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-${PV}-manpages.tar.bz2 )" -LLVM_COMPONENTS=( clang clang-tools-extra ) -LLVM_TEST_COMPONENTS=( - llvm/lib/Testing/Support - llvm/utils/{lit,llvm-lit,unittest} -) -llvm.org_set_globals -# We need extra level of indirection for CLANG_RESOURCE_DIR -S=${WORKDIR}/x/y/clang - -# Keep in sync with sys-devel/llvm -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 - NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore ) -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" ) -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?} - -# MSVCSetupApi.h: MIT -# sorttable.js: MIT - -LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT" -SLOT="$(ver_cut 1)" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux" -IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer - test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}" -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( ${ALL_LLVM_TARGETS[*]} )" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}] - static-analyzer? ( dev-lang/perl:* ) - xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] ) - ${PYTHON_DEPS}" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( dev-python/sphinx ) - xml? ( virtual/pkgconfig ) - ${PYTHON_DEPS}" -RDEPEND="${RDEPEND} - ! clang-X - # - clang++, clang-cl, clang-cpp -> clang - # we want to have: - # - clang-X - # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X - # - clang, clang++, clang-cl, clang-cpp -> clang*-X - # also in CHOST variant - for i in "${clang_tools[@]:1}"; do - rm "${ED}/usr/lib/llvm/${SLOT}/bin/${i}" || die - dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}" - dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}" - done - - # now create target symlinks for all supported ABIs - for abi in $(get_all_abis); do - local abi_chost=$(get_abi_CHOST "${abi}") - for i in "${clang_tools[@]}"; do - dosym "${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}" - dosym "${abi_chost}-${i}-${clang_version}" \ - "/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}" - done - done - - # Remove unnecessary headers on FreeBSD, bug #417171 - if use kernel_FreeBSD; then - rm "${ED}"/usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die - fi -} - -multilib_src_install() { - cmake-utils_src_install - - # move headers to /usr/include for wrapping & ABI mismatch checks - # (also drop the version suffix from runtime headers) - rm -rf "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/include "${ED}"/usr/include || die - mv "${ED}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die -} - -multilib_src_install_all() { - python_fix_shebang "${ED}" - if use static-analyzer; then - python_optimize "${ED}"/usr/lib/llvm/${SLOT}/share/scan-view - fi - - # install pre-generated manpages - if ! use doc; then - insinto "/usr/lib/llvm/${SLOT}/share/man/man1" - doins "${WORKDIR}/x/y/llvm-${PV}-manpages/clang"/*.1 - fi - - docompress "/usr/lib/llvm/${SLOT}/share/man" - # match 'html' non-compression - use doc && docompress -x "/usr/share/doc/${PF}/tools-extra" - # +x for some reason; TODO: investigate - use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1" -} - -pkg_postinst() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow update all - fi - - elog "You can find additional utility scripts in:" - elog " ${EROOT}/usr/lib/llvm/${SLOT}/share/clang" - elog "Some of them are vim integration scripts (with instructions inside)." - elog "The run-clang-tidy.py script requires the following additional package:" - elog " dev-python/pyyaml" -} - -pkg_postrm() { - if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then - eselect compiler-shadow clean all - fi -} diff --git a/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch b/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch deleted file mode 100644 index 67ae5a8e4dcf..000000000000 --- a/sys-devel/clang/files/9.0.0/0001-clang-unittest-Import-LLVMTestingSupport-if-necessar.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bfb5b0cb86cf90d9fa794f873644aa642b652c43 Mon Sep 17 00:00:00 2001 -From: Michal Gorny -Date: Thu, 12 Sep 2019 13:06:12 +0000 -Subject: [PATCH] [clang] [unittest] Import LLVMTestingSupport if necessary - -Add LLVMTestingSupport directory from LLVM_MAIN_SRC_DIR when building -clang stand-alone and LLVMTestingSupport library is not present. This -is needed to fix stand-alone builds without clang-tools-extra. - -Differential Revision: https://reviews.llvm.org/D67452 - -llvm-svn: 371733 ---- - clang/unittests/CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index 9a41000cf43..4c222e24599 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -1,6 +1,15 @@ - add_custom_target(ClangUnitTests) - set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests") - -+if(CLANG_BUILT_STANDALONE) -+ # LLVMTestingSupport library is needed for some of the unittests. -+ if (EXISTS ${LLVM_MAIN_SRC_DIR}/lib/Testing/Support -+ AND NOT TARGET LLVMTestingSupport) -+ add_subdirectory(${LLVM_MAIN_SRC_DIR}/lib/Testing/Support -+ lib/Testing/Support) -+ endif() -+endif() -+ - # add_clang_unittest(test_dirname file1.cpp file2.cpp) - # - # Will compile the list of files together and link against the clang --- -2.23.0 - diff --git a/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch b/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch deleted file mode 100644 index cc397f7c078a..000000000000 --- a/sys-devel/clang/files/9.0.0/0002-Initialize-all-fields-in-ABIArgInfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3398b3f937dd025c81d75a7322a6b7b2205ca8da Mon Sep 17 00:00:00 2001 -From: Serge Guelton -Date: Thu, 19 Sep 2019 00:54:40 +0000 -Subject: [PATCH] Initialize all fields in ABIArgInfo. - -Due to usage of an uninitialized fields, we end up with -a Conditional jump or move depends on uninitialised value - -Fixes https://bugs.llvm.org/show_bug.cgi?id=40547 - -Commited on behalf of Martin Liska - -llvm-svn: 372281 ---- - clang/include/clang/CodeGen/CGFunctionInfo.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/clang/include/clang/CodeGen/CGFunctionInfo.h b/clang/include/clang/CodeGen/CGFunctionInfo.h -index 1f81072e23d..5069d9af42a 100644 ---- a/include/clang/CodeGen/CGFunctionInfo.h -+++ b/include/clang/CodeGen/CGFunctionInfo.h -@@ -109,14 +109,12 @@ private: - UnpaddedCoerceAndExpandType = T; - } - -- ABIArgInfo(Kind K) -- : TheKind(K), PaddingInReg(false), InReg(false) { -- } -- - public: -- ABIArgInfo() -+ ABIArgInfo(Kind K = Direct) - : TypeData(nullptr), PaddingType(nullptr), DirectOffset(0), -- TheKind(Direct), PaddingInReg(false), InReg(false) {} -+ TheKind(K), PaddingInReg(false), InAllocaSRet(false), -+ IndirectByVal(false), IndirectRealign(false), SRetAfterThis(false), -+ InReg(false), CanBeFlattened(false), SignExt(false) {} - - static ABIArgInfo getDirect(llvm::Type *T = nullptr, unsigned Offset = 0, - llvm::Type *Padding = nullptr, --- -2.23.0 - diff --git a/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch b/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch deleted file mode 100644 index 250302da8e4c..000000000000 --- a/sys-devel/clang/files/9.0.0/0003-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f18d747107de3504ceac73abc1ec351fe8f58c95 Mon Sep 17 00:00:00 2001 -From: Tom Stellard -Date: Mon, 30 Sep 2019 23:42:17 +0000 -Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name - contains '.s' - -Reviewers: dyung, rsmith, hansw - -Subscribers: mati865, mgorny, cfe-commits - -Tags: #clang - -Differential Revision: https://reviews.llvm.org/D66176 - -llvm-svn: 373275 ---- - clang/test/Driver/modules.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clang/test/Driver/modules.cpp b/clang/test/Driver/modules.cpp -index 7c549c1300f..4f4e3a41400 100644 ---- a/test/Driver/modules.cpp -+++ b/test/Driver/modules.cpp -@@ -15,7 +15,7 @@ - // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE - // - // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}} --// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}} -+// CHECK-COMPILE-SAME: -o {{.*}}module{{2*}}.pcm.o - // CHECK-COMPILE-SAME: -x pcm - // CHECK-COMPILE-SAME: {{.*}}.pcm - --- -2.23.0 - -- cgit v1.2.3-65-gdbad