diff options
Diffstat (limited to '14.2')
-rwxr-xr-x | 14.2/glibc/glibc-multilib.SlackBuild | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/14.2/glibc/glibc-multilib.SlackBuild b/14.2/glibc/glibc-multilib.SlackBuild index 9e32070..7fde5f5 100755 --- a/14.2/glibc/glibc-multilib.SlackBuild +++ b/14.2/glibc/glibc-multilib.SlackBuild @@ -28,9 +28,9 @@ # by Eric Hameleers <alien@slackware.com> -VERSION=${VERSION:-2.24} +VERSION=${VERSION:-2.23} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-2alien} +BUILD=${BUILD:-1alien} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -160,6 +160,8 @@ apply_patches() { zcat $CWD/is_IS.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 + # Fix resolver problem with glibc-2.9: + zcat $CWD/glibc-2.10-dns-no-gethostbyname4.diff.gz | patch -p0 --verbose || exit 1 # This reverts a patch that was made to glibc to fix "namespace leakage", # which seems to cause some build failures (e.g. with conntrack): zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 -l --verbose || exit 1 @@ -493,17 +495,6 @@ chown -R root:root etc chmod 755 etc/profile.d/* # Ditch links (these are in doinst.sh-glibc): find . -type l -exec rm {} \; -# libm.so is *not* a linker script on all $ARCH. -# If it's missing now, replace the symlink: -if [ ! -r usr/lib${LIBDIRSUFFIX}/libm.so ]; then - ( cd usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libm.so.6 libm.so ) -fi -if [ "x$LIBDIRSUFFIX" = "x64" ]; then - # Same exercise for lib: - if [ ! -r usr/lib/libm.so ]; then - ( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so ) - fi -fi mkdir install cat $CWD/slack-desc.glibc > install/slack-desc cat $CWD/doinst.sh-glibc > install/doinst.sh |