diff options
author | Eric Hameleers <alien@slackware.com> | 2009-06-25 19:21:47 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-06-25 19:21:47 +0000 |
commit | 1290d60d94446176f0729c6418770d0024c21ed5 (patch) | |
tree | 47fee3a016fe6cdbe44f4f26c8d69f658cfcec8b /current | |
parent | 3ec91dd9dd300b008a7335cfcd095be53bcebfd4 (diff) | |
download | multilib-1290d60d94446176f0729c6418770d0024c21ed5.tar.gz multilib-1290d60d94446176f0729c6418770d0024c21ed5.tar.xz |
This one is the final script
Diffstat (limited to 'current')
-rwxr-xr-x | current/glibc/glibc-multilib.SlackBuild | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild index bd94b99..4c34455 100755 --- a/current/glibc/glibc-multilib.SlackBuild +++ b/current/glibc/glibc-multilib.SlackBuild @@ -83,6 +83,8 @@ fix_doinst() { if [ "x$LIBDIRSUFFIX" = "x" ]; then return; fi; + + cp -a install/doinst.sh install/doinst32.sh # Fix "( cd usr/lib ;" occurrences sed -i "s#lib ;#lib${LIBDIRSUFFIX} ;#" install/doinst.sh # Fix "lib/" occurrences @@ -93,6 +95,11 @@ fix_doinst() { if [ "$ARCH" = "x86_64" ]; then sed -i 's#ld-linux.so.2#ld-linux-x86-64.so.2#' install/doinst.sh fi + + echo "# Add 32bit library links:" >> install/doinst.sh + cat install/doinst32.sh | grep -e '^( cd lib ' -e '^( cd usr/lib ' \ + >> install/doinst.sh + rm -f install/doinst32.sh } # This is a patch function to put all glibc patches in the build script @@ -327,9 +334,9 @@ chmod 755 $PKG/usr/sbin/timeconfig NEWS NOTES PROJECTS README README.libm \ $PKG/usr/doc/glibc-$VERSION - # Add the SlackBuild: - cat $0 > $PKG/usr/doc/glibc-$VERSION/gcc-static.SlackBuild - chmod 644 $PKG/usr/doc/glibc-$VERSION/gcc-static.SlackBuild + # Add the SlackBuild: + cat $0 > $PKG/usr/doc/glibc-$VERSION/glibc-multilib.SlackBuild + chmod 644 $PKG/usr/doc/glibc-$VERSION/glibc-multilib.SlackBuild ) # Don't forget to add the /usr/share/zoneinfo/localtime -> /etc/localtime symlink! :) |