Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Baumann <mail@andreasbaumann.cc>2023-10-12 08:41:59 +0200
committerAndreas Baumann <mail@andreasbaumann.cc>2023-10-12 08:41:59 +0200
commitc7651a7596340059fd9d5f6f8fb63ddd7dd92e5e (patch)
tree5ca2db9d1c9b8500c7c0ffaa32b990a2633e22d8
parentb721e73387f9daad6844cc84e46396411b77bdfd (diff)
core/glibc: removed locale patch for now, breaks
-rw-r--r--core/glibc/PKGBUILD38
1 files changed, 20 insertions, 18 deletions
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