| 1 |
commit: c18e62f646927c64b09cf14ed04a5ddb76250e75 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 10 18:22:45 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 10 19:52:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c18e62f6 |
| 7 |
|
| 8 |
sys-libs/libcxxabi: Drop <6 |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
sys-libs/libcxxabi/Manifest | 6 - |
| 13 |
.../files/libcxxabi-3.9.0-cmake-path.patch | 34 ------ |
| 14 |
.../files/libcxxabi-3.9.0-test-unwind.patch | 37 ------ |
| 15 |
sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild | 98 ---------------- |
| 16 |
sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild | 124 --------------------- |
| 17 |
sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild | 123 -------------------- |
| 18 |
6 files changed, 422 deletions(-) |
| 19 |
|
| 20 |
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest |
| 21 |
index d3b28ca7cb7..d6129c08d96 100644 |
| 22 |
--- a/sys-libs/libcxxabi/Manifest |
| 23 |
+++ b/sys-libs/libcxxabi/Manifest |
| 24 |
@@ -1,13 +1,7 @@ |
| 25 |
-DIST libcxx-3.9.1.src.tar.xz 1209020 BLAKE2B 510e77c2c1163babbba904933f441e8720b0d366b9f0cfa2cdde2401368c224e00efd66afc1403b0087c40549cda4ebbc4d0c4b2d0906178324fa6158502d5ad SHA512 a5976e4096624a7307b3e43f4a22ac2dc74572226e0f57af9f3ef537a14c3cff1601b7042aef9dc40a0ee53ca76b08d72eb9c253dcf34f115d3153c302db7070 |
| 26 |
-DIST libcxx-4.0.1.src.tar.xz 1446380 BLAKE2B cd871eff4c4ca25a1fe4d27f778e913fe536a0b5863ea7dd3c8895f6b743b6f039e4df71f9ba5124c98761a8099666f68e1dfd073b5ec7b9fe0007ef09a9117d SHA512 91f3f397be606989be99865d0b279557f9afb93f7a74ed10c3a74f4440e38b5694ddf452bbf2f487cacd4391606dd5c7edfe5130f2de19e2acfd6cce619d028a |
| 27 |
-DIST libcxx-5.0.2.src.tar.xz 1530908 BLAKE2B e0c47d6803668267a71c75df873a136a2c3bec3732a08c365107b286f6dfef883edb81f9f4d22a0f312228865528bf1f15450c41803f8d3a8c8081fe12b62c25 SHA512 c77e0ea6bb3dc03270312de4a24fdd0d027448b2e182af31489031fd52f0997377c9049769930b80b2ba0062fe21317d8ae823c5e80e12128f8ae8e6f171be22 |
| 28 |
DIST libcxx-6.0.1.src.tar.xz 1552328 BLAKE2B 65a6addd04e530c2a72e8cba207282b9e9fafc01a594d7b11f63d10b6f88eca67a3cdf90b8055e410ede358d9be1f63fbe427f308e1337833447c0260d96e1c8 SHA512 c04f628b0924d76f035f615b59d19ce42dfc19c9a8eea4fe2b22a95cfe5a037ebdb30943fd741443939df5b4cf692bc1e51c840fefefbd134e3afbe2a75fe875 |
| 29 |
DIST libcxx-7.0.1.src.tar.xz 1638188 BLAKE2B 541d27c3801895d59ad06b15de5fe9ff0d9b5b3ef393a5fad05a12a52dd6453ecc530b0ce3129624a27e959d3c9c5f7066ebb57fd85caca538ebf4f990aa6967 SHA512 b3ad7ad95bdcf2d902b29de8a0b757d4dbc220bc1a22a813d6bcec15a34b3aa42e85c59f4cecbb318c799ca611550b44c328b37278f4349b984016ad4556c1d8 |
| 30 |
DIST libcxx-8.0.0rc2.src.tar.xz 1755516 BLAKE2B b6c15d0d50d01e69afb376140052a1d27e2acef45796781497b35dbd8c26db88883e17105fb4e83c50097ab7a4ebf077350754bc1b1d43ef8426b82a7e92b72d SHA512 79ac5a389f5a6bcb145e8e387ae2cbdf0679996a9f66fe38a8e62cd893b6ed68943824d5538e7408b57ecfa4182aec20b837158c9a6f50188c1e9aae176a4f5f |
| 31 |
DIST libcxx-8.0.0rc3.src.tar.xz 1755192 BLAKE2B 32d0602a13a273f396f139dd25f67ed0a12881c618eef35e0bb9b6d8d8cb786f130ce3ce7e8027f8f2a2516de5d1f9753bc12e81497a0bc919731866da04dba2 SHA512 f59e6fdd20d18cfb39c426eadcda5a611dc79735fc1fc8c4cebd4106afa35736ceb3500bba7f162bccced1964785fc18c129e9bb68dd6549b205cae14cd46f8b |
| 32 |
-DIST libcxxabi-3.9.1.src.tar.xz 510964 BLAKE2B a6abda1b92473781ea3029169c43547f15c1aa6e0ec6f9692ae633d109e050a6ff82ce8bceb0455375991b85c99784a4f06a568b8c77a4cf2865b9b2861e9595 SHA512 4f5603f1476b759c86d4784728fbdd212c59b30dc56d787c1834bf68a9cd83071fa22658d24e5a58beb94c0c656b0e4457d7da6e3048715dd36bd68380fc336e |
| 33 |
-DIST libcxxabi-4.0.1.src.tar.xz 515820 BLAKE2B 7d9e0dee4f6cb3eaa22647d959f8bf3d86779f8c51c0738143ba3daca83881daacc0663a1d2463507c8c4b8a1b9e1d5c111b829e5af2cb5b6f86bae8f06a0d47 SHA512 e94315ba8a507d8481d70c33e7ab2d724d51726edb8412c70a1b5f59e3f15d5825f1502dc2db138b20e5293fb90a184050be94d5ac270fd7ce78b502efb9f86a |
| 34 |
-DIST libcxxabi-5.0.2.src.tar.xz 521448 BLAKE2B e7e42908845f692cdb8709955eb46cbc18ee1f4ac9f0224b6e2a6bc2af998415eca5cda03ffcac27ef6a93cde928951bc38503bae9144b634abd17ec46ad96eb SHA512 304c0ef1b2fd26d52dae66013ea0051de4c3cb1e9c8d1308833f34aec1ad288fcfe5d583f00ceb84c8d271c5cd5f868aa135a93f007138d124c01b70c13e842e |
| 35 |
DIST libcxxabi-6.0.1.src.tar.xz 528356 BLAKE2B b301b750b2928864d3fc51e66cf91aab6837636ec2bce706b9a97296ec96af4bd2e80b1bf80c9b4afe449335ee12bbdd1905433c27e1770e16bc306baf206927 SHA512 bbb4c7b412e295cb735f637df48a83093eef45ed5444f7766790b4b047f75fd5fd634d8f3a8ac33a5c1407bd16fd450ba113f60a9bcc1d0a911fe0c54e9c81f2 |
| 36 |
DIST libcxxabi-7.0.1.src.tar.xz 535096 BLAKE2B 212330e8dbde98280b1bcd4f36ea3f30b69af9816e6c252bd9640c45501536ce38e8b57f3e82195d2a33cb1286651f7cad82713c71e8012e512e04c4ff7bad64 SHA512 92e8d28f329e9a8cce296f0fddd88324198f722db3a748bb2164b28ae8eca6047c89ed1e70af00bbedd93ce4285b2ab1e0307a65b88dc60e581eebfd6cbd2038 |
| 37 |
DIST libcxxabi-8.0.0rc2.src.tar.xz 539092 BLAKE2B 2e03457c44d45035f18b01f34766d520e44f680ec9c73c8166a081e7311119a1ac17461d7e15f60728f4c1eb5d4a285b29c1b2123059d065eaf7f46c233210cb SHA512 9887da2b1ae4fe821e6e66fd4ce5f134d8600243e64fbac2bc5baaaa08dee689367ab1667522bc91328b18222f9fbe59fe79346b8ef529652b1ac300cf5bc161 |
| 38 |
|
| 39 |
diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch |
| 40 |
deleted file mode 100644 |
| 41 |
index b80c0f57220..00000000000 |
| 42 |
--- a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-cmake-path.patch |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,34 +0,0 @@ |
| 45 |
-From 8d4d9af454a985d8c10ffdb0c56e87efec25ddff Mon Sep 17 00:00:00 2001 |
| 46 |
-From: Logan Chien <tzuhsiang.chien@×××××.com> |
| 47 |
-Date: Mon, 3 Oct 2016 11:08:17 +0000 |
| 48 |
-Subject: [PATCH] [CMake] Fix libc++abi standalone cmake build. |
| 49 |
- |
| 50 |
-The cmake files install directory has been changed to |
| 51 |
-${prefix}/lib/cmake/llvm since r259821. Searching cmake modules in |
| 52 |
-${prefix}/share/llvm/cmake will result in fatal errors. |
| 53 |
- |
| 54 |
-This commit fixes the out-of-tree build by changing the CMake module |
| 55 |
-search path to: "$(llvm-config --obj-root)/lib/cmake/llvm" |
| 56 |
- |
| 57 |
- |
| 58 |
-git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@283100 91177308-0d34-0410-b5e6-96231b3b80d8 |
| 59 |
---- |
| 60 |
- CMakeLists.txt | 2 +- |
| 61 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 62 |
- |
| 63 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 64 |
-index a33cf48..e75c0b8 100644 |
| 65 |
---- a/CMakeLists.txt |
| 66 |
-+++ b/CMakeLists.txt |
| 67 |
-@@ -49,7 +49,7 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) |
| 68 |
- set(LLVM_INCLUDE_DIR ${INCLUDE_DIR} CACHE PATH "Path to llvm/include") |
| 69 |
- set(LLVM_BINARY_DIR ${LLVM_OBJ_ROOT} CACHE PATH "Path to LLVM build tree") |
| 70 |
- set(LLVM_MAIN_SRC_DIR ${MAIN_SRC_DIR} CACHE PATH "Path to LLVM source tree") |
| 71 |
-- set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/share/llvm/cmake") |
| 72 |
-+ set(LLVM_CMAKE_PATH "${LLVM_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm") |
| 73 |
- set(LLVM_LIT_PATH "${LLVM_PATH}/utils/lit/lit.py") |
| 74 |
- else() |
| 75 |
- message(FATAL_ERROR "llvm-config not found and LLVM_MAIN_SRC_DIR not defined. " |
| 76 |
--- |
| 77 |
-2.10.1 |
| 78 |
- |
| 79 |
|
| 80 |
diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch |
| 81 |
deleted file mode 100644 |
| 82 |
index 1005cb7d133..00000000000 |
| 83 |
--- a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch |
| 84 |
+++ /dev/null |
| 85 |
@@ -1,37 +0,0 @@ |
| 86 |
-From fff85c801ae564a09479e1e8e4cf81977536c550 Mon Sep 17 00:00:00 2001 |
| 87 |
-From: Petr Hosek <phosek@××××××××.org> |
| 88 |
-Date: Mon, 8 Aug 2016 22:09:54 +0000 |
| 89 |
-Subject: [PATCH] Do not depend on unwind when building standalone |
| 90 |
- |
| 91 |
-When libcxxabi is being built standalone, unwind dependency is not |
| 92 |
-available, so do not use it even when LLVM unwinder is being |
| 93 |
-requested. |
| 94 |
- |
| 95 |
-Differential Revision: https://reviews.llvm.org/D23228 |
| 96 |
- |
| 97 |
-git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@278058 91177308-0d34-0410-b5e6-96231b3b80d8 |
| 98 |
---- |
| 99 |
- test/CMakeLists.txt | 7 +++---- |
| 100 |
- 1 file changed, 3 insertions(+), 4 deletions(-) |
| 101 |
- |
| 102 |
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt |
| 103 |
-index 31b5d1d..3a489bf 100644 |
| 104 |
---- a/test/CMakeLists.txt |
| 105 |
-+++ b/test/CMakeLists.txt |
| 106 |
-@@ -36,10 +36,9 @@ endif() |
| 107 |
- |
| 108 |
- if (NOT LIBCXXABI_BUILT_STANDALONE) |
| 109 |
- list(APPEND LIBCXXABI_TEST_DEPS cxx) |
| 110 |
--endif() |
| 111 |
-- |
| 112 |
--if (LIBCXXABI_USE_LLVM_UNWINDER) |
| 113 |
-- list(APPEND LIBCXXABI_TEST_DEPS unwind) |
| 114 |
-+ if (LIBCXXABI_USE_LLVM_UNWINDER) |
| 115 |
-+ list(APPEND LIBCXXABI_TEST_DEPS unwind) |
| 116 |
-+ endif() |
| 117 |
- endif() |
| 118 |
- |
| 119 |
- add_lit_testsuite(check-libcxxabi "Running libcxxabi tests" |
| 120 |
--- |
| 121 |
-2.10.1 |
| 122 |
- |
| 123 |
|
| 124 |
diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild |
| 125 |
deleted file mode 100644 |
| 126 |
index 57cba7ebc6f..00000000000 |
| 127 |
--- a/sys-libs/libcxxabi/libcxxabi-3.9.1.ebuild |
| 128 |
+++ /dev/null |
| 129 |
@@ -1,98 +0,0 @@ |
| 130 |
-# Copyright 1999-2017 Gentoo Foundation |
| 131 |
-# Distributed under the terms of the GNU General Public License v2 |
| 132 |
- |
| 133 |
-EAPI=6 |
| 134 |
- |
| 135 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 136 |
-PYTHON_COMPAT=( python2_7 ) |
| 137 |
- |
| 138 |
-inherit cmake-multilib python-any-r1 |
| 139 |
- |
| 140 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 141 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 142 |
-# also needs libcxx sources for headers |
| 143 |
-SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz |
| 144 |
- https://llvm.org/releases/${PV}/${P/abi/}.src.tar.xz" |
| 145 |
-LICENSE="|| ( UoI-NCSA MIT )" |
| 146 |
-SLOT="0" |
| 147 |
-KEYWORDS="amd64 ~arm64 x86" |
| 148 |
-IUSE="elibc_musl libunwind +static-libs test" |
| 149 |
- |
| 150 |
-RDEPEND=" |
| 151 |
- libunwind? ( |
| 152 |
- || ( |
| 153 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 154 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 155 |
- ) |
| 156 |
- )" |
| 157 |
-DEPEND="${RDEPEND} |
| 158 |
- >=sys-devel/llvm-3.9.0 |
| 159 |
- test? ( >=sys-devel/clang-3.9.0 |
| 160 |
- ~sys-libs/libcxx-${PV}[libcxxabi(-)] |
| 161 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 162 |
- |
| 163 |
-S=${WORKDIR}/${P}.src |
| 164 |
- |
| 165 |
-python_check_deps() { |
| 166 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 167 |
-} |
| 168 |
- |
| 169 |
-pkg_setup() { |
| 170 |
- use test && python-any-r1_pkg_setup |
| 171 |
-} |
| 172 |
- |
| 173 |
-src_prepare() { |
| 174 |
- default |
| 175 |
- |
| 176 |
- # backport cmake path fix for llvm-3.9+ |
| 177 |
- eapply "${FILESDIR}/${PN}-3.9.0-cmake-path.patch" |
| 178 |
- # kill stray unwind test dep in stand-alone builds |
| 179 |
- eapply "${FILESDIR}/${PN}-3.9.0-test-unwind.patch" |
| 180 |
-} |
| 181 |
- |
| 182 |
-src_configure() { |
| 183 |
- NATIVE_LIBDIR=$(get_libdir) |
| 184 |
- cmake-multilib_src_configure |
| 185 |
-} |
| 186 |
- |
| 187 |
-multilib_src_configure() { |
| 188 |
- local libdir=$(get_libdir) |
| 189 |
- local mycmakeargs=( |
| 190 |
- -DLLVM_LIBDIR_SUFFIX=${NATIVE_LIBDIR#lib} |
| 191 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 192 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 193 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 194 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 195 |
- -DLLVM_INCLUDE_TESTS=$(usex test) |
| 196 |
- |
| 197 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/include |
| 198 |
- # upstream is omitting standard search path for this |
| 199 |
- # probably because gcc & clang are bundling their own unwind.h |
| 200 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 201 |
- # this only needs to exist, it does not have to make sense |
| 202 |
- -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" |
| 203 |
- ) |
| 204 |
- if use test; then |
| 205 |
- mycmakeargs+=( |
| 206 |
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit |
| 207 |
- ) |
| 208 |
- fi |
| 209 |
- if use elibc_musl; then |
| 210 |
- local -x CPPFLAGS="${CPPFLAGS} -D_LIBCPP_HAS_MUSL_LIBC=1" |
| 211 |
- fi |
| 212 |
- cmake-utils_src_configure |
| 213 |
-} |
| 214 |
- |
| 215 |
-multilib_src_test() { |
| 216 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 217 |
- |
| 218 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 219 |
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die |
| 220 |
- |
| 221 |
- cmake-utils_src_make check-libcxxabi |
| 222 |
-} |
| 223 |
- |
| 224 |
-multilib_src_install_all() { |
| 225 |
- insinto /usr/include/libcxxabi |
| 226 |
- doins -r include/. |
| 227 |
-} |
| 228 |
|
| 229 |
diff --git a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild |
| 230 |
deleted file mode 100644 |
| 231 |
index 6fc52bd3ce4..00000000000 |
| 232 |
--- a/sys-libs/libcxxabi/libcxxabi-4.0.1.ebuild |
| 233 |
+++ /dev/null |
| 234 |
@@ -1,124 +0,0 @@ |
| 235 |
-# Copyright 1999-2018 Gentoo Foundation |
| 236 |
-# Distributed under the terms of the GNU General Public License v2 |
| 237 |
- |
| 238 |
-EAPI=6 |
| 239 |
- |
| 240 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 241 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 242 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
| 243 |
-PYTHON_COMPAT=( python2_7 ) |
| 244 |
- |
| 245 |
-inherit cmake-multilib llvm python-any-r1 |
| 246 |
- |
| 247 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 248 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 249 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz |
| 250 |
- https://releases.llvm.org/${PV/_//}/libcxx-${PV/_/}.src.tar.xz" |
| 251 |
- |
| 252 |
-LICENSE="|| ( UoI-NCSA MIT )" |
| 253 |
-SLOT="0" |
| 254 |
-KEYWORDS="amd64 ~arm64 x86" |
| 255 |
-IUSE="+libunwind +static-libs test elibc_musl" |
| 256 |
- |
| 257 |
-RDEPEND=" |
| 258 |
- libunwind? ( |
| 259 |
- || ( |
| 260 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 261 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 262 |
- ) |
| 263 |
- )" |
| 264 |
-# LLVM 4 required for llvm-config --cmakedir |
| 265 |
-DEPEND="${RDEPEND} |
| 266 |
- >=sys-devel/llvm-4 |
| 267 |
- test? ( >=sys-devel/clang-3.9.0 |
| 268 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 269 |
- |
| 270 |
-S=${WORKDIR}/${P/_/}.src |
| 271 |
- |
| 272 |
-# least intrusive of all |
| 273 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 274 |
- |
| 275 |
-python_check_deps() { |
| 276 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 277 |
-} |
| 278 |
- |
| 279 |
-pkg_setup() { |
| 280 |
- llvm_pkg_setup |
| 281 |
- use test && python-any-r1_pkg_setup |
| 282 |
-} |
| 283 |
- |
| 284 |
-src_unpack() { |
| 285 |
- default |
| 286 |
- |
| 287 |
- mv libcxx-* libcxx || die |
| 288 |
-} |
| 289 |
- |
| 290 |
-multilib_src_configure() { |
| 291 |
- local libdir=$(get_libdir) |
| 292 |
- local mycmakeargs=( |
| 293 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 294 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 295 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 296 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 297 |
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 298 |
- |
| 299 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 300 |
- # upstream is omitting standard search path for this |
| 301 |
- # probably because gcc & clang are bundling their own unwind.h |
| 302 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 303 |
- # this only needs to exist, it does not have to make sense |
| 304 |
- # FIXME: remove this once https://reviews.llvm.org/D25314 is merged |
| 305 |
- -DLIBCXXABI_LIBUNWIND_SOURCES="${T}" |
| 306 |
- ) |
| 307 |
- if use test; then |
| 308 |
- if has_version '>=sys-devel/llvm-6'; then |
| 309 |
- mycmakeargs+=( |
| 310 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 311 |
- ) |
| 312 |
- else |
| 313 |
- mycmakeargs+=( |
| 314 |
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit |
| 315 |
- ) |
| 316 |
- fi |
| 317 |
- fi |
| 318 |
- cmake-utils_src_configure |
| 319 |
-} |
| 320 |
- |
| 321 |
-build_libcxx() { |
| 322 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 323 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 324 |
- local BUILD_DIR=${BUILD_DIR}/libcxx |
| 325 |
- local mycmakeargs=( |
| 326 |
- -DLIBCXX_LIBDIR_SUFFIX= |
| 327 |
- -DLIBCXX_ENABLE_SHARED=ON |
| 328 |
- -DLIBCXX_ENABLE_STATIC=OFF |
| 329 |
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 330 |
- -DLIBCXX_CXX_ABI=libcxxabi |
| 331 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include |
| 332 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 333 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 334 |
- -DLIBCXX_HAS_GCC_S_LIB=OFF |
| 335 |
- -DLIBCXX_INCLUDE_TESTS=OFF |
| 336 |
- ) |
| 337 |
- |
| 338 |
- cmake-utils_src_configure |
| 339 |
- cmake-utils_src_compile |
| 340 |
-} |
| 341 |
- |
| 342 |
-multilib_src_test() { |
| 343 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 344 |
- |
| 345 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 346 |
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die |
| 347 |
- |
| 348 |
- # build a local copy of libc++ for testing to avoid circular dep |
| 349 |
- build_libcxx |
| 350 |
- mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 351 |
- |
| 352 |
- cmake-utils_src_make check-libcxxabi |
| 353 |
-} |
| 354 |
- |
| 355 |
-multilib_src_install_all() { |
| 356 |
- insinto /usr/include/libcxxabi |
| 357 |
- doins -r include/. |
| 358 |
-} |
| 359 |
|
| 360 |
diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild |
| 361 |
deleted file mode 100644 |
| 362 |
index 758b743df7e..00000000000 |
| 363 |
--- a/sys-libs/libcxxabi/libcxxabi-5.0.2.ebuild |
| 364 |
+++ /dev/null |
| 365 |
@@ -1,123 +0,0 @@ |
| 366 |
-# Copyright 1999-2018 Gentoo Foundation |
| 367 |
-# Distributed under the terms of the GNU General Public License v2 |
| 368 |
- |
| 369 |
-EAPI=6 |
| 370 |
- |
| 371 |
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 372 |
-# (needed due to CMAKE_BUILD_TYPE != Gentoo) |
| 373 |
-CMAKE_MIN_VERSION=3.7.0-r1 |
| 374 |
-PYTHON_COMPAT=( python2_7 ) |
| 375 |
- |
| 376 |
-inherit cmake-multilib llvm python-any-r1 |
| 377 |
- |
| 378 |
-MY_P=${P/_/}.src |
| 379 |
-LIBCXX_P=libcxx-${PV/_/}.src |
| 380 |
- |
| 381 |
-DESCRIPTION="Low level support for a standard C++ library" |
| 382 |
-HOMEPAGE="https://libcxxabi.llvm.org/" |
| 383 |
-SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz |
| 384 |
- https://releases.llvm.org/${PV/_//}/${LIBCXX_P}.tar.xz" |
| 385 |
- |
| 386 |
-LICENSE="|| ( UoI-NCSA MIT )" |
| 387 |
-SLOT="0" |
| 388 |
-KEYWORDS="amd64 ~arm64 x86" |
| 389 |
-IUSE="+libunwind +static-libs test elibc_musl" |
| 390 |
- |
| 391 |
-RDEPEND=" |
| 392 |
- libunwind? ( |
| 393 |
- || ( |
| 394 |
- >=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}] |
| 395 |
- >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}] |
| 396 |
- ) |
| 397 |
- )" |
| 398 |
-# LLVM 4 required for llvm-config --cmakedir |
| 399 |
-DEPEND="${RDEPEND} |
| 400 |
- >=sys-devel/llvm-4 |
| 401 |
- test? ( >=sys-devel/clang-3.9.0 |
| 402 |
- $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" |
| 403 |
- |
| 404 |
-S=${WORKDIR}/${MY_P} |
| 405 |
- |
| 406 |
-# least intrusive of all |
| 407 |
-CMAKE_BUILD_TYPE=RelWithDebInfo |
| 408 |
- |
| 409 |
-python_check_deps() { |
| 410 |
- has_version "dev-python/lit[${PYTHON_USEDEP}]" |
| 411 |
-} |
| 412 |
- |
| 413 |
-pkg_setup() { |
| 414 |
- llvm_pkg_setup |
| 415 |
- use test && python-any-r1_pkg_setup |
| 416 |
-} |
| 417 |
- |
| 418 |
-src_unpack() { |
| 419 |
- default |
| 420 |
- mv "${LIBCXX_P}" libcxx || die |
| 421 |
-} |
| 422 |
- |
| 423 |
-multilib_src_configure() { |
| 424 |
- local libdir=$(get_libdir) |
| 425 |
- local mycmakeargs=( |
| 426 |
- -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} |
| 427 |
- -DLIBCXXABI_ENABLE_SHARED=ON |
| 428 |
- -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) |
| 429 |
- -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) |
| 430 |
- -DLIBCXXABI_INCLUDE_TESTS=$(usex test) |
| 431 |
- |
| 432 |
- -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include |
| 433 |
- # upstream is omitting standard search path for this |
| 434 |
- # probably because gcc & clang are bundling their own unwind.h |
| 435 |
- -DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include |
| 436 |
- ) |
| 437 |
- if use test; then |
| 438 |
- if has_version '>=sys-devel/llvm-6'; then |
| 439 |
- mycmakeargs+=( |
| 440 |
- -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" |
| 441 |
- ) |
| 442 |
- else |
| 443 |
- mycmakeargs+=( |
| 444 |
- -DLIT_COMMAND="${EPREFIX}"/usr/bin/lit |
| 445 |
- ) |
| 446 |
- fi |
| 447 |
- fi |
| 448 |
- cmake-utils_src_configure |
| 449 |
-} |
| 450 |
- |
| 451 |
-build_libcxx() { |
| 452 |
- local -x LDFLAGS="${LDFLAGS} -L${BUILD_DIR}/$(get_libdir)" |
| 453 |
- local CMAKE_USE_DIR=${WORKDIR}/libcxx |
| 454 |
- local BUILD_DIR=${BUILD_DIR}/libcxx |
| 455 |
- local mycmakeargs=( |
| 456 |
- -DLIBCXX_LIBDIR_SUFFIX= |
| 457 |
- -DLIBCXX_ENABLE_SHARED=ON |
| 458 |
- -DLIBCXX_ENABLE_STATIC=OFF |
| 459 |
- -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF |
| 460 |
- -DLIBCXX_CXX_ABI=libcxxabi |
| 461 |
- -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include |
| 462 |
- -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF |
| 463 |
- -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) |
| 464 |
- -DLIBCXX_HAS_GCC_S_LIB=OFF |
| 465 |
- -DLIBCXX_INCLUDE_TESTS=OFF |
| 466 |
- ) |
| 467 |
- |
| 468 |
- cmake-utils_src_configure |
| 469 |
- cmake-utils_src_compile |
| 470 |
-} |
| 471 |
- |
| 472 |
-multilib_src_test() { |
| 473 |
- local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) |
| 474 |
- |
| 475 |
- [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" |
| 476 |
- sed -i -e "/cxx_under_test/s^\".*\"^\"${clang_path}\"^" test/lit.site.cfg || die |
| 477 |
- |
| 478 |
- # build a local copy of libc++ for testing to avoid circular dep |
| 479 |
- build_libcxx |
| 480 |
- mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die |
| 481 |
- |
| 482 |
- cmake-utils_src_make check-libcxxabi |
| 483 |
-} |
| 484 |
- |
| 485 |
-multilib_src_install_all() { |
| 486 |
- insinto /usr/include/libcxxabi |
| 487 |
- doins -r include/. |
| 488 |
-} |
Archives