summaryrefslogtreecommitdiff
path: root/source/l/glibc
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-02-01 01:26:44 +0000
committerEric Hameleers <alien@slackware.com>2019-02-01 08:59:45 +0100
commite38fab7e3aaf1ad00516bde42341708ace603227 (patch)
tree77c27c38e6239198f858a30d8fc805ee546c6b3b /source/l/glibc
parente252bed9bc920e449204d39894e5bb036b516c94 (diff)
downloadcurrent-e38fab7e3aaf1ad00516bde42341708ace603227.tar.gz
Fri 01 Feb 2019 01:26:44 AM UTC20190201012644
a/glibc-solibs-2.29-x86_64-1.txz: Upgraded. a/kernel-generic-4.19.19-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.19-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.19-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.19-x86-1.txz: Upgraded. d/ninja-1.9.0-x86_64-1.txz: Upgraded. d/ruby-2.6.1-x86_64-1.txz: Upgraded. k/kernel-source-4.19.19-noarch-1.txz: Upgraded. l/glibc-2.29-x86_64-1.txz: Upgraded. l/glibc-i18n-2.29-x86_64-1.txz: Upgraded. l/glibc-profile-2.29-x86_64-1.txz: Upgraded. l/harfbuzz-2.3.1-x86_64-1.txz: Upgraded. l/libimobiledevice-20190126_d200973-x86_64-1.txz: Upgraded. Switch to git since the latest release no longer works. l/libusbmuxd-20190118_c75605d-x86_64-1.txz: Upgraded. Switch to git since the latest release no longer works. l/mpfr-4.0.2-x86_64-1.txz: Upgraded. x/mesa-18.3.3-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/glibc')
-rwxr-xr-xsource/l/glibc/glibc.SlackBuild7
-rw-r--r--source/l/glibc/glibc.locale.no-archive.diff10
2 files changed, 2 insertions, 15 deletions
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index 33b4c602..c9976d6e 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc
VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -148,9 +148,6 @@ 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:
@@ -245,7 +242,7 @@ CFLAGS="-g $OPTIMIZ" \
make $NUMJOBS || make || exit 1
make install install_root=$PKG || exit 1
-make localedata/install-locales install_root=$PKG || exit 1
+make localedata/install-locale-files DESTDIR=$PKG || exit 1
# We've always had an sln symlink in /bin, so let's make sure it
# remains there so as not to break any scripts that might need it:
diff --git a/source/l/glibc/glibc.locale.no-archive.diff b/source/l/glibc/glibc.locale.no-archive.diff
deleted file mode 100644
index 4b2828ba..00000000
--- a/source/l/glibc/glibc.locale.no-archive.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./localedata/Makefile.orig 2018-02-04 23:06:03.700212576 -0600
-+++ ./localedata/Makefile 2018-02-04 23:07:10.102218076 -0600
-@@ -223,6 +223,7 @@
- echo -n '...'; \
- input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
-+ --no-archive \
- -i locales/$$input -f charmaps/$$charset \
- $(addprefix --prefix=,$(install_root)) $$locale \
- && echo ' done'; \