diff options
author | Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2018-11-12 17:02:35 -0800 |
---|---|---|
committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-11-17 18:42:56 +0700 |
commit | 05293f48dc3d6d933ee8a36c08f809ba11cdc302 (patch) | |
tree | c5a8ba2c1f582a60859d512f791ce6aea21cde06 | |
parent | 7a70fa304b2c3178f38a521dd2337caeecc9c88f (diff) | |
download | slackbuilds-05293f48dc3d6d933ee8a36c08f809ba11cdc302.tar.gz |
gis/laszip: Script clean up.
-rw-r--r-- | gis/laszip/laszip.SlackBuild | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gis/laszip/laszip.SlackBuild b/gis/laszip/laszip.SlackBuild index 4895a76255..49adcb800e 100644 --- a/gis/laszip/laszip.SlackBuild +++ b/gis/laszip/laszip.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for laszip -# Copyright 2013 Benjamin Trigona-Harany +# Copyright 2013-2018 Benjamin Trigona-Harany # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -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" @@ -64,10 +64,10 @@ tar xvf $CWD/$PRGNAM-src-$VERSION.tar.gz cd $PRGNAM-src-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -81,11 +81,13 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install |