commit: 0f4bf7b655c6cad37d58848328939790aaa75196 Author: Maciej Barć <xgqt <AT> gentoo <DOT> org> AuthorDate: Mon Sep 23 09:24:38 2024 +0000 Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org> CommitDate: Mon Sep 23 10:00:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4bf7b6
app-shells/pwsh: remove libSystem.IO.Ports.Native.so on musl Closes: https://bugs.gentoo.org/922529 Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org> app-shells/pwsh/{pwsh-7.4.1.ebuild => pwsh-7.4.1-r1.ebuild} | 8 +++++++- app-shells/pwsh/{pwsh-7.4.5.ebuild => pwsh-7.4.5-r1.ebuild} | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app-shells/pwsh/pwsh-7.4.1.ebuild b/app-shells/pwsh/pwsh-7.4.1-r1.ebuild similarity index 97% rename from app-shells/pwsh/pwsh-7.4.1.ebuild rename to app-shells/pwsh/pwsh-7.4.1-r1.ebuild index e2b5e1e380a4..6953d1d14729 100644 --- a/app-shells/pwsh/pwsh-7.4.1.ebuild +++ b/app-shells/pwsh/pwsh-7.4.1-r1.ebuild @@ -385,10 +385,16 @@ src_install() { insinto "${dest_root}/ref" doins "${WORKDIR}/${P}_ref"/* - # Remove "libpsl-native.so" provided by "microsoft.powershell.native". + # Replace "libpsl-native.so" provided by "microsoft.powershell.native". rm "${ED}/${dest_root}/libpsl-native.so" || die dosym -r "/usr/$(get_libdir)/libpsl-native.so" "${dest_root}/libpsl-native.so" + # On musl remove "libSystem.IO.Ports.Native.so" linked against glibc. + if ! use elibc_glibc ; then + ewarn "libSystem.IO.Ports.Native.so is available only for glibc, removing it" + rm "${ED}/${dest_root}/libSystem.IO.Ports.Native.so" || die + fi + if use gui ; then newicon assets/ps_black_128.svg "powershell-${SLOT}.svg" make_desktop_entry "pwsh-${SLOT} -l" "PowerShell ${SLOT}" \ diff --git a/app-shells/pwsh/pwsh-7.4.5.ebuild b/app-shells/pwsh/pwsh-7.4.5-r1.ebuild similarity index 97% rename from app-shells/pwsh/pwsh-7.4.5.ebuild rename to app-shells/pwsh/pwsh-7.4.5-r1.ebuild index 8417ef5ac9f1..8cf2a585c24f 100644 --- a/app-shells/pwsh/pwsh-7.4.5.ebuild +++ b/app-shells/pwsh/pwsh-7.4.5-r1.ebuild @@ -391,10 +391,16 @@ src_install() { insinto "${dest_root}/ref" doins "${WORKDIR}/${P}_ref"/* - # Remove "libpsl-native.so" provided by "microsoft.powershell.native". + # Replace "libpsl-native.so" provided by "microsoft.powershell.native". rm "${ED}/${dest_root}/libpsl-native.so" || die dosym -r "/usr/$(get_libdir)/libpsl-native.so" "${dest_root}/libpsl-native.so" + # On musl remove "libSystem.IO.Ports.Native.so" linked against glibc. + if ! use elibc_glibc ; then + ewarn "libSystem.IO.Ports.Native.so is available only for glibc, removing it" + rm "${ED}/${dest_root}/libSystem.IO.Ports.Native.so" || die + fi + if use gui ; then newicon assets/ps_black_128.svg "powershell-${SLOT}.svg" make_desktop_entry "pwsh-${SLOT} -l" "PowerShell ${SLOT}" \
