From 0bb42730e8fc9c8e571f12e3189c6c6f8d532c24 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Feb 2024 17:34:25 +0000 Subject: gentoo auto-resync : 10:02:2024 - 17:34:25 --- sys-libs/llvm-libunwind/Manifest | 11 +- .../llvm-libunwind-18.1.0_rc1.ebuild | 131 --------------------- .../llvm-libunwind-18.1.0_rc2.ebuild | 11 +- .../llvm-libunwind-19.0.0.9999.ebuild | 11 +- .../llvm-libunwind-19.0.0_pre20240127.ebuild | 131 --------------------- .../llvm-libunwind-19.0.0_pre20240203.ebuild | 11 +- 6 files changed, 15 insertions(+), 291 deletions(-) delete mode 100644 sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc1.ebuild delete mode 100644 sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240127.ebuild (limited to 'sys-libs/llvm-libunwind') diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest index af4b02432f83..10ea7116c69d 100644 --- a/sys-libs/llvm-libunwind/Manifest +++ b/sys-libs/llvm-libunwind/Manifest @@ -4,18 +4,13 @@ DIST llvm-project-16.0.6.src.tar.xz 118013488 BLAKE2B 95192d39cbd2914e5609db3659 DIST llvm-project-16.0.6.src.tar.xz.sig 566 BLAKE2B 2060cebd5ed57cb8a86a44238c43dfd4b921649298b10c3d19da308374c1e49869174294e29943c2af459fe06428264e26881d6c1288ebbc48686cc2cf467c7a SHA512 ca249262c7102e0889ec1bdc6f71a3a6f0e7e5d5fbab8abcd6fccd2871e7955eff7af5b055a76006097baf0dfaf2f5069eff3035b3107fc552abdb2481b21447 DIST llvm-project-17.0.6.src.tar.xz 127838860 BLAKE2B d6ede1a9fda8756995c3e0654111941649e15794179641806f18919f1dc68c41ca0cabd5693b5096d05dccc3a391cd20d34af1137bf8af92ed3117a1ce84d1b2 SHA512 6d85bf749e0d77553cc215cbfa61cec4ac4f4f652847f56f946b6a892a99a5ea40b6ab8b39a9708a035001f007986941ccf17e4635260a8b0c1fa59e78d41e30 DIST llvm-project-17.0.6.src.tar.xz.sig 438 BLAKE2B 186e75b6a0fbfe1e85408589c149e1800fcc47d685b74e4260018e05cd08bc793d1d1197c9c50e177eea941a3d0c65cb0c583ce6dae449099b920adf8a508ef7 SHA512 f78c55053a6450625f3e95f52c305110b4468a9854fec75831b65b8d6ceee3c9206ab9e63c4b5fda8be9bd344f72cfbdaae0520ed240abd505e08ebeaa25d340 -DIST llvm-project-18.1.0rc1.src.tar.xz 131969632 BLAKE2B 0cc2f3049a89ee07182189a1ff7aec1751bfe6bbaed4887e139854737fe4eb0ec924b37d8d5b01e298d6a4b271735a615283465262345d0a288180edd6276139 SHA512 85afc331c8a023f4d8177cc42143b968b94d6987a7ed38b8be1170c6b4e1ef1a79d2d4e44d5fae98b713959b5d69bd4e44c6ba84355f59e8fe99588cbca03d7a -DIST llvm-project-18.1.0rc1.src.tar.xz.sig 566 BLAKE2B c9fd7e92e0c6bb8291314ed388d518d15b75c5d4e7ba5da461c2176c5519d721c5ae95d8ecf99ce17bdc398cf23f13b540aacab306c2923e4c0ac8a5f059746f SHA512 0bb072ef2d3156241bcb74102c977db73720f38918e1a0b2cbe6191b6884ce5750ed9f5af69575599bad840c0151a04f81ebc5194c4ce258cbd6516d6c26d9cb DIST llvm-project-18.1.0rc2.src.tar.xz 131993176 BLAKE2B 8df1e34a54214975efe1b9a649753a2dc20c04e3c763bd8648000f48dd18f27ccfdc597ff6e68e0f408310493dfa92f48c7eee53376501e8ebc3b7c614809c15 SHA512 b595bb5d029723fee4e8f8edeaddd6fdcd48d668f66f4239e3208fd19d3a3622e8e4f90ae3fa4b1216fca1621d6c6b6ebf4d99dec7febff2457d0ceb79e8617a DIST llvm-project-18.1.0rc2.src.tar.xz.sig 566 BLAKE2B c765549386a92883bd348d9be25a3c92b1e66a1bac71385ef99978ec2af413a7616a2d9699c57554d927f95b80a3584572557d26e3df16b2ff6678359d5fd6b0 SHA512 83bb4c133f34faec8a0109689ed7aa18222c9a803ba8c95c571a18e854726024f106a1c8e3a820020255c426b7fa8bda26789ff1546972e233fbe3e3ab3a8e91 -DIST llvm-project-1f13203029333ac99cc9844b8b6915aae3fc0902.tar.gz 205629630 BLAKE2B cd6c127bc7b63fffc4707863ab8a34e23371ce28878818723ba74d78a1be1b43c2f401fba7de2084f628f9418b7f0e7b9fe9c224b92dc44233cde2f5e3470333 SHA512 0b35754d6e8836267393d0d63effe04e1af5851b217252953ca3a75e7d71e32b1188991d34ff649f8c1cf2a1b49b844ca7e0704597655ffd37d151f4b9a0cf36 DIST llvm-project-78b4e7c5e349d8c101b50affbd260eb109748f8f.tar.gz 207433034 BLAKE2B ab7189fe82b5a9309348b499130295b3057dbb263ad9c60b1748e4ea92be3a85f0160baa1408dde5516650994951d9f948223d2d6260492a07b07dde51a51ff9 SHA512 366ecb02720d2b550ebeca989abf74ca1c93b2585a95fa378f44edc6c3329ee4e1548f5fa2cf7a19e59bc817abe6cc8850841415227380114c59b58867959a5a EBUILD llvm-libunwind-15.0.7.ebuild 3032 BLAKE2B 9b47e894db1a764f3eca3135f4caba68261953f4433af017b7bb53181e345ad26c570733f997022c53c9ef49a0a3b823188d92cfcc16a2113825d767b1ffab2a SHA512 0b68480fb2a8e5a351574e81fbcff824cd324754ed40378f06fec12fedbba94a921043d72db6ecc37f8b0680b7f518bbbd8d63f69ce8d84f86ca522653d293fb EBUILD llvm-libunwind-16.0.6-r1.ebuild 3440 BLAKE2B eafe21a3de172043ca0039ba27c80c64d32b02cc86bdb5a6d108ded35770e0352216337cbf24ee4fde43b699a68a85c8145be2d17510d525452bfd5a02674998 SHA512 164fdc1c62405e02c035af7997b8522b51f5b9337d2bb66d7fc9b1f45df74ec70d31b26dc5324c59792d32c543fe18abf74ed3b07a64c131e3c1bb4f9f733c5d EBUILD llvm-libunwind-17.0.6.ebuild 3443 BLAKE2B aa12631c752811bb9f4102c1ee36bdefaf43a90bbef93314878afefa8e7ddccb6142cb256c88b99bf8f926df7d7b23f7ce0711b7c56453d0a4474cf8c5bb3e31 SHA512 3b7908e764835a26c9b101bb6b9a7f57294b18af68b39c2d4ab1ae52ab678b8a5b7ca4950e9dea1d521d9ea1f54655ccef77b96a5aa23db8b7990ca26739a326 -EBUILD llvm-libunwind-18.1.0_rc1.ebuild 3355 BLAKE2B 9082db8b72435be9eb39bd2ed250ed6320f657d5ada1f56e3ae39538e54ff53603a33dd99c471d4cee1db52321df2bbf6844d240bab344ffe8e8b2735989f0b7 SHA512 8544a067dbffb9e4d58e16c77072d5eef1170212ff311aa596ab7619023d727907d7060f61e5dea0a890cdc1334b616c89b1ac7b5c254e3a9163273aab487ca2 -EBUILD llvm-libunwind-18.1.0_rc2.ebuild 3355 BLAKE2B 9082db8b72435be9eb39bd2ed250ed6320f657d5ada1f56e3ae39538e54ff53603a33dd99c471d4cee1db52321df2bbf6844d240bab344ffe8e8b2735989f0b7 SHA512 8544a067dbffb9e4d58e16c77072d5eef1170212ff311aa596ab7619023d727907d7060f61e5dea0a890cdc1334b616c89b1ac7b5c254e3a9163273aab487ca2 -EBUILD llvm-libunwind-19.0.0.9999.ebuild 3355 BLAKE2B 9082db8b72435be9eb39bd2ed250ed6320f657d5ada1f56e3ae39538e54ff53603a33dd99c471d4cee1db52321df2bbf6844d240bab344ffe8e8b2735989f0b7 SHA512 8544a067dbffb9e4d58e16c77072d5eef1170212ff311aa596ab7619023d727907d7060f61e5dea0a890cdc1334b616c89b1ac7b5c254e3a9163273aab487ca2 -EBUILD llvm-libunwind-19.0.0_pre20240127.ebuild 3355 BLAKE2B 9082db8b72435be9eb39bd2ed250ed6320f657d5ada1f56e3ae39538e54ff53603a33dd99c471d4cee1db52321df2bbf6844d240bab344ffe8e8b2735989f0b7 SHA512 8544a067dbffb9e4d58e16c77072d5eef1170212ff311aa596ab7619023d727907d7060f61e5dea0a890cdc1334b616c89b1ac7b5c254e3a9163273aab487ca2 -EBUILD llvm-libunwind-19.0.0_pre20240203.ebuild 3355 BLAKE2B 9082db8b72435be9eb39bd2ed250ed6320f657d5ada1f56e3ae39538e54ff53603a33dd99c471d4cee1db52321df2bbf6844d240bab344ffe8e8b2735989f0b7 SHA512 8544a067dbffb9e4d58e16c77072d5eef1170212ff311aa596ab7619023d727907d7060f61e5dea0a890cdc1334b616c89b1ac7b5c254e3a9163273aab487ca2 +EBUILD llvm-libunwind-18.1.0_rc2.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301 +EBUILD llvm-libunwind-19.0.0.9999.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301 +EBUILD llvm-libunwind-19.0.0_pre20240203.ebuild 3316 BLAKE2B 013ff60e8fa1fa480e1e56c6c8c1d5a657d946264a279a8fad53e3047fcde1f439e10b25e151af0d9c3f7f6fe014c2cf3372d311f3963c78e633e986b28a33e5 SHA512 4aaa97553c0e3e5421fe5864b81fdcd0e8a1167e37bec37e8706d3b9b939b5220a171576f800bdc6ae25f2bbfd60b063c84934d1daa0bdfd6989a80d08044301 MISC metadata.xml 438 BLAKE2B 2a36fbbc59e137056029c62aef6d167d9c82531c2582d7bad5cb13cc36e5c4c9518ffe8c56d06bbcfd97ad22eda71a8b776f3984195f53d06cf45659b438dc00 SHA512 4f18b054072d00e5440faa31a59f9ef587d035b5f25e30913f0b1449debee967fa794fae2548e87db3fb2177ce853ab075e1f11f3cc763f5d7fdf06147108845 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc1.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc1.ebuild deleted file mode 100644 index 73ad1389deb4..000000000000 --- a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc1.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs - -DESCRIPTION="C++ runtime stack unwinder from LLVM" -HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -IUSE="+clang +debug static-libs test" -REQUIRED_USE="test? ( clang )" -RESTRICT="!test? ( test )" - -RDEPEND=" - !sys-libs/libunwind -" -DEPEND=" - sys-devel/llvm:${LLVM_MAJOR} -" -BDEPEND=" - clang? ( - sys-devel/clang:${LLVM_MAJOR} - ) - !test? ( - ${PYTHON_DEPS} - ) - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - ) -" - -LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake ) -LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit ) -llvm.org_set_globals - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local libdir=$(get_libdir) - - # https://github.com/llvm/llvm-project/issues/56825 - # also separately bug #863917 - filter-lto - - if use clang; then - 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 - local use_compiler_rt=OFF - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON - - # Respect upstream build type assumptions (bug #910436) where they do: - # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => - # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG - # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG - # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => - # -UNDEBUG - # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. - use debug || append-cppflags -DNDEBUG - - local mycmakeargs=( - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" - -DPython3_EXECUTABLE="${PYTHON}" - -DLLVM_ENABLE_RUNTIMES="libunwind" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DLLVM_INCLUDE_TESTS=OFF - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) - -DLIBUNWIND_INCLUDE_TESTS=$(usex test) - -DLIBUNWIND_INSTALL_HEADERS=ON - - # support non-native unwinding; given it's small enough, - # enable it unconditionally - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON - - # avoid dependency on libgcc_s if compiler-rt is used - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt} - ) - if use test; then - mycmakeargs+=( - -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" - - -DLIBCXXABI_LIBDIR_SUFFIX= - -DLIBCXXABI_ENABLE_SHARED=OFF - -DLIBCXXABI_ENABLE_STATIC=ON - -DLIBCXXABI_USE_LLVM_UNWINDER=ON - -DLIBCXXABI_INCLUDE_TESTS=OFF - - -DLIBCXX_LIBDIR_SUFFIX= - -DLIBCXX_ENABLE_SHARED=OFF - -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) - -DLIBCXX_HAS_GCC_S_LIB=OFF - -DLIBCXX_INCLUDE_TESTS=OFF - -DLIBCXX_INCLUDE_BENCHMARKS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-unwind -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-unwind -} diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc2.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc2.ebuild index 73ad1389deb4..df7d3e6095bc 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc2.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-18.1.0_rc2.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" @@ -43,12 +43,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-any-r1_pkg_setup -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local libdir=$(get_libdir) # https://github.com/llvm/llvm-project/issues/56825 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0.9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0.9999.ebuild index 73ad1389deb4..df7d3e6095bc 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0.9999.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0.9999.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" @@ -43,12 +43,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-any-r1_pkg_setup -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local libdir=$(get_libdir) # https://github.com/llvm/llvm-project/issues/56825 diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240127.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240127.ebuild deleted file mode 100644 index 73ad1389deb4..000000000000 --- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240127.ebuild +++ /dev/null @@ -1,131 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs - -DESCRIPTION="C++ runtime stack unwinder from LLVM" -HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" - -LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )" -SLOT="0" -IUSE="+clang +debug static-libs test" -REQUIRED_USE="test? ( clang )" -RESTRICT="!test? ( test )" - -RDEPEND=" - !sys-libs/libunwind -" -DEPEND=" - sys-devel/llvm:${LLVM_MAJOR} -" -BDEPEND=" - clang? ( - sys-devel/clang:${LLVM_MAJOR} - ) - !test? ( - ${PYTHON_DEPS} - ) - test? ( - $(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]') - ) -" - -LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake ) -LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit ) -llvm.org_set_globals - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/lit[${PYTHON_USEDEP}]" -} - -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local libdir=$(get_libdir) - - # https://github.com/llvm/llvm-project/issues/56825 - # also separately bug #863917 - filter-lto - - if use clang; then - 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 - local use_compiler_rt=OFF - [[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON - - # Respect upstream build type assumptions (bug #910436) where they do: - # -DLIBUNWIND_ENABLE_ASSERTIONS=ON => - # -DCMAKE_BUILD_TYPE=DEBUG => -UNDEBUG - # -DCMAKE_BUILD_TYPE!=debug => -DNDEBUG - # -DLIBUNWIND_ENABLE_ASSERTIONS=OFF => - # -UNDEBUG - # See also https://github.com/llvm/llvm-project/issues/86#issuecomment-1649668826. - use debug || append-cppflags -DNDEBUG - - local mycmakeargs=( - -DCMAKE_CXX_COMPILER_TARGET="${CHOST}" - -DPython3_EXECUTABLE="${PYTHON}" - -DLLVM_ENABLE_RUNTIMES="libunwind" - -DLLVM_LIBDIR_SUFFIX=${libdir#lib} - -DLLVM_INCLUDE_TESTS=OFF - -DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug) - -DLIBUNWIND_ENABLE_STATIC=$(usex static-libs) - -DLIBUNWIND_INCLUDE_TESTS=$(usex test) - -DLIBUNWIND_INSTALL_HEADERS=ON - - # support non-native unwinding; given it's small enough, - # enable it unconditionally - -DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON - - # avoid dependency on libgcc_s if compiler-rt is used - -DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt} - ) - if use test; then - mycmakeargs+=( - -DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx" - -DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit" - -DLLVM_LIT_ARGS="$(get_lit_flags)" - -DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx" - - -DLIBCXXABI_LIBDIR_SUFFIX= - -DLIBCXXABI_ENABLE_SHARED=OFF - -DLIBCXXABI_ENABLE_STATIC=ON - -DLIBCXXABI_USE_LLVM_UNWINDER=ON - -DLIBCXXABI_INCLUDE_TESTS=OFF - - -DLIBCXX_LIBDIR_SUFFIX= - -DLIBCXX_ENABLE_SHARED=OFF - -DLIBCXX_ENABLE_STATIC=ON - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF - -DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl) - -DLIBCXX_HAS_GCC_S_LIB=OFF - -DLIBCXX_INCLUDE_TESTS=OFF - -DLIBCXX_INCLUDE_BENCHMARKS=OFF - ) - fi - - cmake_src_configure -} - -multilib_src_test() { - local -x LIT_PRESERVES_TMP=1 - cmake_build check-unwind -} - -multilib_src_install() { - DESTDIR=${D} cmake_build install-unwind -} diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240203.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240203.ebuild index 73ad1389deb4..df7d3e6095bc 100644 --- a/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240203.ebuild +++ b/sys-libs/llvm-libunwind/llvm-libunwind-19.0.0_pre20240203.ebuild @@ -4,8 +4,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \ - toolchain-funcs +inherit cmake-multilib flag-o-matic llvm.org llvm-utils python-any-r1 +inherit toolchain-funcs DESCRIPTION="C++ runtime stack unwinder from LLVM" HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html" @@ -43,12 +43,9 @@ python_check_deps() { python_has_version "dev-python/lit[${PYTHON_USEDEP}]" } -pkg_setup() { - LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup - python-any-r1_pkg_setup -} - multilib_src_configure() { + llvm_prepend_path "${LLVM_MAJOR}" + local libdir=$(get_libdir) # https://github.com/llvm/llvm-project/issues/56825 -- cgit v1.2.3