summaryrefslogtreecommitdiffstats
path: root/14.1
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-02-09 22:40:56 +0000
committer Eric Hameleers <alien@slackware.com>2011-02-09 22:40:56 +0000
commit97617b75087fb23cb2ce7c6a9aaf0c2c157bc6de (patch)
tree19c2db52dd39a12299b951c086a21dee93f0070b /14.1
parentac14215f691432b55d7d43eab736ac42c705b654 (diff)
downloadmultilib-97617b75087fb23cb2ce7c6a9aaf0c2c157bc6de.tar.gz
multilib-97617b75087fb23cb2ce7c6a9aaf0c2c157bc6de.tar.xz
Update to 2.13, also avoid the Intel optimized asm routines for now because they break the flash player.
Diffstat (limited to '14.1')
-rwxr-xr-x14.1/glibc/glibc-multilib.SlackBuild6
1 files changed, 5 insertions, 1 deletions
diff --git a/14.1/glibc/glibc-multilib.SlackBuild b/14.1/glibc/glibc-multilib.SlackBuild
index 0ecee22..b9ddabd 100755
--- a/14.1/glibc/glibc-multilib.SlackBuild
+++ b/14.1/glibc/glibc-multilib.SlackBuild
@@ -28,7 +28,7 @@
# by Eric Hameleers <alien@slackware.com>
-VERSION=${VERSION:-2.12.2}
+VERSION=${VERSION:-2.13}
CHECKOUT=${CHECKOUT:-""}
BUILD=${BUILD:-1alien}
@@ -184,6 +184,10 @@ apply_patches() {
# The also patch needs work before it would apply.
# ***NOT READY***
#zcat $CWD/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz | patch -p1 --verbose || exit 1
+ #
+ # Avoid the Intel optimized asm routines for now because they break
+ # the flash player. We'll phase this in when it's safer to do so.
+ zcat $CWD/glibc.disable.broken.optimized.memcpy.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;