diff options
| -rw-r--r-- | libraries/libebml/libebml.SlackBuild | 16 | ||||
| -rw-r--r-- | libraries/libebml/libebml.info | 2 | ||||
| -rw-r--r-- | libraries/libebml/slack-desc | 2 |
3 files changed, 13 insertions, 7 deletions
diff --git a/libraries/libebml/libebml.SlackBuild b/libraries/libebml/libebml.SlackBuild index e56f4b1de0..fa44118255 100644 --- a/libraries/libebml/libebml.SlackBuild +++ b/libraries/libebml/libebml.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 @@ -48,7 +51,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -59,17 +62,20 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make prefix=/usr sharedlib -C make/linux -make prefix=$PKG/usr install -C make/linux +make prefix=/usr libdir=/usr/lib${LIBDIRSUFFIX} sharedlib -C make/linux +make prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX} install -C make/linux ( 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 ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a ChangeLog LICENSE.LGPL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/libebml/libebml.info b/libraries/libebml/libebml.info index d91d80f67a..295a1385c5 100644 --- a/libraries/libebml/libebml.info +++ b/libraries/libebml/libebml.info @@ -5,4 +5,4 @@ DOWNLOAD="http://dl.matroska.org/downloads/libebml/libebml-0.7.8.tar.bz2" MD5SUM="6278109f52e4f9d2c8a8dfc0d668b587" MAINTAINER="Andrew Strong" EMAIL="andrew.david.45@gmail.com" -APPROVED="David Somero" +APPROVED="dsomero,rworkman" diff --git a/libraries/libebml/slack-desc b/libraries/libebml/slack-desc index 5742f0b8ab..7c73da4430 100644 --- a/libraries/libebml/slack-desc +++ b/libraries/libebml/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler-------------------------------------------------------| -libebml: libebml +libebml: libebml (a C++ library for parsing EBML files) libebml: libebml: libebml is a C++ libary to parse EBML files. EBML (Extensible Binary libebml: Meta-Language library) is a simple XML like binary language for |