| 1 |
commit: 65eb7648fc19d77c7ddfabe2abb38f8a2488f59a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 4 18:12:52 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 4 18:39:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65eb7648 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Remove 10.0.0rc[12] |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/Manifest | 2 - |
| 13 |
sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild | 119 ------------------------- |
| 14 |
sys-libs/libcxxabi/libcxxabi-10.0.0_rc2.ebuild | 119 ------------------------- |
| 15 |
3 files changed, 240 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest |
| 18 |
index d5e5eda8fc1..ed3c8ba2111 100644 |
| 19 |
--- a/sys-libs/libcxxabi/Manifest |
| 20 |
+++ b/sys-libs/libcxxabi/Manifest |
| 21 |
@@ -2,7 +2,5 @@ DIST libcxx-7.1.0.src.tar.xz 1638448 BLAKE2B eca192e03f839f4323e3c37beba2e6daaf9 |
| 22 |
DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e |
| 23 |
DIST libcxxabi-7.1.0.src.tar.xz 535180 BLAKE2B aa5952e3ca80f7ce2a0a79f3eaf3852234e23a8445a2539374bedb188aba7d973763a6c0d7cc7700070d942555250f87c3c9efb504bb731985be033d47b79b44 SHA512 629ef641ab5aba28ea7171efbad806f1f0464eee2d04f8903014a4f82c03f2c6513defbbe5489b2c6fd624270fe8efbad97a40e56958f8f38a4f5516a16dd102 |
| 24 |
DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734 |
| 25 |
-DIST llvmorg-10.0.0-rc1.tar.gz 120755822 BLAKE2B a729d37d96ba498cb865c6f708734dccb796b2caabb69167b9aa3b0e12c788f2a5980a048b99d5603da3d26af909fb31f406b4f4743cabae56c45f829a7bf695 SHA512 27137fc700971147c00ded6787eaae9f0bcf98c938fe227a5a559b38d983736f3d086f4ff6772d802c5f48a7d97a97c293261e4af88fcb5a720693b9cb5a4f02 |
| 26 |
-DIST llvmorg-10.0.0-rc2.tar.gz 120795019 BLAKE2B 6e701eddbd2313e777c7b37dff8455a08d3c599d01055b60afc0319373d4709deb429aac6bf9e80c4d2e2ab8ade03bf5b398b6ccd8882e4bde608d10cdbf2284 SHA512 ee571c9258a2d9fc411964f56b0b92b2e7134349ed21dbe7963eb61ef65da506e0c4f7c69259a3b6cecec23f55d24636608287ee4457ee667031e141f8f09aae |
| 27 |
DIST llvmorg-10.0.0-rc3.tar.gz 120814170 BLAKE2B 432fe0c1e74d3020a269a256e6e456cbfa0b7166dd3f86df6caf3a55e1931c022285fe8afdc4d8998c729c5471acf5308abb336782ddec2ef9b0f58d1ccb5a3c SHA512 aad1df86063612d20c48ea7046940330fe2ac572a146be22ff71d9e65fa3438184cb39a2533fc6afd1e74df26909a9f0d24ebcd7d62e74728cfd81e447f2ffbf |
| 28 |
DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 |
| 29 |
|
| 30 |
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index de7c2b4fb58..00000000000 |
| 33 |
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc1.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,119 +0,0 @@ |
| 36 |
-# Copyright 1999-2020 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=7 |
| 40 |
- |
| 41 |
-PYTHON_COMPAT=( python3_{6,7} ) |
| 42 |
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs |
| 43 |
- |
| 44 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 45 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 46 |
-# libcxx is needed uncondtionally for the headers |
| 47 |
-LLVM_COMPONENTS=( libcxx{abi,} ) |
| 48 |
-llvm.org_set_globals |
| 49 |
- |
| 50 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 51 |
-SLOT="0" |
| 52 |
-KEYWORDS="" |
| 53 |
-IUSE="+libunwind +static-libs test elibc_musl" |
| 54 |
-RESTRICT="!test? ( test )" |
| 55 |
- |
| 56 |
-RDEPEND=" |
| 57 |
- libunwind? ( |
| 58 |
- || ( |
| 59 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 60 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 61 |
- ) |
| 62 |
- )" |
| 63 |
-# llvm-6 for new lit options |
| 64 |
-DEPEND="${RDEPEND} |
| 65 |
- >=sys-devel/llvm-6" |
| 66 |
-BDEPEND=" |
| 67 |
- test? ( >=sys-devel/clang-3.9.0 |
| 68 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 69 |
- |
| 70 |
-# least intrusive of all |
| 71 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 72 |
- |
| 73 |
-python_check_deps() { |
| 74 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 75 |
-} |
| 76 |
- |
| 77 |
-pkg_setup() { |
| 78 |
- llvm_pkg_setup |
| 79 |
- use test && python-any-r1_pkg_setup |
| 80 |
-} |
| 81 |
- |
| 82 |
-multilib_src_configure() { |
| 83 |
- # link against compiler-rt instead of libgcc if we are using clang with libunwind |
| 84 |
- local want_compiler_rt=OFF |
| 85 |
- if use libunwind && tc-is-clang; then |
| 86 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
| 87 |
- ${LDFLAGS} -print-libgcc-file-name) |
| 88 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
| 89 |
- want_compiler_rt=ON |
| 90 |
- fi |
| 91 |
- fi |
| 92 |
- |
| 93 |
- local libdir=$(get_libdir) |
| 94 |
- local mycmakeargs=( |
| 95 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 96 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 97 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 98 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 99 |
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 100 |
- -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} |
| 101 |
- |
| 102 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 103 |
- # upstream is omitting standard search path for this |
| 104 |
- # probably because gcc & clang are bundling their own unwind.h |
| 105 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 106 |
- ) |
| 107 |
- if use test; then |
| 108 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 109 |
- local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} |
| 110 |
- |
| 111 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 112 |
- |
| 113 |
- mycmakeargs+=( |
| 114 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 115 |
- -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
| 116 |
- ) |
| 117 |
- fi |
| 118 |
- cmake-utils_src_configure |
| 119 |
-} |
| 120 |
- |
| 121 |
-build_libcxx() { |
| 122 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 123 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 124 |
- local BUILD_DIR=${BUILD_DIR}/libcxx |
| 125 |
- local mycmakeargs=( |
| 126 |
- -DLIBCXX_LIBDIR_SUFFIX= |
| 127 |
- -DLIBCXX_ENABLE_SHARED=OFF |
| 128 |
- -DLIBCXX_ENABLE_STATIC=ON |
| 129 |
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 130 |
- -DLIBCXX_CXX_ABI=libcxxabi |
| 131 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include |
| 132 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 133 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 134 |
- -DLIBCXX_HAS_GCC_S_LIB=OFF |
| 135 |
- -DLIBCXX_INCLUDE_TESTS=OFF |
| 136 |
- ) |
| 137 |
- |
| 138 |
- cmake-utils_src_configure |
| 139 |
- cmake-utils_src_compile |
| 140 |
-} |
| 141 |
- |
| 142 |
-multilib_src_test() { |
| 143 |
- # build a local copy of libc++ for testing to avoid circular dep |
| 144 |
- build_libcxx |
| 145 |
- mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 146 |
- |
| 147 |
- local -x LIT_PRESERVES_TMP=1 |
| 148 |
- cmake-utils_src_make check-libcxxabi |
| 149 |
-} |
| 150 |
- |
| 151 |
-multilib_src_install_all() { |
| 152 |
- insinto /usr/include/libcxxabi |
| 153 |
- doins -r include/. |
| 154 |
-} |
| 155 |
|
| 156 |
diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0_rc2.ebuild |
| 157 |
deleted file mode 100644 |
| 158 |
index de7c2b4fb58..00000000000 |
| 159 |
--- a/sys-libs/libcxxabi/libcxxabi-10.0.0_rc2.ebuild |
| 160 |
+++ /dev/null |
| 161 |
@@ -1,119 +0,0 @@ |
| 162 |
-# Copyright 1999-2020 Gentoo Authors |
| 163 |
-# Distributed under the terms of the GNU General Public License v2 |
| 164 |
- |
| 165 |
-EAPI=7 |
| 166 |
- |
| 167 |
-PYTHON_COMPAT=( python3_{6,7} ) |
| 168 |
-inherit cmake-multilib llvm llvm.org multiprocessing python-any-r1 toolchain-funcs |
| 169 |
- |
| 170 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 171 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 172 |
-# libcxx is needed uncondtionally for the headers |
| 173 |
-LLVM_COMPONENTS=( libcxx{abi,} ) |
| 174 |
-llvm.org_set_globals |
| 175 |
- |
| 176 |
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" |
| 177 |
-SLOT="0" |
| 178 |
-KEYWORDS="" |
| 179 |
-IUSE="+libunwind +static-libs test elibc_musl" |
| 180 |
-RESTRICT="!test? ( test )" |
| 181 |
- |
| 182 |
-RDEPEND=" |
| 183 |
- libunwind? ( |
| 184 |
- || ( |
| 185 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 186 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 187 |
- ) |
| 188 |
- )" |
| 189 |
-# llvm-6 for new lit options |
| 190 |
-DEPEND="${RDEPEND} |
| 191 |
- >=sys-devel/llvm-6" |
| 192 |
-BDEPEND=" |
| 193 |
- test? ( >=sys-devel/clang-3.9.0 |
| 194 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 195 |
- |
| 196 |
-# least intrusive of all |
| 197 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 198 |
- |
| 199 |
-python_check_deps() { |
| 200 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 201 |
-} |
| 202 |
- |
| 203 |
-pkg_setup() { |
| 204 |
- llvm_pkg_setup |
| 205 |
- use test && python-any-r1_pkg_setup |
| 206 |
-} |
| 207 |
- |
| 208 |
-multilib_src_configure() { |
| 209 |
- # link against compiler-rt instead of libgcc if we are using clang with libunwind |
| 210 |
- local want_compiler_rt=OFF |
| 211 |
- if use libunwind && tc-is-clang; then |
| 212 |
- local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ |
| 213 |
- ${LDFLAGS} -print-libgcc-file-name) |
| 214 |
- if [[ ${compiler_rt} == *libclang_rt* ]]; then |
| 215 |
- want_compiler_rt=ON |
| 216 |
- fi |
| 217 |
- fi |
| 218 |
- |
| 219 |
- local libdir=$(get_libdir) |
| 220 |
- local mycmakeargs=( |
| 221 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 222 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 223 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 224 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 225 |
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 226 |
- -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} |
| 227 |
- |
| 228 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 229 |
- # upstream is omitting standard search path for this |
| 230 |
- # probably because gcc & clang are bundling their own unwind.h |
| 231 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 232 |
- ) |
| 233 |
- if use test; then |
| 234 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 235 |
- local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} |
| 236 |
- |
| 237 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 238 |
- |
| 239 |
- mycmakeargs+=( |
| 240 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 241 |
- -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" |
| 242 |
- ) |
| 243 |
- fi |
| 244 |
- cmake-utils_src_configure |
| 245 |
-} |
| 246 |
- |
| 247 |
-build_libcxx() { |
| 248 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 249 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 250 |
- local BUILD_DIR=${BUILD_DIR}/libcxx |
| 251 |
- local mycmakeargs=( |
| 252 |
- -DLIBCXX_LIBDIR_SUFFIX= |
| 253 |
- -DLIBCXX_ENABLE_SHARED=OFF |
| 254 |
- -DLIBCXX_ENABLE_STATIC=ON |
| 255 |
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 256 |
- -DLIBCXX_CXX_ABI=libcxxabi |
| 257 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include |
| 258 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 259 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 260 |
- -DLIBCXX_HAS_GCC_S_LIB=OFF |
| 261 |
- -DLIBCXX_INCLUDE_TESTS=OFF |
| 262 |
- ) |
| 263 |
- |
| 264 |
- cmake-utils_src_configure |
| 265 |
- cmake-utils_src_compile |
| 266 |
-} |
| 267 |
- |
| 268 |
-multilib_src_test() { |
| 269 |
- # build a local copy of libc++ for testing to avoid circular dep |
| 270 |
- build_libcxx |
| 271 |
- mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 272 |
- |
| 273 |
- local -x LIT_PRESERVES_TMP=1 |
| 274 |
- cmake-utils_src_make check-libcxxabi |
| 275 |
-} |
| 276 |
- |
| 277 |
-multilib_src_install_all() { |
| 278 |
- insinto /usr/include/libcxxabi |
| 279 |
- doins -r include/. |
| 280 |
-} |
Archives