diff options
Diffstat (limited to 'source/l/keyutils/keyutils.SlackBuild')
| -rwxr-xr-x | source/l/keyutils/keyutils.SlackBuild | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/source/l/keyutils/keyutils.SlackBuild b/source/l/keyutils/keyutils.SlackBuild index 969b53cd3..0b7641bbb 100755 --- a/source/l/keyutils/keyutils.SlackBuild +++ b/source/l/keyutils/keyutils.SlackBuild @@ -28,8 +28,8 @@ BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac @@ -38,13 +38,7 @@ fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-O2 -march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -84,8 +78,10 @@ find . \ -exec chmod 644 {} \; # Build and install: -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +#make $NUMJOBS || make || exit 1 +#make install DESTDIR=$PKG || exit 1 +make LIBDIR=/lib${LIBDIRSUFFIX} USRLIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man $NUMJOBS || make || exit 1 +make install LIBDIR=/lib${LIBDIRSUFFIX} USRLIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man DESTDIR=$PKG || exit 1 # Strip binaries: ( cd $PKG |