diff options
Diffstat (limited to 'source/l/glibc')
| -rw-r--r-- | source/l/glibc/doinst.sh-glibc | 6 | ||||
| -rw-r--r-- | source/l/glibc/doinst.sh-glibc-solibs | 6 | ||||
| -rwxr-xr-x | source/l/glibc/glibc.SlackBuild | 4 |
3 files changed, 1 insertions, 15 deletions
diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc index e2c7d3ef1..2ed07ad03 100644 --- a/source/l/glibc/doinst.sh-glibc +++ b/source/l/glibc/doinst.sh-glibc @@ -121,16 +121,12 @@ rm -f etc/profile.d/glibc.sh.new # time call to ldconfig, which would then take care of any missing links. # In case there's no ldconfig, make the links manually: if [ ! -x /sbin/ldconfig ]; then -( cd lib ; rm -rf libnss_nis.so.2 ) -( cd lib ; ln -sf libnss_nis-@@VERSION@@.so libnss_nis.so.2 ) ( cd lib ; rm -rf libm.so.6 ) ( cd lib ; ln -sf libm-@@VERSION@@.so libm.so.6 ) ( cd lib ; rm -rf libnss_files.so.2 ) ( cd lib ; ln -sf libnss_files-@@VERSION@@.so libnss_files.so.2 ) ( cd lib ; rm -rf libresolv.so.2 ) ( cd lib ; ln -sf libresolv-@@VERSION@@.so libresolv.so.2 ) -( cd lib ; rm -rf libnsl.so.1 ) -( cd lib ; ln -sf libnsl-@@VERSION@@.so libnsl.so.1 ) ( cd lib ; rm -rf libutil.so.1 ) ( cd lib ; ln -sf libutil-@@VERSION@@.so libutil.so.1 ) ( cd lib ; rm -rf libnss_compat.so.2 ) @@ -153,8 +149,6 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; ln -sf libnss_dns-@@VERSION@@.so libnss_dns.so.2 ) ( cd lib ; rm -rf libpthread.so.0 ) ( cd lib ; ln -sf libpthread-@@VERSION@@.so libpthread.so.0 ) -( cd lib ; rm -rf libnss_nisplus.so.2 ) -( cd lib ; ln -sf libnss_nisplus-@@VERSION@@.so libnss_nisplus.so.2 ) ( cd lib ; rm -rf libc.so.6 ) ( cd lib ; ln -sf libc-@@VERSION@@.so libc.so.6 ) ( cd lib ; rm -rf librt.so.1 ) diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs index 3d4466043..d5fea2e5f 100644 --- a/source/l/glibc/doinst.sh-glibc-solibs +++ b/source/l/glibc/doinst.sh-glibc-solibs @@ -119,16 +119,12 @@ rm -f etc/profile.d/glibc.sh.new # we did fall back on this the machine would boot until it reached the boot # time call to ldconfig, which would then take care of any missing links. if [ ! -x /sbin/ldconfig ]; then -( cd lib ; rm -rf libnss_nis.so.2 ) -( cd lib ; ln -sf libnss_nis-@@VERSION@@.so libnss_nis.so.2 ) ( cd lib ; rm -rf libm.so.6 ) ( cd lib ; ln -sf libm-@@VERSION@@.so libm.so.6 ) ( cd lib ; rm -rf libnss_files.so.2 ) ( cd lib ; ln -sf libnss_files-@@VERSION@@.so libnss_files.so.2 ) ( cd lib ; rm -rf libresolv.so.2 ) ( cd lib ; ln -sf libresolv-@@VERSION@@.so libresolv.so.2 ) -( cd lib ; rm -rf libnsl.so.1 ) -( cd lib ; ln -sf libnsl-@@VERSION@@.so libnsl.so.1 ) ( cd lib ; rm -rf libutil.so.1 ) ( cd lib ; ln -sf libutil-@@VERSION@@.so libutil.so.1 ) ( cd lib ; rm -rf libnss_compat.so.2 ) @@ -151,8 +147,6 @@ if [ ! -x /sbin/ldconfig ]; then ( cd lib ; ln -sf libnss_dns-@@VERSION@@.so libnss_dns.so.2 ) ( cd lib ; rm -rf libpthread.so.0 ) ( cd lib ; ln -sf libpthread-@@VERSION@@.so libpthread.so.0 ) -( cd lib ; rm -rf libnss_nisplus.so.2 ) -( cd lib ; ln -sf libnss_nisplus-@@VERSION@@.so libnss_nisplus.so.2 ) ( cd lib ; rm -rf libc.so.6 ) ( cd lib ; ln -sf libc-@@VERSION@@.so libc.so.6 ) ( cd lib ; rm -rf librt.so.1 ) diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index 8074f3d86..34b45173e 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -25,7 +25,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:-1} +BUILD=${BUILD:-2} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -230,8 +230,6 @@ CFLAGS="-g $OPTIMIZ" \ --enable-kernel=2.6.32 \ --with-headers=/usr/include \ --enable-add-ons \ - --enable-obsolete-nsl \ - --enable-obsolete-rpc \ --enable-profile \ $DISABLE_NSCD \ $WERROR \ |