diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2018-01-21 22:55:35 +0000 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2018-01-21 23:26:37 +0000 |
| commit | 92b23d9960d52b57c21a0953466e2bd796ba952b (patch) | |
| tree | c1f5aa9c75d6cda9a77b3e621f431a2139c5ece3 | |
| parent | fc222778c6aa5d450f10999af390fdcae46f4d07 (diff) | |
| download | slackbuilds-92b23d9960d52b57c21a0953466e2bd796ba952b.tar.gz | |
system/zfs-on-linux: 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/zfs-on-linux/zfs-on-linux.SlackBuild | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/system/zfs-on-linux/zfs-on-linux.SlackBuild b/system/zfs-on-linux/zfs-on-linux.SlackBuild index c6ec1a908c..bab3c27881 100644 --- a/system/zfs-on-linux/zfs-on-linux.SlackBuild +++ b/system/zfs-on-linux/zfs-on-linux.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 \ @@ -93,8 +95,8 @@ CFLAGS="$SLKCFLAGS" \ --enable-static=no \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +env -u ARCH make +env -u ARCH make install DESTDIR=$PKG # no such thing here rm -fr $PKG/usr/lib/dracut @@ -120,4 +122,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} |