| 1 |
commit: 04c824188e7572e26b4cc138ee637d35fc130a20 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 11 18:28:02 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 11 18:57:17 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04c82418 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Drop redundant 8.0.0 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/Manifest | 2 - |
| 13 |
sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild | 119 ------------------------------ |
| 14 |
2 files changed, 121 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest |
| 17 |
index 590b5e07491..dfc4289cab7 100644 |
| 18 |
--- a/sys-libs/libcxxabi/Manifest |
| 19 |
+++ b/sys-libs/libcxxabi/Manifest |
| 20 |
@@ -1,10 +1,8 @@ |
| 21 |
DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875 |
| 22 |
DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf935d4e784e0bc835a4d2c3ce0790f5539bdca0466feafd668d7c6675b11b7fe14d9adb680c46fd7b28b42a3b423219 SHA512 925ce5093445f84dc17d5b1610e4297ef3606b254b7350c50f88ba042fcca62125ffd97d21cb612707d5e9511267634ca1779619199f95ce819e5f5c0c2b55d5 |
| 23 |
-DIST libcxx-8.0.0.src.tar.xz 1752308 BLAKE2B 1e8cd8c7100f5f8b943ba8f38b0b59a0fd5e5bea834953483a67502f67de3eb51eba4ed4be17cdb54406da4ad7ebc6fef33934c59db982afa55856ce9f1f46ff SHA512 2e0fcd3e78f7e15ea894e52c51351daef8e3a2aaf53b3df7497b11403d28f5269ff49a4674bacea1d565a5faa2b24502caaaeff9cd48518f0d141563d8f9cc03 |
| 24 |
DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e |
| 25 |
DIST libcxx-9.0.0.src.tar.xz 1814388 BLAKE2B 59b8967706d1f85b1c0d2b9932bd637aae7118ae461e2b31e1d17c9a2ee2e02ea0ea8b344074a9fc4b430b5c742b8ad30c10a0c44e5290528fdecd7571352879 SHA512 cbaca724c4f3e3a270dfd53aac50cbb920190fe55486b164d52e73845819dd22afb10c23f5875da59d433fd5b96a0f153208746117309ac1267a38fa56f4818e |
| 26 |
DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2 |
| 27 |
DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102 |
| 28 |
-DIST libcxxabi-8.0.0.src.tar.xz 539040 BLAKE2B 847d848e4ed66212789c50137e9556abed601ab4f30765b8b4453f0bc2609e2d1ef516b2f504ee2331a53706940b814545423da05392aed24bf290e6757b52f6 SHA512 9ee2e6d5899529be45b2e5edc395606fa9040d25789b3da1ae0182113626e7624cbb071eae525c478293a7b371876e41614348ee5808f90f3f9c7b08837e1055 |
| 29 |
DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734 |
| 30 |
DIST libcxxabi-9.0.0.src.tar.xz 552088 BLAKE2B 1b8f2bab00437a223f613cbecd9171f1bc88d0ec2d6096776d0295333c0176ddbe13178d433bed2dc70821b905152fcd30b228ae1dbd3e8846f3b92e7630db7e SHA512 261f32f61814728ce61c830c80192a55e1ba03c50f49712e208052444ac3acc6d7efcbd7b76a505292f9233aad23b00180aca4e72326ae1244385b39f226e625 |
| 31 |
|
| 32 |
diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild |
| 33 |
deleted file mode 100644 |
| 34 |
index a92169b9a46..00000000000 |
| 35 |
--- a/sys-libs/libcxxabi/libcxxabi-8.0.0.ebuild |
| 36 |
+++ /dev/null |
| 37 |
@@ -1,119 +0,0 @@ |
| 38 |
-# Copyright 1999-2019 Gentoo Authors |
| 39 |
-# Distributed under the terms of the GNU General Public License v2 |
| 40 |
- |
| 41 |
-EAPI=6 |
| 42 |
- |
| 43 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 44 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 45 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
| 46 |
-PYTHON_COMPAT=( python2_7 ) |
| 47 |
- |
| 48 |
-inherit cmake-multilib llvm multiprocessing python-any-r1 |
| 49 |
- |
| 50 |
-MY_P=${P/_/}.src |
| 51 |
-LIBCXX_P=libcxx-${PV/_/}.src |
| 52 |
- |
| 53 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 54 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 55 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz |
| 56 |
- https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz" |
| 57 |
- |
| 58 |
-LICENSE="|| ( UoI-NCSA MIT )" |
| 59 |
-SLOT="0" |
| 60 |
-KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 61 |
-IUSE="+libunwind +static-libs test elibc_musl" |
| 62 |
-RESTRICT="!test? ( test )" |
| 63 |
- |
| 64 |
-RDEPEND=" |
| 65 |
- libunwind? ( |
| 66 |
- || ( |
| 67 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 68 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 69 |
- ) |
| 70 |
- )" |
| 71 |
-# llvm-6 for new lit options |
| 72 |
-DEPEND="${RDEPEND} |
| 73 |
- >=sys-devel/llvm-6 |
| 74 |
- test? ( >=sys-devel/clang-3.9.0 |
| 75 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 76 |
- |
| 77 |
-S=${WORKDIR}/${MY_P} |
| 78 |
- |
| 79 |
-# least intrusive of all |
| 80 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 81 |
- |
| 82 |
-python_check_deps() { |
| 83 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 84 |
-} |
| 85 |
- |
| 86 |
-pkg_setup() { |
| 87 |
- llvm_pkg_setup |
| 88 |
- use test && python-any-r1_pkg_setup |
| 89 |
-} |
| 90 |
- |
| 91 |
-src_unpack() { |
| 92 |
- default |
| 93 |
- mv "${LIBCXX_P}" libcxx || die |
| 94 |
-} |
| 95 |
- |
| 96 |
-multilib_src_configure() { |
| 97 |
- local libdir=$(get_libdir) |
| 98 |
- local mycmakeargs=( |
| 99 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 100 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 101 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 102 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 103 |
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 104 |
- |
| 105 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 106 |
- # upstream is omitting standard search path for this |
| 107 |
- # probably because gcc & clang are bundling their own unwind.h |
| 108 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 109 |
- ) |
| 110 |
- if use test; then |
| 111 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 112 |
- local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} |
| 113 |
- |
| 114 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 115 |
- |
| 116 |
- mycmakeargs+=( |
| 117 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 118 |
- -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
| 119 |
- ) |
| 120 |
- fi |
| 121 |
- cmake-utils_src_configure |
| 122 |
-} |
| 123 |
- |
| 124 |
-build_libcxx() { |
| 125 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 126 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 127 |
- local BUILD_DIR=${BUILD_DIR}/libcxx |
| 128 |
- local mycmakeargs=( |
| 129 |
- -DLIBCXX_LIBDIR_SUFFIX= |
| 130 |
- -DLIBCXX_ENABLE_SHARED=ON |
| 131 |
- -DLIBCXX_ENABLE_STATIC=OFF |
| 132 |
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 133 |
- -DLIBCXX_CXX_ABI=libcxxabi |
| 134 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include |
| 135 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 136 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 137 |
- -DLIBCXX_HAS_GCC_S_LIB=OFF |
| 138 |
- -DLIBCXX_INCLUDE_TESTS=OFF |
| 139 |
- ) |
| 140 |
- |
| 141 |
- cmake-utils_src_configure |
| 142 |
- cmake-utils_src_compile |
| 143 |
-} |
| 144 |
- |
| 145 |
-multilib_src_test() { |
| 146 |
- # build a local copy of libc++ for testing to avoid circular dep |
| 147 |
- build_libcxx |
| 148 |
- mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 149 |
- |
| 150 |
- cmake-utils_src_make check-libcxxabi |
| 151 |
-} |
| 152 |
- |
| 153 |
-multilib_src_install_all() { |
| 154 |
- insinto /usr/include/libcxxabi |
| 155 |
- doins -r include/. |
| 156 |
-} |
Archives