diff options
Diffstat (limited to 'network/newsboat/newsboat.SlackBuild')
| -rw-r--r-- | network/newsboat/newsboat.SlackBuild | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/network/newsboat/newsboat.SlackBuild b/network/newsboat/newsboat.SlackBuild index e7a9a2aa3a..5a66aba35e 100644 --- a/network/newsboat/newsboat.SlackBuild +++ b/network/newsboat/newsboat.SlackBuild @@ -4,6 +4,7 @@ # Copyright 2017-2018 Benjamin Trigona-Harany <slackbuilds@jaxartes.net> # Copyright 2019-2022 Andrew Clemons, Wellington New Zealand +# Copyright 2022-2023 Andrew Clemons, Tokyo Japan # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=newsboat -VERSION=${VERSION:-2.27} +VERSION=${VERSION:-2.34} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -57,15 +58,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 +84,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] @@ -99,11 +100,19 @@ mkdir vendor ( cd vendor - grep -h -A 3 "\[\[package\]\]" $(find ../ -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ - sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ - awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4 }' | sed 's/"//g;s/name=//;s/ version=/=/' | \ - grep crates\.io-index | sed 's/ source=.*$//' | sort -u | while read -r dep ; do - + grep -h -A 4 "\[\[package\]\]" \ + $(find "../" -maxdepth 1 -mindepth 1 -name Cargo.lock | tr '\n' ' ') | \ + sed 's/[[:space:]]*=[[:space:]]*/=/g;s/^--//;s/^\[\[/--\n[[/' | \ + awk 'BEGIN { RS = "--\n" ; FS="\n" } { print $2, $3, $4, $5 }' | \ + sed 's/"//g;s/name=//;s/ version=/=/' | \ + grep " source=" | \ + sed 's/ dependencies=.*$//' | \ + sed 's/ source=[^ ]*//' | \ + sed 's/ checksum=/=/' | \ + sort -u | \ + while read -r dep ; do + + cksum="$(printf "%s\n" "$dep" | cut -d= -f3)" ver="$(printf "%s\n" "$dep" | cut -d= -f2)" dep="$(printf "%s\n" "$dep" | cut -d= -f1)" @@ -122,9 +131,7 @@ mkdir vendor ) | sed '$ s/,$//' printf " },\n" - printf ' "package": "' - - sha256sum "$CWD/$dep-$ver.crate" | cut -f1 -d' ' | sed 's/$/"/' + printf ' "package": "%s"' "$cksum" printf "}\n" } > $dep-$ver/.cargo-checksum.json @@ -143,6 +150,13 @@ if [ "$CARGOTARGET" != "" ] ; then sed -i "s|target/release|target/$RELEASEDIR/release|" Makefile fi +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 + export CARGO_HOME=.cargo CXXFLAGS="$SLKCFLAGS" \ |