diff options
| -rw-r--r-- | libraries/argtable/argtable.SlackBuild | 14 | ||||
| -rw-r--r-- | libraries/argtable/argtable.info | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/libraries/argtable/argtable.SlackBuild b/libraries/argtable/argtable.SlackBuild index 6d2f597fc9..83ac890a67 100644 --- a/libraries/argtable/argtable.SlackBuild +++ b/libraries/argtable/argtable.SlackBuild @@ -36,10 +36,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e # Exit on most errors @@ -47,7 +50,7 @@ set -e # Exit on most errors rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM$SRCVER tar xvf $CWD/$PRGNAM$SRCVER.tar.gz cd $PRGNAM$SRCVER chown -R root:root . @@ -61,6 +64,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ @@ -72,8 +76,10 @@ make make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) ( cd $PKG/usr/man @@ -87,4 +93,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/argtable/argtable.info b/libraries/argtable/argtable.info index edfef2b585..4e35a2e81c 100644 --- a/libraries/argtable/argtable.info +++ b/libraries/argtable/argtable.info @@ -2,7 +2,9 @@ PRGNAM="argtable" VERSION="2.9" HOMEPAGE="http://argtable.sourceforge.net/" DOWNLOAD="http://prdownloads.sourceforge.net/argtable/argtable2-9.tar.gz" +DOWNLOAD_x86_64="" MD5SUM="a7fcddef768db0ae66534ec4c4a51dee" +MD5SUM_x86_64="" MAINTAINER="Rodney Cobb" EMAIL="rdc@ktabic.co.uk" -APPROVED="David Somero" +APPROVED="dsomero" |