diff options
| -rw-r--r-- | libraries/barry/barry.SlackBuild | 13 | ||||
| -rw-r--r-- | libraries/barry/barry.info | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild index 451e985cc0..cc9fa1a78b 100644 --- a/libraries/barry/barry.SlackBuild +++ b/libraries/barry/barry.SlackBuild @@ -40,12 +40,16 @@ fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2" + LIBDIRSUFFIX="64" fi rm -rf $PKG @@ -61,6 +65,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --disable-static \ --${opensync_opt}able-opensync-plugin \ @@ -70,8 +75,10 @@ make || exit 1 make install DESTDIR=$PKG || exit 1 ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - 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 + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null ) ( cd $PKG/usr/man @@ -100,4 +107,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/barry/barry.info b/libraries/barry/barry.info index d7e317f798..b00c15352d 100644 --- a/libraries/barry/barry.info +++ b/libraries/barry/barry.info @@ -2,7 +2,9 @@ PRGNAM="barry" VERSION="0.14" HOMEPAGE="http://sourceforge.net/projects/barry/" DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.14.tar.bz2" +DOWNLOAD_x86_64="" MD5SUM="8c93abd0011568b540b799d1faa9a625" +MD5SUM_x86_64="" MAINTAINER="Vincent Batts" EMAIL="vbatts@hashbangbash.com" -APPROVED="David Somero" +APPROVED="dsomero" |