summaryrefslogtreecommitdiffstats
path: root/source/14.2
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-07-17 18:33:46 +0000
committer Eric Hameleers <alien@slackware.com>2017-07-17 18:33:46 +0000
commit9a23ccfc58d4e6877f899b726b73fa8a0ea6ea56 (patch)
tree7a3a4be59dd538cb4103f35b6406c0395b593e31 /source/14.2
parentd480cb311ee5105afe8fc6d7b247ba12e602d247 (diff)
downloadmultilib-9a23ccfc58d4e6877f899b726b73fa8a0ea6ea56.tar.gz
multilib-9a23ccfc58d4e6877f899b726b73fa8a0ea6ea56.tar.xz
Recompiled with upstream patch from git:
"[PATCH] X86: Don't assert on older Intel CPUs [BZ #20647]"
Diffstat (limited to 'source/14.2')
-rwxr-xr-xsource/14.2/glibc/glibc-multilib.SlackBuild5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/14.2/glibc/glibc-multilib.SlackBuild b/source/14.2/glibc/glibc-multilib.SlackBuild
index e5ba6e5..46a457d 100755
--- a/source/14.2/glibc/glibc-multilib.SlackBuild
+++ b/source/14.2/glibc/glibc-multilib.SlackBuild
@@ -30,7 +30,7 @@
VERSION=${VERSION:-2.23}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2alien}
+BUILD=${BUILD:-3alien}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -175,6 +175,9 @@ apply_patches() {
zcat $CWD/glibc.CVE-2017-1000366.3c7cd212.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/glibc.adc7e06f.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/glibc.c69d4a0f.diff.gz | patch -p1 --verbose || exit 1
+ # Don't assert on older Intel CPUs.
+ # This fixes an ldconfig failure on Pentium MMX.
+ zcat $CWD/glibc.6a824767.dont.assert.on.older.intel.cpus.diff.gz | patch -p1 --verbose || exit 1
if [ $BOOTSTRP -eq 1 ] ; then
# Multilib - Disable check for forced unwind (Patch from eglibc) since we
# do not have a multilib glibc yet to link to;