From 1204f057b72e70b91e9f0695d2561aad27a942b0 Mon Sep 17 00:00:00 2001 From: fourtysixandtwo Date: Tue, 2 Jan 2024 15:44:13 -0700 Subject: python/jellyfish: Build fixes. Signed-off-by: Willy Sudiarto Raharjo --- python/jellyfish/jellyfish.SlackBuild | 6 ++++-- python/jellyfish/mkvendored.sh | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/python/jellyfish/jellyfish.SlackBuild b/python/jellyfish/jellyfish.SlackBuild index ca01aece3b5a..c2931d789528 100644 --- a/python/jellyfish/jellyfish.SlackBuild +++ b/python/jellyfish/jellyfish.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for jellyfish -# Copyright 2022-23 fourtysixandtwo +# Copyright 2022-2024 fourtysixandtwo # Copyright 2015-2018 Dimitris Zlatanidis Orestiada, Greece # All rights reserved. # @@ -24,6 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 20230916 46and2: Updated version, changed build process. +# 20240102 46and2: Use VSBUILD for vendored sources cd $(dirname $0) ; CWD=$(pwd) @@ -32,6 +33,7 @@ VERSION=${VERSION:-1.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} +VSBUILD=${VSBUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -74,7 +76,7 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$BUILD.tar.?z +tar xvf $CWD/$PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/python/jellyfish/mkvendored.sh b/python/jellyfish/mkvendored.sh index 252d469ea9ec..c52093378e19 100644 --- a/python/jellyfish/mkvendored.sh +++ b/python/jellyfish/mkvendored.sh @@ -5,7 +5,7 @@ # installed. It is only needed if you are upgrading the version and # need new vendored rust libs. # -# create $PRGNAM-vendored-sources-$VERSION-$BUILD.tar.xz +# create $PRGNAM-vendored-sources-$VERSION-$VSBUILD.tar.xz # requires network access, but does not require root privilege. # requires that $PRGNAM's REQUIRES need to be installed first -- cgit v1.2.3