summaryrefslogtreecommitdiffstats
path: root/current
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-08-21 22:54:18 +0000
committer Eric Hameleers <alien@slackware.com>2015-08-21 22:54:18 +0000
commit8c4a7923fde33b73158a3cf0499b4fe82106adb3 (patch)
treec496bfe49b62f719758a44fe84991d11f1a43f9e /current
parent6f2cc4721bdc4c9d0c6e8c9528437ed4720981a5 (diff)
downloadmultilib-8c4a7923fde33b73158a3cf0499b4fe82106adb3.tar.gz
multilib-8c4a7923fde33b73158a3cf0499b4fe82106adb3.tar.xz
glibc-multilib: updated to 2.22. MOst other changes to the script are for 32-bit (re-basing to the official SlackBuild script) and the kernel compatibility was again set to 2.6.32 and higher.
Diffstat (limited to 'current')
-rwxr-xr-xcurrent/glibc/glibc-multilib.SlackBuild21
1 files changed, 10 insertions, 11 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index e17cffe..b50215a 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -28,9 +28,9 @@
# by Eric Hameleers <alien@slackware.com>
-VERSION=${VERSION:-2.21}
+VERSION=${VERSION:-2.22}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2alien}
+BUILD=${BUILD:-1alien}
## Included in glibc now:
## glibc-libidn version
@@ -39,12 +39,11 @@ BUILD=${BUILD:-2alien}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
-# $ARCH may be preset, otherwise i486 compatibility with i686 binary
-# structuring is the Slackware default, since this is what gcc-3.2+
-# requires for binary compatibility with previous releases.
+# $ARCH may be preset, otherwise i586 compatibility with i686 binary
+# structuring is the Slackware default.
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
@@ -62,7 +61,7 @@ case $ARCH in
LIBDIRSUFFIX=""
;;
i586)
- OPTIMIZ="-O3 -march=i586"
+ OPTIMIZ="-O3 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
;;
i686)
@@ -92,9 +91,9 @@ case $ARCH in
TARGET=${TARGET:-x86_64}
TARGET32=${TARGET32:-i486}
;;
- i486)
- # This should be i486 for all 32-bit x86 arch:
- TARGET=${TARGET:-i486}
+ i586)
+ # This should be i586 for all 32-bit x86 arch:
+ TARGET=${TARGET:-i586}
;;
esac
@@ -267,7 +266,7 @@ build_glibc() {
../configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --enable-kernel=3.2.29 \
+ --enable-kernel=2.6.32 \
--with-headers=/usr/include \
--enable-add-ons \
--enable-obsolete-rpc \