Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2024-02-20 13:56:51 +0200
committernl6720 <nl6720@gmail.com>2024-02-20 14:02:10 +0200
commit7dd615ea8301b6554450b0589a7fc3895076839b (patch)
treeec727c92133b378ab333ad5d90d702a38ed20bd5
parent2932a9def38fbe03c3727c6f5ca4f8e888826c78 (diff)
Revert "mkarchiso: unset LANGUAGE"
Starting with glibc 2.39, LC_ALL=C.UTF-8 overrides LANGUAGE, just like LC_ALL=C. See https://sourceware.org/bugzilla/show_bug.cgi?id=16621 for details. This reverts commit 6ac22309530f3aa07a2b638ccde419a3a509f50c.
-rw-r--r--CHANGELOG.rst2
-rwxr-xr-xarchiso/mkarchiso5
2 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 148a9df..493a990 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -22,6 +22,8 @@ Fixed
Removed
-------
+- Remove workaround for glibc < 2.39. ``LC_ALL=C.UTF-8`` now overrides ``LANGUAGE``, just like ``LC_ALL=C``.
+
[75] - 2024-01-24
=================
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 7a2587e..a156687 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -8,11 +8,6 @@ shopt -s extglob
# Control the environment
umask 0022
export LC_ALL="C.UTF-8"
-if [[ -v LANGUAGE ]]; then
- # LC_ALL=C.UTF-8, unlike LC_ALL=C, does not override LANGUAGE.
- # See https://sourceware.org/bugzilla/show_bug.cgi?id=16621 and https://savannah.gnu.org/bugs/?62815
- unset LANGUAGE
-fi
[[ -v SOURCE_DATE_EPOCH ]] || printf -v SOURCE_DATE_EPOCH '%(%s)T' -1
export SOURCE_DATE_EPOCH