diff options
Diffstat (limited to 'sys-libs/libcxxabi')
-rw-r--r-- | sys-libs/libcxxabi/Manifest | 19 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild | 2 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild (renamed from sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild) | 2 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild | 1 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild (renamed from sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild) | 3 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-11.0.0_rc2.ebuild (renamed from sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild) | 3 | ||||
-rw-r--r-- | sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild (renamed from sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild) | 67 |
7 files changed, 48 insertions, 49 deletions
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest index 90d9adc94b4c..9692f5e625ca 100644 --- a/sys-libs/libcxxabi/Manifest +++ b/sys-libs/libcxxabi/Manifest @@ -1,14 +1,13 @@ -DIST libcxx-8.0.1.src.tar.xz 1739524 BLAKE2B 6e641cb6bda0de12c8408d3ab33f627389ac014aa65b3391c870aa96ffd347784e6b70b953bd1ee8eba56554e0f78a723ab77b9dba5f85e6219e2b95ca50c160 SHA512 75749d08b2b343c6f5f9aefb04be63e42f6d12efc51101d3647ed6f70c7a6d050afb3ab2f3636eae78cb523f5844de67b960a7a3145ed89ab0c7015deb14921e -DIST libcxxabi-8.0.1.src.tar.xz 538356 BLAKE2B 52328c5890c9b9271877b953be30cc39be4758101e6b91ee45f06c81e960089523e80b83eb5c354336e4e0a140f7554640acf7b2d4fa619113f705108a314418 SHA512 577cfcb04ebb29ee84d35ed31aa8fecb28fc74b07ef7ff298f0fe2d440f823def73e092359c41d8d8600e6df18f55224ed89674d403c5ae56a7d7973487b8734 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0 -DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597 -DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325 +DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151 +DIST llvmorg-11.0.0-rc1.tar.gz 122688246 BLAKE2B 10ff3f08ff3780abb1d86ac67942e6aac52ff5daf820a2e3d23d8b79dbade1c5b1d398d0a577028d2d7c8759ab9a8b552a0305b5750310a015585c06cdadf844 SHA512 09564ed903902a5795fffaa4679badc30bf49739889a48074b5ae2c93bd29000cfb36a650208d5cae5d74899bade066f84b4aa023fc852eec246ff67bf64a267 +DIST llvmorg-11.0.0-rc2.tar.gz 122728230 BLAKE2B 7944adf41ec7cd82489666a0a38a857de628879d59a2e3bb566b67c18500092430db66ff214d45cb324128c874a74a72c367b452df3b88ec95b33c284dd35512 SHA512 25eb2879eb22e79a1e840ef24cf3f5eec602e947101db299393e06e3d09f2d1531eef214264636e1b511eafff7f51b1834d5a03976ccd088eb680745b147e9f3 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59 -EBUILD libcxxabi-10.0.0.ebuild 3393 BLAKE2B cb5b02ea687c5138cf6bf12274a8b8ec1da5c44daaeca70c562984a35d926c43a1d3a9650a894211d74e866c0adc30c5f460ce79179f1c8752f472efb8638b3c SHA512 d9523bfce7fea9c57b2fd58e861e7fd8983e8bfc1d8f7f714e14c487040a6b0d08345258d4300bf693c58a28324b298fa43bb009083610975acf2c135b3373f8 -EBUILD libcxxabi-10.0.1.9999.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1 -EBUILD libcxxabi-10.0.1_rc1.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1 -EBUILD libcxxabi-10.0.1_rc2.ebuild 3219 BLAKE2B d49ba451e0aee79e97b0519441d621f9d89a37bd52950fe51674dc562abb35d9e8213c26c3099bc22d835c4f7b492ea28986632f1f5d237b82cf52fc2acf27f7 SHA512 073e201313a02c8614a3966591b15053f029c85a9f2718bf9c6c7eb77fa38a43bd7ed50ddedba21d3adaba415c6240663a0506697aa6444c8a0b65ee1e0805d1 -EBUILD libcxxabi-11.0.0.9999.ebuild 3216 BLAKE2B b5e0ffc7235b3ec87d689f0cbfb048002f76796aad0a0ddfb111716a3bab3d212cb540afa1d89c107edf1d9fa0f8d5c09c96aa3f31ab6a6f9153a501bf9aa423 SHA512 54eb611fac1f62c1251730f1eb374660255f64bcc42996fe37bb0a0a126350925dd0015b7f66414d439048f5adc0cf6df764dce0dd3c21e992e28541d1e4dc25 -EBUILD libcxxabi-8.0.1.ebuild 3226 BLAKE2B 9804f1976cd7e605cf60a07e69c66f97795bebf66779fb69fe500cb6f4693e63d799fdb57991b2b65bde309e72e2e6055c3e88fd1ebf0be725982a253faf10b7 SHA512 42ccc6ccfc69c95dd465542d90a6a6bc0558703fcf2b5b1acb5c828728416cddbd5af925552b231c890af8c89533073a3f13d87da9c1401cf8904bb4dc5e72de +EBUILD libcxxabi-10.0.0.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a +EBUILD libcxxabi-10.0.1.ebuild 3242 BLAKE2B 75a91dbc67b0033c9a81479d8a364226b439fc15d72bdfa95b4385b6152645950ad330264c8bf779f1a79e9a1884cc7dc3010f7aa40ac7030f4732015d694243 SHA512 2a3eacc76503381558fae5987481e8a708cef274b388553162f8c2424d1465f1cff6e336bcbebeb4a79377c92236069cc4ddded8c518b394776ed844b315bcec +EBUILD libcxxabi-11.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515 +EBUILD libcxxabi-11.0.0_rc1.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515 +EBUILD libcxxabi-11.0.0_rc2.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515 +EBUILD libcxxabi-12.0.0.9999.ebuild 3252 BLAKE2B 93eb72e9e7fce7e0865912fdcba4db242226877398c84c1955e2e829956665f578f8905866a6ce9cf44100bb181fd722c9644ec43f16330f68a3708427633b9b SHA512 5b3a3982daea0615c54d88244c48cb37d9ef1b922d6eb4d1c20d5a97e8c13898ccb20f600fc0e975e0f260b440641ef114c79368ce2b662aece06a7885247515 EBUILD libcxxabi-9.0.1.ebuild 3390 BLAKE2B 708b1327f629ad4445fde37d53dea7807c433a2e3154f56f3fed4ba9eb698f3bb3e67055820521c58d8a31dc26abf28c293d709f97b4496ab420d788ab532c12 SHA512 18ab388b271756a5eb6dd1650d6a9f05a392b4e2cb48df92359c0e9ac763ecc4672343b4b51184f13c0636fe130e4a5972d8937866d34f1efec4b1addce1f81a MISC metadata.xml 350 BLAKE2B 67b70b8d7292327882a845b76667ce24fee728cd84f27ed7e329bc7963631cba4c28bafce5e6a5fefb4ba1df5c7fd572b3b0d7a2b31ef649496f2f991b691bff SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703 diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild index 2ecc31cb4a44..0812b96e62d8 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-10.0.0.ebuild @@ -14,7 +14,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm arm64 x86" IUSE="+libunwind +static-libs test elibc_musl" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild index 41a864c31acd..dd5f660654b1 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-10.0.1.ebuild @@ -15,7 +15,7 @@ llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="+libunwind +static-libs test elibc_musl" RESTRICT="!test? ( test )" diff --git a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild index 534db9954d2c..4b304417a9c3 100644 --- a/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.0.0.9999.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" # libcxx is needed uncondtionally for the headers LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild index 41a864c31acd..4b304417a9c3 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc1.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" # libcxx is needed uncondtionally for the headers LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" @@ -106,7 +107,7 @@ multilib_src_test() { mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die local -x LIT_PRESERVES_TMP=1 - cmake_build check-libcxxabi + cmake_build check-cxxabi } multilib_src_install_all() { diff --git a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc2.ebuild index 41a864c31acd..4b304417a9c3 100644 --- a/sys-libs/libcxxabi/libcxxabi-10.0.1_rc2.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-11.0.0_rc2.ebuild @@ -11,6 +11,7 @@ DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" # libcxx is needed uncondtionally for the headers LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) llvm.org_set_globals LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" @@ -106,7 +107,7 @@ multilib_src_test() { mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die local -x LIT_PRESERVES_TMP=1 - cmake_build check-libcxxabi + cmake_build check-cxxabi } multilib_src_install_all() { diff --git a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild index 74465117dda3..4b304417a9c3 100644 --- a/sys-libs/libcxxabi/libcxxabi-8.0.1.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-12.0.0.9999.ebuild @@ -1,26 +1,22 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -: ${CMAKE_MAKEFILE_GENERATOR:=ninja} -# (needed due to CMAKE_BUILD_TYPE != Gentoo) -CMAKE_MIN_VERSION=3.7.0-r1 -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-multilib llvm multiprocessing python-any-r1 - -MY_P=${P/_/}.src -LIBCXX_P=libcxx-${PV/_/}.src +CMAKE_ECLASS=cmake +PYTHON_COMPAT=( python3_{6..9} ) +inherit cmake-multilib llvm llvm.org python-any-r1 toolchain-funcs DESCRIPTION="Low level support for a standard C++ library" HOMEPAGE="https://libcxxabi.llvm.org/" -SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz - https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LIBCXX_P}.tar.xz" +# libcxx is needed uncondtionally for the headers +LLVM_COMPONENTS=( libcxx{abi,} ) +LLVM_TEST_COMPONENTS=( llvm/cmake ) +llvm.org_set_globals -LICENSE="|| ( UoI-NCSA MIT )" +LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" -KEYWORDS="amd64 arm arm64 x86" +KEYWORDS="" IUSE="+libunwind +static-libs test elibc_musl" RESTRICT="!test? ( test )" @@ -33,15 +29,11 @@ RDEPEND=" )" # llvm-6 for new lit options DEPEND="${RDEPEND} - >=sys-devel/llvm-6 + >=sys-devel/llvm-6" +BDEPEND=" test? ( >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') )" -S=${WORKDIR}/${MY_P} - -# least intrusive of all -CMAKE_BUILD_TYPE=RelWithDebInfo - python_check_deps() { has_version "dev-python/lit[${PYTHON_USEDEP}]" } @@ -51,12 +43,17 @@ pkg_setup() { use test && python-any-r1_pkg_setup } -src_unpack() { - default - mv "${LIBCXX_P}" libcxx || die -} - multilib_src_configure() { + # link against compiler-rt instead of libgcc if we are using clang with libunwind + local want_compiler_rt=OFF + if use libunwind && tc-is-clang; then + local compiler_rt=$($(tc-getCC) ${CFLAGS} ${CPPFLAGS} \ + ${LDFLAGS} -print-libgcc-file-name) + if [[ ${compiler_rt} == *libclang_rt* ]]; then + want_compiler_rt=ON + fi + fi + local libdir=$(get_libdir) local mycmakeargs=( -DLIBCXXABI_LIBDIR_SUFFIX=${libdir#lib} @@ -64,6 +61,7 @@ multilib_src_configure() { -DLIBCXXABI_ENABLE_STATIC=$(usex static-libs) -DLIBCXXABI_USE_LLVM_UNWINDER=$(usex libunwind) -DLIBCXXABI_INCLUDE_TESTS=$(usex test) + -DLIBCXXABI_USE_COMPILER_RT=${want_compiler_rt} -DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include # upstream is omitting standard search path for this @@ -72,16 +70,14 @@ multilib_src_configure() { ) if use test; then local clang_path=$(type -P "${CHOST:+${CHOST}-}clang" 2>/dev/null) - local jobs=${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")} - [[ -n ${clang_path} ]] || die "Unable to find ${CHOST}-clang for tests" mycmakeargs+=( -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="-vv;-j;${jobs};--param=cxx_under_test=${clang_path}" + -DLLVM_LIT_ARGS="$(get_lit_flags);--param=cxx_under_test=${clang_path}" ) fi - cmake-utils_src_configure + cmake_src_configure } build_libcxx() { @@ -90,8 +86,8 @@ build_libcxx() { local BUILD_DIR=${BUILD_DIR}/libcxx local mycmakeargs=( -DLIBCXX_LIBDIR_SUFFIX= - -DLIBCXX_ENABLE_SHARED=ON - -DLIBCXX_ENABLE_STATIC=OFF + -DLIBCXX_ENABLE_SHARED=OFF + -DLIBCXX_ENABLE_STATIC=ON -DLIBCXX_ENABLE_EXPERIMENTAL_LIBRARY=OFF -DLIBCXX_CXX_ABI=libcxxabi -DLIBCXX_CXX_ABI_INCLUDE_PATHS="${S}"/include @@ -101,8 +97,8 @@ build_libcxx() { -DLIBCXX_INCLUDE_TESTS=OFF ) - cmake-utils_src_configure - cmake-utils_src_compile + cmake_src_configure + cmake_src_compile } multilib_src_test() { @@ -110,7 +106,8 @@ multilib_src_test() { build_libcxx mv "${BUILD_DIR}"/libcxx/lib/libc++* "${BUILD_DIR}/$(get_libdir)/" || die - cmake-utils_src_make check-libcxxabi + local -x LIT_PRESERVES_TMP=1 + cmake_build check-cxxabi } multilib_src_install_all() { |