diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-28 21:05:25 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-28 21:05:25 +0100 |
| commit | 9403c20e10161812ed5231e7fd14464ca484aa09 (patch) | |
| tree | f7757c7c0efe870267d826326a1a44a33ec53125 /sys-libs/llvm-libunwind | |
| parent | e74494cd71c90a42f7cf78ec655c9c883a26c42a (diff) | |
gentoo auto-resync : 28:07:2022 - 21:05:25
Diffstat (limited to 'sys-libs/llvm-libunwind')
| -rw-r--r-- | sys-libs/llvm-libunwind/Manifest | 4 | ||||
| -rw-r--r-- | sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild | 26 | ||||
| -rw-r--r-- | sys-libs/llvm-libunwind/metadata.xml | 6 |
3 files changed, 20 insertions, 16 deletions
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index f0148507ea92..580bdffa8e6d 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -6,5 +6,5 @@ DIST llvmorg-14.0.4.tar.gz 158088617 BLAKE2B 7fb894548dce72593a8639b4d0220d24995 EBUILD llvm-libunwind-13.0.1.ebuild 3810 BLAKE2B c215ba47340bda6a466f6ffcdf978d0d3ab4f4f1f456114f854f53dd3dd04d197ee235c4623d0a3d6e0f26022fef909be2ad04e93679ce357c396c94dc7d3a49 SHA512 96827c5f5838898ac368b79677b6e17fb0545a6a5239f8262622034843777ad4f071f9f80e3c33e0e1a2df334abcefbd7e867c5957d2bf72a1b8416b5b7ac714 EBUILD llvm-libunwind-14.0.4.ebuild 3200 BLAKE2B 884692225751f6315f794655e2fbfeae7eb18e13b613f819e45ed485acb33daead6fe6b418df1e77167d5f243e5aaae4c8a415568e87b0aa315ae3b48aa43aa3 SHA512 e01166633fd76113dbc216b6755956a0f28d8a67d641cf5bc1195be49c23b89aa24d9f0fd974304f8a06ec41fdb7cc17a909a07f651604cf0bcd2fe549eaf922 EBUILD llvm-libunwind-14.0.6.ebuild 3205 BLAKE2B 94ee3640bf57770f52d8bf0adb53ac5eec90884af970ad72e23d0208986a3801bb327a8cf791bd97c2e9414710201e7b61cc5d1d5aef16233b015bf9c4630b4a SHA512 46e2f37981fb1e6e454da41fdeba5d9c3a97173631caf4b619756a1b3bed6b3f4904a73d799ec5fc21a96b4cd46a92033d5fdc113a9be9707c2e1dbc2237b8c6 -EBUILD llvm-libunwind-15.0.0.9999.ebuild 3145 BLAKE2B 37362f37ade47d59ebee5c65337768677a280379541c8468fdd7b31927b4eb93c2576a46838bb320bd526aa2191828cd8f7ae502adafec594b172065f5b90c35 SHA512 132b91d72b419267ef51ef5be15393a882897587f6190d62a3c39b091ef97eaef06e8f1fe62e3d8303c0f23581604357a10bc7b958b5b71ec3316c1a1dcc5e54 -MISC metadata.xml 303 BLAKE2B ed0dbe1165e30ee5c3556aaf467abf212e198590a06c70f0de4e2c12060644df928c8f388fadfe776249a77dc000b40881d7254cfdc30f7a41209e2524136adb SHA512 5a69c07b9b1b37646d29a7287f1ba1c9150a5fae60df644266232871b5e4db41c0e8d102e8b873af2bdbf814935e8f8479e1534b8aa47d0ee31e971e2fa4dc50 +EBUILD llvm-libunwind-15.0.0.9999.ebuild 3005 BLAKE2B 30e378aeb30bc246036a3a26b49528543146346d1ee66360d2cd23b4f52ec37ca005feca10669217224119d7558b52fcef97cca2fc566f5226ed989d1edbb92f SHA512 d5fec6aad963b5b70965ecb907dbee32aec506ecf1ebd10b5d5204a73c1a887101ffadd236b685d881830b393e67e35ea13d7c0207b7a6dcbed78436626e9f0b +MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild index 6d871c89b6b1..3be6f72f0fc7 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.0.9999.ebuild @@ -13,7 +13,8 @@ HOMEPAGE="https://github.com/llvm-mirror/libunwind" LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" SLOT="0" KEYWORDS="" -IUSE="debug static-libs test" +IUSE="+clang debug static-libs test" +REQUIRED_USE="test? ( clang )" RESTRICT="!test? ( test )" RDEPEND=" @@ -24,11 +25,13 @@ DEPEND=" >=sys-devel/llvm-6 " BDEPEND=" + clang? ( + sys-devel/clang + ) !test? ( ${PYTHON_DEPS} ) test? ( - >=sys-devel/clang-3.9.0 $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') ) " @@ -46,6 +49,14 @@ multilib_src_configure() { local use_compiler_rt=OFF local libdir=$(get_libdir) + if use clang && ! tc-is-clang; then + # Only do this conditionally to allow overriding with + # e.g. CC=clang-13 in case of breakage + local -x CC=${CHOST}-clang + local -x CXX=${CHOST}-clang++ + strip-unsupported-flags + fi + # link to compiler-rt # https://github.com/gentoo/gentoo/pull/21516 if tc-is-clang; then @@ -65,7 +76,6 @@ multilib_src_configure() { -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 @@ -90,7 +100,6 @@ multilib_src_configure() { -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) @@ -101,15 +110,6 @@ multilib_src_configure() { 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() { diff --git a/sys-libs/llvm-libunwind/metadata.xml b/sys-libs/llvm-libunwind/metadata.xml index 0c3d32050a15..9e58371ca860 100644 --- a/sys-libs/llvm-libunwind/metadata.xml +++ b/sys-libs/llvm-libunwind/metadata.xml @@ -5,6 +5,10 @@ <email>llvm@gentoo.org</email> </maintainer> <upstream> - <remote-id type="github">llvm-mirror/libunwind</remote-id> + <remote-id type="github">llvm/llvm-project</remote-id> </upstream> + <use> + <flag name="clang">Force building using installed clang (rather + than the default CC/CXX; required for testing).</flag> + </use> </pkgmetadata> |