From a3b94d71a5f92e8934a0bb37a12343aeb57c85b4 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Mon, 20 Mar 2017 05:32:19 -0400 Subject: libraries/libg3d: Remove template comments, i486=>i586. Signed-off-by: B. Watson Signed-off-by: David Spencer --- libraries/libg3d/libg3d.SlackBuild | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/libg3d/libg3d.SlackBuild b/libraries/libg3d/libg3d.SlackBuild index 9e45e13560..56537751fe 100644 --- a/libraries/libg3d/libg3d.SlackBuild +++ b/libraries/libg3d/libg3d.SlackBuild @@ -29,7 +29,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -81,25 +81,20 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-static=yes \ --enable-gtk-doc=yes -# Compile the application and install it into the $PKG directory make make install DESTDIR=$PKG -# Strip binaries and libraries - this can be done with 'make install-strip' find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -# Copy program documentation into the package mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Copy the slack-desc (and a custom doinst.sh if necessary) into ./install mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -# Make the package cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} -- cgit v1.2.3