summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2019-02-17 11:10:10 +0000
committer Eric Hameleers <alien@slackware.com>2019-02-17 11:10:10 +0000
commit434812d0a4b5d48a1d0434df4156253007a417d0 (patch)
tree3c927e3fbe25a8f560784e1eeeadd5ce8d89c750
parentc8c49071b855e98128eaa0dd0690f78cc6b5cb08 (diff)
downloadmultilib-434812d0a4b5d48a1d0434df4156253007a417d0.tar.gz
multilib-434812d0a4b5d48a1d0434df4156253007a417d0.tar.xz
glibc-multilib: Go back to using the glibc.locale.no-archive.diff patch rather than the new built-in no-archive locale target. Avoiding hardlinks is not worth 700MB of useless bloat.
-rwxr-xr-xsource/current/glibc/glibc-multilib.SlackBuild9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/current/glibc/glibc-multilib.SlackBuild b/source/current/glibc/glibc-multilib.SlackBuild
index 42080f9..4b42360 100755
--- a/source/current/glibc/glibc-multilib.SlackBuild
+++ b/source/current/glibc/glibc-multilib.SlackBuild
@@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc
VERSION=${VERSION:-2.29}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2alien}
+BUILD=${BUILD:-3alien}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -162,6 +162,9 @@ fix_doinst() {
# This is a patch function to put all glibc patches in the build script
# up near the top.
apply_patches() {
+ # Use old-style locale directories rather than a single (and strangely
+ # formatted) /usr/lib/locale/locale-archive file:
+ zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1
# Support ru_RU.CP1251 locale:
zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
# Add a C.UTF-8 locale:
@@ -267,7 +270,9 @@ build_glibc() {
make $NUMJOBS || exit 1
make install install_root=$PKG || exit 1
- make localedata/install-locale-files DESTDIR=$PKG || exit 1
+ # Don't use this, as it makes the i18n package WAY bigger:
+ #make localedata/install-locale-files DESTDIR=$PKG || exit 1
+ make localedata/install-locales install_root=$PKG DESTDIR=$PKG || exit 1
}
# Build the 32-bit binaries first,