From 0e374c65ec3de9bd5ac9a652664724a284214105 Mon Sep 17 00:00:00 2001 From: Andrew Clemons Date: Sun, 18 Feb 2018 14:29:48 +1300 Subject: system/exa: Fix building on -current. Signed-off-by: Andrew Clemons --- system/exa/exa.SlackBuild | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'system') 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 -- cgit v1.2.3