summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Andrew Clemons <andrew.clemons@gmail.com>2018-02-18 14:29:48 +1300
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2018-03-03 08:42:10 +0700
commit0e374c65ec3de9bd5ac9a652664724a284214105 (patch)
tree808a42301f5e2740a8c885f488ab048f890efcc9
parente8c749fb680e50715077cc29bcfbf80c5df95cbf (diff)
downloadslackbuilds-0e374c65ec3de9bd5ac9a652664724a284214105.tar.gz
slackbuilds-0e374c65ec3de9bd5ac9a652664724a284214105.tar.xz
system/exa: Fix building on -current.
Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
-rw-r--r--system/exa/exa.SlackBuild10
1 files changed, 8 insertions, 2 deletions
diff --git a/system/exa/exa.SlackBuild b/system/exa/exa.SlackBuild
index 56fdabd4ce..6deb91fb9f 100644
--- a/system/exa/exa.SlackBuild
+++ b/system/exa/exa.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=exa
VERSION=${VERSION:-0.8.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -33,6 +33,12 @@ if [ -z "$ARCH" ]; then
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
+
+ if [ "$ARCH" = "i586" ]; then
+ if rustc -Vv | grep host | grep i686 > /dev/null ; then
+ ARCH=i686
+ fi
+ fi
fi
CWD=$(pwd)
@@ -177,7 +183,7 @@ sed -i 's,share/man,man,' Makefile
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-cargo build --release --no-default-features --features default
+cargo build --release --no-default-features --features default $CARGOTARGET
find target -name exa -exec install -m 755 {} $PKG/usr/bin/exa \;
make install-man install-bash-completions install-zsh-completions DESTDIR=$PKG PREFIX=/usr BASHDIR=/usr/share/bash-completion/completions