diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2018-01-21 22:55:14 +0000 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2018-01-21 23:26:04 +0000 |
| commit | fc222778c6aa5d450f10999af390fdcae46f4d07 (patch) | |
| tree | 6f3c20848c3e5ecde926ec5d778431fc7ee3a46a | |
| parent | 9fd54788e4b166b6a565d5adae54df7a9f6b1892 (diff) | |
| download | slackbuilds-fc222778c6aa5d450f10999af390fdcae46f4d07.tar.gz | |
system/spl-solaris: Fixed VERSION + fix for exported ARCH.
On 32 bit this changes -smp to _smp, and hides 'i686' from
the build.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | system/spl-solaris/spl-solaris.SlackBuild | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/spl-solaris/spl-solaris.SlackBuild b/system/spl-solaris/spl-solaris.SlackBuild index c3d867b099..27cc533106 100644 --- a/system/spl-solaris/spl-solaris.SlackBuild +++ b/system/spl-solaris/spl-solaris.SlackBuild @@ -33,6 +33,7 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERN=${KERN:-"$(uname -r)"} +PKGVER="$(printf %s "${VERSION}_${KERN}" | tr - _)" if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -76,6 +77,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +env -u ARCH \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -89,8 +91,8 @@ CFLAGS="$SLKCFLAGS" \ --with-linux-obj="/lib/modules/${KERN}/source" \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +env -u ARCH make +env -u ARCH make install DESTDIR=$PKG 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 @@ -104,4 +106,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${KERN}-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |