public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/pwsh/
Date: Mon, 23 Sep 2024 10:00:11 +0000 (UTC)	[thread overview]
Message-ID: <1727085607.0f4bf7b655c6cad37d58848328939790aaa75196.xgqt@gentoo> (raw)

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}" \


             reply	other threads:[~2024-09-23 10:00 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-23 10:00 Maciej Barć [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-29 23:22 [gentoo-commits] repo/gentoo:master commit in: app-shells/pwsh/ Maciej Barć
2024-10-22  0:08 Maciej Barć
2024-05-16 16:47 Arthur Zamarin
2024-05-10 17:22 Maciej Barć
2024-04-04  9:01 Jakov Smolić
2024-04-04  1:07 Sam James
2024-03-10  0:29 Maciej Barć
2024-01-23 22:07 Maciej Barć
2024-01-21  0:44 Maciej Barć
2023-12-16 21:45 Maciej Barć
2023-11-26  0:04 Maciej Barć
2023-11-26  0:04 Maciej Barć
2023-11-26  0:04 Maciej Barć
2023-10-28 14:05 Maciej Barć
2023-10-11  0:19 Maciej Barć
2023-10-04 23:32 Maciej Barć
2023-09-16 10:26 Sam James
2023-09-16 10:11 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1727085607.0f4bf7b655c6cad37d58848328939790aaa75196.xgqt@gentoo \
    --to=xgqt@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox