commit c306df46ddf4ae75f1e73d934e18dad3894f249c Author: Tim Biermann <tbier@posteo.de> Date: Mon Feb 14 17:57:13 2022 +0100 glibc: C.UTF-8: use inputfile and charmap out of directly diff --git a/glibc/.signature b/glibc/.signature index 7bb7b486..6460acae 100644 --- a/glibc/.signature +++ b/glibc/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqo/w69YhoGHQ49LeTbxiBb+qTSk5Utycnk6T5DUF013/aXwDDu34kPeVAB6yiKj+pgvyEi00hcpnbZFZNe9wcwc= -SHA256 (Pkgfile) = 5aa5ce5aafe89f530f8c2205e18d0476c4cdb031c0f7a603299e24b0d7b701f3 +RWRJc1FUaeVeqnBMHCZxuweltMHBlz2YM3otg0kj8P9vsE+H77YnsYR+WVa7uZO/oWxYPXW4VcSQ90ej09Z/IF6pYye5k7IhSQ8= +SHA256 (Pkgfile) = 3c43bdc0b27f779dafed89822620f4ccbec588d67a5108b37c2c3c08b3f42361 SHA256 (.footprint) = 18acf8b44f896a471a6aa3dbae84067f21e7cd650f5489ca26fa6026441d9aa2 SHA256 (glibc-2.35.tar.xz) = 5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e SHA256 (linux-5.15.21.tar.xz) = 294eeb6cd7dc9b144c3c3c8b8c7b3fca9c6b072b6ed9bf9d6c922f9deb70fbd1 diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 8a279bc4..59793b68 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -53,12 +53,10 @@ build() { install -Dm755 $SRC/locale-gen $PKG/usr/sbin/locale-gen install -Dm644 $SRC/locale.gen.in $PKG/etc/locale.gen - cp $PKG/usr/share/i18n/charmaps/UTF-8.gz . - gzip -d UTF-8.gz LC_ALL=C ./elf/ld.so --library-path . $PKG/usr/bin/localedef \ --force --quiet \ - --inputfile=$PKG/usr/share/i18n/locales/C \ - --charmap=./UTF-8 \ + --inputfile=$SRC/$name-$version/localedata/locales/C \ + --charmap=$SRC/$name-$version/localedata/charmaps/UTF-8 \ $PKG/usr/lib/locale/C.UTF-8 || true rm -r $PKG/usr/share/locale \