diff options
Diffstat (limited to 'system/fd/fd.SlackBuild')
| -rw-r--r-- | system/fd/fd.SlackBuild | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/system/fd/fd.SlackBuild b/system/fd/fd.SlackBuild index 9b794f2694..adcc35d544 100644 --- a/system/fd/fd.SlackBuild +++ b/system/fd/fd.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for fd # Copyright 2017-2022 Andrew Clemons, Wellington New Zealand -# Copyright 2022 Andrew Clemons, Tokyo, Japan +# Copyright 2022-2023 Andrew Clemons, Tokyo, Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=fd -VERSION=${VERSION:-8.4.0} +VERSION=${VERSION:-9.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,15 +57,15 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" - CARGOTARGET="--target i586-unknown-linux-gnu" + CARGOTARGET="--target $ARCH-unknown-linux-gnu" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - CARGOTARGET="--target i686-unknown-linux-gnu" -elif [ "$ARCH" = "x86_64" ]; then + CARGOTARGET="--target $ARCH-unknown-linux-gnu" +elif [ "$ARCH" = "x86_64" ] || [ "$ARCH" = "aarch64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - CARGOTARGET="--target x86_64-unknown-linux-gnu" + CARGOTARGET="--target $ARCH-unknown-linux-gnu" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -83,7 +83,7 @@ cd $PRGNAM-$VERSION # build offline # configuration tells cargo to use the configured directory -# for dependencies intead of downloading from crates.io +# for dependencies instead of downloading from crates.io mkdir .cargo cat << EOF >> .cargo/config [source.crates-io] @@ -138,10 +138,17 @@ 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 {} \; +export PATH="/opt/rust16/bin:$PATH" +if [ -z "$LD_LIBRARY_PATH" ]; then + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" +else + export LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH" +fi + CARGO_HOME=.cargo \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -cargo build --release $CARGOTARGET +cargo build --offline --release $CARGOTARGET mkdir -p $PKG/usr/bin/ |