From: "Maciej Barć" <xgqt@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/pwsh/
Date: Sun, 21 Jan 2024 00:44:57 +0000 (UTC) [thread overview]
Message-ID: <1705797893.0c8b5b9879551e757487e140fd6d4bd7fb13daec.xgqt@gentoo> (raw)
commit: 0c8b5b9879551e757487e140fd6d4bd7fb13daec
Author: Maciej Barć <xgqt <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 00:42:33 2024 +0000
Commit: Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 00:44:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8b5b98
app-shells/pwsh: just export desired locale on musl
Closes: https://bugs.gentoo.org/922534
Signed-off-by: Maciej Barć <xgqt <AT> gentoo.org>
app-shells/pwsh/pwsh-7.3.9.ebuild | 24 +++++++++++++++++++++++-
app-shells/pwsh/pwsh-7.4.0.ebuild | 22 +++++++++++++---------
2 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/app-shells/pwsh/pwsh-7.3.9.ebuild b/app-shells/pwsh/pwsh-7.3.9.ebuild
index ca71f9702880..b4c0acc62c02 100644
--- a/app-shells/pwsh/pwsh-7.3.9.ebuild
+++ b/app-shells/pwsh/pwsh-7.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NOTICE: Before packaging we have to run "ResGen" and "GetDependencies".
@@ -332,6 +332,28 @@ DOCS=( CHANGELOG CHANGELOG.md CODE_OF_CONDUCT.md README.md docs )
pkg_setup() {
check-reqs_pkg_setup
dotnet-pkg_pkg_setup
+
+ if [[ "${MERGE_TYPE}" != binary ]] ; then
+ if use elibc_glibc ; then
+ local locales="$(locale -a)"
+
+ if has en_US.utf8 ${locales} ; then
+ LC_ALL=en_US.utf8
+ elif has en_US.UTF-8 ${locales} ; then
+ LC_ALL=en_US.UTF-8
+ else
+ eerror "The locale en_US.utf8 or en_US.UTF-8 is not available."
+ eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}."
+
+ die "Could not switch to the en_US.UTF-8 locale."
+ fi
+ else
+ LC_ALL=en_US.UTF-8
+ fi
+
+ export LC_ALL
+ einfo "Successfully switched to the ${LC_ALL} locale."
+ fi
}
src_unpack() {
diff --git a/app-shells/pwsh/pwsh-7.4.0.ebuild b/app-shells/pwsh/pwsh-7.4.0.ebuild
index 5c170e355644..ff259b5a16d2 100644
--- a/app-shells/pwsh/pwsh-7.4.0.ebuild
+++ b/app-shells/pwsh/pwsh-7.4.0.ebuild
@@ -294,17 +294,21 @@ pkg_setup() {
dotnet-pkg_pkg_setup
if [[ "${MERGE_TYPE}" != binary ]] ; then
- local locales="$(locale -a)"
+ if use elibc_glibc ; then
+ local locales="$(locale -a)"
- if has en_US.utf8 ${locales} ; then
- LC_ALL=en_US.utf8
- elif has en_US.UTF-8 ${locales} ; then
- LC_ALL=en_US.UTF-8
- else
- eerror "The locale en_US.utf8 or en_US.UTF-8 is not available."
- eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}."
+ if has en_US.utf8 ${locales} ; then
+ LC_ALL=en_US.utf8
+ elif has en_US.UTF-8 ${locales} ; then
+ LC_ALL=en_US.UTF-8
+ else
+ eerror "The locale en_US.utf8 or en_US.UTF-8 is not available."
+ eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}."
- die "Could not switch to the en_US.UTF-8 locale."
+ die "Could not switch to the en_US.UTF-8 locale."
+ fi
+ else
+ LC_ALL=en_US.UTF-8
fi
export LC_ALL
next reply other threads:[~2024-01-21 0:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-21 0:44 Maciej Barć [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-04 22:43 [gentoo-commits] repo/gentoo:master commit in: app-shells/pwsh/ Sam James
2025-03-04 22:43 Sam James
2025-03-04 22:43 Sam James
2024-12-06 8:31 Maciej Barć
2024-12-06 8:31 Maciej Barć
2024-12-06 7:49 Sam James
2024-12-05 22:26 Sam James
2024-12-05 22:26 Sam James
2024-10-29 23:22 Maciej Barć
2024-10-22 0:08 Maciej Barć
2024-09-23 10:00 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ć
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=1705797893.0c8b5b9879551e757487e140fd6d4bd7fb13daec.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