diff options
| author | Brenton Earl <brent@exitstatusone.com> | 2016-12-16 23:53:00 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-12-17 01:18:34 +0700 |
| commit | 343a5985432ddf620024693e2814c42bb633b925 (patch) | |
| tree | 82f2c399381718fa15846043788ac4e6d3ae35b8 /network/amap/amap.SlackBuild | |
| parent | 65348558ef37deedab5c8d16844390ed16185063 (diff) | |
| download | slackbuilds-343a5985432ddf620024693e2814c42bb633b925.tar.gz | |
network/amap: Update script.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network/amap/amap.SlackBuild')
| -rw-r--r-- | network/amap/amap.SlackBuild | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/network/amap/amap.SlackBuild b/network/amap/amap.SlackBuild index 6fa6867839..89746776f4 100644 --- a/network/amap/amap.SlackBuild +++ b/network/amap/amap.SlackBuild @@ -30,7 +30,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 @@ -43,11 +43,14 @@ OUTPUT=${OUTPUT:-/tmp} DOCS="LICENCE.AMAP LICENSE.GNU README" -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" @@ -64,10 +67,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$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 {} \; # Add DESTDIR support and fix up a few other things patch -p1 --verbose < $CWD/slackware$LIBDIRSUFFIX.diff @@ -77,13 +80,11 @@ patch -p1 --verbose < $CWD/slackware$LIBDIRSUFFIX.diff 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 -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION @@ -94,4 +95,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - |