From c7651a7596340059fd9d5f6f8fb63ddd7dd92e5e Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 12 Oct 2023 08:41:59 +0200 Subject: core/glibc: removed locale patch for now, breaks --- core/glibc/PKGBUILD | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'core/glibc') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 91283be1..63391bbd 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -102,31 +102,33 @@ eval "$( ' )" +# TODO: redo if we get again hen-and-egg-problems + # have to rebuild twice because generate localdef called in build uses wrong # ABI resulting in: # "locale/localedef: /usr/lib/libc.so.6: version `GLIBC_ABI_DT_RELR' not found (required by locale/localedef" # do not regenerate it and install the one from the chroot -eval "$( - declare -f build | \ - sed ' - /localedef/d - ' -)" -eval "$( - declare -f package_glibc | \ - sed ' - s|"${srcdir}"/C.UTF-8|/usr/lib/locale/C.UTF-8|g - ' -)" +#eval "$( +# declare -f build | \ +# sed ' +# /localedef/d +# ' +#)" +#eval "$( +# declare -f package_glibc | \ +# sed ' +# s|"${srcdir}"/C.UTF-8|/usr/lib/locale/C.UTF-8|g +# ' +#)" # readd locale generation removed by lib32 sed-fu above in build! # breaks again on glibc library mismatches -eval "$( - declare -f build | \ - sed ' - $ i locale/localedef -c -f ../glibc/localedata/charmaps/UTF-8 -i ../glibc/localedata/locales/C ../C.UTF-8/ - ' -)" +#eval "$( +# declare -f build | \ +# sed ' +# $ i locale/localedef -c -f ../glibc/localedata/charmaps/UTF-8 -i ../glibc/localedata/locales/C ../C.UTF-8/ +# ' +#)" # ignoring tests for now (they hang, checked manually, see skip_tests above) unset check -- cgit v1.2.3-54-g00ecf