diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-07-26 12:22:27 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-07-26 12:22:27 +0000 |
| commit | 4c7b585fc650e13828cd8138400ca34e3e29a349 (patch) | |
| tree | 1f04161b2ed10205b8cc58b0630860ea421fe3b6 /compat32-tools | |
| parent | 687e519e601e25aab6c8519725b9033f42b83673 (diff) | |
| download | multilib-4c7b585fc650e13828cd8138400ca34e3e29a349.tar.gz multilib-4c7b585fc650e13828cd8138400ca34e3e29a349.tar.xz | |
Fix the handling of cxxlibs which changed with Slackware 14
Diffstat (limited to 'compat32-tools')
| -rwxr-xr-x | compat32-tools/convertpkg-compat32 | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/compat32-tools/convertpkg-compat32 b/compat32-tools/convertpkg-compat32 index 70a08cb..d38d1ec 100755 --- a/compat32-tools/convertpkg-compat32 +++ b/compat32-tools/convertpkg-compat32 @@ -3,7 +3,7 @@ # $Id$ # Copyright (c) 2009 Frederick Emmott <fred@slackware.com> -# Copyright (c) 2009, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright (c) 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL # # Permission to use, copy, modify, and/or distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -164,6 +164,15 @@ cd $PKG || exit 1 # remove for the -compat32 package. /sbin/explodepkg $PKGPATH +# Check if the user fed us a 64bit package: +if [ -d usr/lib64 -o -d lib64 ]; then + echo "** This script converts 32bit packages for Slackware64 multilib!" + echo "** It looks like you gave me a 64bit package instead." + echo "** Are you certain you want to convert the package $(basename $PKGPATH) ?" + echo "** Press [Ctrl]-[C] now if you want to abort the script." + read JUNK +fi + # # Take special care of gtk+2 , gdk-pixbuf2 and pango when stripping things! # @@ -229,15 +238,18 @@ elif [ -f install/doinst.sh ]; then fi # The cxxlibs need some extra consideration because the libraries in -# /usr/i486-slackware-linux/lib will not be found by Slackware64: +# /usr/i486-slackware-linux/lib will not be found by Slackware64. +# Note that as of Slackware 14, "usr/i486-slackware-linux" is gone: if [ "$PKGNAM" = "cxxlibs" ]; then - mkdir -p usr/lib # just in case - for OLIB in $(find usr/i486-slackware-linux/lib -type f -maxdepth 1) ; do - cp -a $OLIB usr/lib/ - done - cat install/doinst.sh | grep '/i486-slackware-linux' > install/doinst.sh.2 - cat install/doinst.sh.2 | sed -e 's#/i486-slackware-linux##g' >> install/doinst.sh - rm -f install/doinst.sh.2 + if [ -e usr/i486-slackware-linux ] ; then + mkdir -p usr/lib # just in case + for OLIB in $(find usr/i486-slackware-linux/lib -type f -maxdepth 1) ; do + cp -a $OLIB usr/lib/ + done + cat install/doinst.sh | grep '/i486-slackware-linux' > install/doinst.sh.2 + cat install/doinst.sh.2 | sed -e 's#/i486-slackware-linux##g' >> install/doinst.sh + rm -f install/doinst.sh.2 + fi fi # The qt package installs several symlinks to /usr/bin which point to |