commit: f831ded92ad415ded8c849b02da69343e27d483a Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Jul 23 19:16:24 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jul 23 19:16:40 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f831ded9
sys-devel/llvm-toolchain-symlinks: Include c++filt (llvm-cxxfilt) Closes: https://bugs.gentoo.org/936068 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...ain-symlinks-19.ebuild => llvm-toolchain-symlinks-17-r1.ebuild} | 7 +++++-- ...ain-symlinks-19.ebuild => llvm-toolchain-symlinks-18-r1.ebuild} | 7 +++++-- .../llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild | 6 ++++-- .../llvm-toolchain-symlinks/llvm-toolchain-symlinks-20.ebuild | 4 +++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild similarity index 76% copy from sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild copy to sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild index a57062acab8c..b2dfeab26fe9 100644 --- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild +++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-17-r1.ebuild @@ -11,6 +11,7 @@ S=${WORKDIR} LICENSE="public-domain" SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="multilib-symlinks +native-symlinks" RDEPEND=" @@ -23,6 +24,8 @@ src_install() { local tools=( addr2line ar dlltool nm objcopy objdump ranlib readelf size strings strip windres + # https://bugs.gentoo.org/936068 + cxxfilt:c++filt ) local chosts=( "${CHOST}" ) if use multilib-symlinks; then @@ -36,11 +39,11 @@ src_install() { local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${t}" + dosym "llvm-${t%:*}" "${dest}/${t#*:}" done for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${chost}-${t}" + dosym "llvm-${t%:*}" "${dest}/${chost}-${t#*:}" done done } diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild similarity index 76% copy from sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild copy to sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild index a57062acab8c..b2dfeab26fe9 100644 --- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild +++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-18-r1.ebuild @@ -11,6 +11,7 @@ S=${WORKDIR} LICENSE="public-domain" SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~arm64-macos ~ppc-macos ~x64-macos" IUSE="multilib-symlinks +native-symlinks" RDEPEND=" @@ -23,6 +24,8 @@ src_install() { local tools=( addr2line ar dlltool nm objcopy objdump ranlib readelf size strings strip windres + # https://bugs.gentoo.org/936068 + cxxfilt:c++filt ) local chosts=( "${CHOST}" ) if use multilib-symlinks; then @@ -36,11 +39,11 @@ src_install() { local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${t}" + dosym "llvm-${t%:*}" "${dest}/${t#*:}" done for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${chost}-${t}" + dosym "llvm-${t%:*}" "${dest}/${chost}-${t#*:}" done done } diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild index a57062acab8c..60b627fbf393 100644 --- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild +++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-19.ebuild @@ -23,6 +23,8 @@ src_install() { local tools=( addr2line ar dlltool nm objcopy objdump ranlib readelf size strings strip windres + # https://bugs.gentoo.org/936068 + cxxfilt:c++filt ) local chosts=( "${CHOST}" ) if use multilib-symlinks; then @@ -36,11 +38,11 @@ src_install() { local dest=/usr/lib/llvm/${SLOT}/bin dodir "${dest}" for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${t}" + dosym "llvm-${t%:*}" "${dest}/${t#*:}" done for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${chost}-${t}" + dosym "llvm-${t%:*}" "${dest}/${chost}-${t#*:}" done done } diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20.ebuild index a57062acab8c..c8c1320e0f92 100644 --- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20.ebuild +++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-20.ebuild @@ -23,6 +23,8 @@ src_install() { local tools=( addr2line ar dlltool nm objcopy objdump ranlib readelf size strings strip windres + # https://bugs.gentoo.org/936068 + cxxfilt:c++filt ) local chosts=( "${CHOST}" ) if use multilib-symlinks; then @@ -40,7 +42,7 @@ src_install() { done for chost in "${chosts[@]}"; do for t in "${tools[@]}"; do - dosym "llvm-${t}" "${dest}/${chost}-${t}" + dosym "llvm-${t%:*}" "${dest}/${chost}-${t#*:}" done done }
