diff options
author | Eric Hameleers <alien@slackware.com> | 2016-08-24 10:08:21 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2016-08-24 10:08:21 +0000 |
commit | b8a7c99e63da2681d5a85a4f6899a5eae213f5cd (patch) | |
tree | b2df52ab6fb492559aa2a9afa950ccd3aebab3e4 /14.2 | |
parent | ab333a47acd3a51185e815d64cacaa924ff77f90 (diff) | |
download | multilib-b8a7c99e63da2681d5a85a4f6899a5eae213f5cd.tar.gz multilib-b8a7c99e63da2681d5a85a4f6899a5eae213f5cd.tar.xz |
glibc: rebuilt to fix the libm.so file which is a linker script on x64.
Diffstat (limited to '14.2')
-rwxr-xr-x | 14.2/glibc/glibc-multilib.SlackBuild | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/14.2/glibc/glibc-multilib.SlackBuild b/14.2/glibc/glibc-multilib.SlackBuild index deb5169..9e32070 100755 --- a/14.2/glibc/glibc-multilib.SlackBuild +++ b/14.2/glibc/glibc-multilib.SlackBuild @@ -30,7 +30,7 @@ VERSION=${VERSION:-2.24} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-1alien} +BUILD=${BUILD:-2alien} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -493,6 +493,17 @@ 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 |