commit:     cf1df40be543551bfe9c519e66a31656726a94bb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 19:29:05 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 19:31:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1df40b

sys-libs/llvm-libunwind: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-libs/llvm-libunwind/Manifest                   |   2 -
 .../llvm-libunwind/llvm-libunwind-13.0.0.ebuild    | 142 ---------------------
 .../llvm-libunwind/llvm-libunwind-14.0.0.ebuild    | 116 -----------------
 3 files changed, 260 deletions(-)

diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f0d32f05e2ef..f4aca5653566 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -1,7 +1,5 @@
 DIST llvm-gentoo-patchset-13.0.1.tar.xz 6288 BLAKE2B 
899222b962486e924e4f8a2b574d285531a3f87af9385ff68c81db92aa224a0cde6d4ee049b5405056bedb4b232b50e1d5840024071a4a215f6311853304c92d
 SHA512 
b2805337f1deca626768a44c5e7ac9ed16e0c31bead1647d44a493a8123c1b8e8f1c8ceee3536bcc6fa87fdd3fcec408229f701adf30eff07e7ef9889b847b01
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B 
ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985
 SHA512 
9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.1.tar.gz 134259748 BLAKE2B 
f41de787bc73ff2edfda1b22cc8602be6f65f37dd9e4c8888533cfa8c3ccdcf4f108aaab9de23ab0ab987966eb160f2a553a0bdff99461e71ddd5bfcd086090d
 SHA512 
6eb0dc18e2c25935fabfdfc48b0114be0939158dfdef7b85b395fe2e71042672446af0e68750aae003c9847d10d1f63316fe95d3df738d18f249174292b1b9e1
-DIST llvmorg-13.0.0.tar.gz 147270176 BLAKE2B 
628f316b580e1edf3a58d4825b724df759e6ed2a4116802470c04562caefc392fa325c91f388036365a2e45a9595cca6d3557fab12984fc8bcfef29c9116d822
 SHA512 
8004c05d32b9720fb3391783621690c1df9bd1e97e72cbff9192ed88a84b0acd303b61432145fa917b5b5e548c8cee29b24ef8547dcc8677adf4816e7a8a0eb2
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 
2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b
 SHA512 
9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
-DIST llvmorg-14.0.0.tar.gz 158057350 BLAKE2B 
7052684c620a5eaf52beeee4591adf58cfec9e64a5ee0b24f3d5849fd4df5b006e2906a839cb806ac69c33fab6013c58589b1d74e4fb8558758edcb7d5065064
 SHA512 
eb5acf96b5e2c59bd07579f7ebe73018b0dd6e2f2d9a5a3c7986320e88febd837d1084b9e5313a2264310342193044629d228337cc76dd2b8527dc0a8bdda999
 DIST llvmorg-14.0.1.tar.gz 158074615 BLAKE2B 
bf80366461580058494eb101646efcd1a8b55a66818a710c2eb8c649bf88c02fe4552cecf4c1c8637a64e7cee8d644bca31aafc804765ed18f2b5e2975dd6c92
 SHA512 
0a15aa9cfc978a7b03a1659a2affad65ede66d280f5c12bf0beaaf194cd7bdd57ff438b5f40e64c1e1b88f368de99be349e9d30b544d2bbe4a50f0ebed3307f2

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
deleted file mode 100644
index 607404341462..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-13.0.0.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86 ~x64-macos"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-       >=sys-devel/llvm-6"
-BDEPEND="
-       test? ( >=sys-devel/clang-3.9.0
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-       )"
-
-LLVM_COMPONENTS=( libunwind libcxx llvm/cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi )
-llvm.org_set_globals
-
-python_check_deps() {
-       has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-       use test && python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-       local use_compiler_rt=OFF
-       local libdir=$(get_libdir)
-
-       # link to compiler-rt
-       # https://github.com/gentoo/gentoo/pull/21516
-       if tc-is-clang; then
-               local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-                  ${LD_FLAGS} -print-libgcc-file-name)
-               if [[ ${compiler_rt} == *libclang_rt* ]]; then
-                       use_compiler_rt=ON
-               fi
-       fi
-
-       local mycmakeargs=(
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-               -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-               -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
-               -DLLVM_INCLUDE_TESTS=$(usex test)
-
-               # support non-native unwinding; given it's small enough,
-               # enable it unconditionally
-               -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-               # avoid dependency on libgcc_s if compiler-rt is used
-               -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-       )
-       if use test; then
-               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
-               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
-
-               mycmakeargs+=(
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       
-DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}"
-                       -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-               )
-       fi
-
-       cmake_src_configure
-}
-
-wrap_libcxxabi() {
-       local mycmakeargs=(
-               -DLIBCXXABI_LIBDIR_SUFFIX=
-               -DLIBCXXABI_ENABLE_SHARED=OFF
-               -DLIBCXXABI_ENABLE_STATIC=ON
-               -DLIBCXXABI_USE_LLVM_UNWINDER=ON
-               -DLIBCXXABI_INCLUDE_TESTS=OFF
-
-               -DLIBCXXABI_LIBCXX_INCLUDES="${BUILD_DIR}"/libcxx/include/c++/v1
-               -DLIBCXXABI_LIBUNWIND_INCLUDES="${S}"/include
-       )
-
-       local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)"
-       local CMAKE_USE_DIR=${WORKDIR}/libcxxabi
-       local BUILD_DIR=${BUILD_DIR}/libcxxabi
-
-       "${@}"
-}
-
-wrap_libcxx() {
-       local mycmakeargs=(
-               -DLIBCXX_LIBDIR_SUFFIX=
-               -DLIBCXX_ENABLE_SHARED=OFF
-               -DLIBCXX_ENABLE_STATIC=ON
-               -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-               -DLIBCXXABI_USE_LLVM_UNWINDER=ON
-               -DLIBCXX_CXX_ABI=libcxxabi
-               -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${WORKDIR}"/libcxxabi/include
-               -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-               -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-               -DLIBCXX_HAS_GCC_S_LIB=OFF
-               -DLIBCXX_INCLUDE_TESTS=OFF
-       )
-
-       local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/libcxxabi/lib 
-L${BUILD_DIR}/$(get_libdir)"
-       local CMAKE_USE_DIR=${WORKDIR}/libcxx
-       local BUILD_DIR=${BUILD_DIR}/libcxx
-
-       "${@}"
-}
-
-multilib_src_test() {
-       # build local copies of libc++ & libc++abi for testing to avoid
-       # circular deps
-       wrap_libcxx cmake_src_configure
-       wrap_libcxx cmake_build generate-cxx-headers
-       wrap_libcxxabi cmake_src_configure
-       wrap_libcxxabi cmake_src_compile
-       wrap_libcxx cmake_src_compile
-       mv "${BUILD_DIR}"/libcxx*/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || 
die
-
-       local -x LIT_PRESERVES_TMP=1
-       cmake_build check-unwind
-}
-
-multilib_src_install() {
-       cmake_src_install
-
-       # install headers like sys-libs/libunwind
-       doheader "${S}"/include/*.h
-}

diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.ebuild 
b/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.ebuild
deleted file mode 100644
index 5c46a2ae1249..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-14.0.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{8..10} )
-inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://github.com/llvm-mirror/libunwind";
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x64-macos"
-IUSE="debug static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="!sys-libs/libunwind"
-# llvm-6 for new lit options
-DEPEND="
-       >=sys-devel/llvm-6"
-BDEPEND="
-       ${PYTHON_DEPS}
-       test? (
-               >=sys-devel/clang-3.9.0
-               $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-       )"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-       use test || return 0
-       has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-multilib_src_configure() {
-       local use_compiler_rt=OFF
-       local libdir=$(get_libdir)
-
-       # link to compiler-rt
-       # https://github.com/gentoo/gentoo/pull/21516
-       if tc-is-clang; then
-               local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \
-                  ${LD_FLAGS} -print-libgcc-file-name)
-               if [[ ${compiler_rt} == *libclang_rt* ]]; then
-                       use_compiler_rt=ON
-               fi
-       fi
-
-       local mycmakeargs=(
-               -DPython3_EXECUTABLE="${PYTHON}"
-               -DLLVM_ENABLE_RUNTIMES="libunwind"
-               -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-               -DLLVM_INCLUDE_TESTS=OFF
-               -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-               -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-               -DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-               -DLIBUNWIND_INSTALL_HEADERS=ON
-               -DLIBUNWIND_TARGET_TRIPLE="${CHOST}"
-
-               # support non-native unwinding; given it's small enough,
-               # enable it unconditionally
-               -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-               # avoid dependency on libgcc_s if compiler-rt is used
-               -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-       )
-       if use test; then
-               mycmakeargs+=(
-                       -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-                       -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-                       -DLLVM_LIT_ARGS="$(get_lit_flags)"
-                       -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-                       -DLIBCXXABI_LIBDIR_SUFFIX=
-                       -DLIBCXXABI_ENABLE_SHARED=OFF
-                       -DLIBCXXABI_ENABLE_STATIC=ON
-                       -DLIBCXXABI_USE_LLVM_UNWINDER=ON
-                       -DLIBCXXABI_INCLUDE_TESTS=OFF
-
-                       -DLIBCXX_LIBDIR_SUFFIX=
-                       -DLIBCXX_ENABLE_SHARED=OFF
-                       -DLIBCXX_ENABLE_STATIC=ON
-                       -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF
-                       -DLIBCXX_CXX_ABI=libcxxabi
-                       -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-                       -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-                       -DLIBCXX_HAS_GCC_S_LIB=OFF
-                       -DLIBCXX_INCLUDE_TESTS=OFF
-                       -DLIBCXX_INCLUDE_BENCHMARKS=OFF
-               )
-       fi
-
-       cmake_src_configure
-
-       if use test; then
-               local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 
2>/dev/null)
-               [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang 
for tests"
-
-               # meh, we need to override the compiler explicitly
-               sed -e "/%{cxx}/s@, '.*'@, '${clang_path}'@" \
-                       -i "${BUILD_DIR}"/libunwind/test/lit.site.cfg || die
-       fi
-}
-
-multilib_src_test() {
-       local -x LIT_PRESERVES_TMP=1
-       cmake_build check-unwind
-}
-
-multilib_src_install() {
-       DESTDIR=${D} cmake_build install-unwind
-}

Reply via email to