From 55b618902315f66dec36ecd635b1a0b33b083939 Mon Sep 17 00:00:00 2001 From: Gene Carlson Date: Sun, 22 Sep 2024 03:15:59 +0900 Subject: [PATCH] development/cargo-c: Dependency changed to rust-opt. Signed-off-by: Willy Sudiarto Raharjo --- development/cargo-c/README | 2 +- development/cargo-c/cargo-c.SlackBuild | 12 ++++++------ development/cargo-c/cargo-c.info | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/development/cargo-c/README b/development/cargo-c/README index 2b67412423..889afa81fd 100644 --- a/development/cargo-c/README +++ b/development/cargo-c/README @@ -4,4 +4,4 @@ libraries. It produces and installs a correct pkg-config file, a static library and a dynamic library, and a C header to be used by any C (and C-compatible) software. -rust16 is needed only at build time. +rust-opt is needed only at build time. diff --git a/development/cargo-c/cargo-c.SlackBuild b/development/cargo-c/cargo-c.SlackBuild index 0ff004772d..14ad20886d 100644 --- a/development/cargo-c/cargo-c.SlackBuild +++ b/development/cargo-c/cargo-c.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=cargo-c VERSION=${VERSION:-0.10.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,7 +38,7 @@ if [ -z "$ARCH" ]; then esac if [ "$ARCH" = "i586" ]; then - if LD_LIBRARY_PATH="/opt/rust16/lib" /opt/rust16/bin/rustc -Vv \ + if LD_LIBRARY_PATH="/opt/rust/lib" /opt/rust/bin/rustc -Vv \ | grep host | grep i686 > /dev/null ; then ARCH=i686 fi @@ -141,13 +141,13 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CARGO_HOME=.cargo \ -PATH="/opt/rust16/bin:$PATH" \ -LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" \ +PATH="/opt/rust/bin:$PATH" \ +LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ cargo build --offline --release $CARGOTARGET -PATH="/opt/rust16/bin:$PATH" \ -LD_LIBRARY_PATH="/opt/rust16/lib$LIBDIRSUFFIX" \ +PATH="/opt/rust/bin:$PATH" \ +LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX" \ cargo install --offline --no-track --root "${PKG}/usr" --path="." rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la diff --git a/development/cargo-c/cargo-c.info b/development/cargo-c/cargo-c.info index 5647506ae6..7d17fb53b0 100644 --- a/development/cargo-c/cargo-c.info +++ b/development/cargo-c/cargo-c.info @@ -673,6 +673,6 @@ MD5SUM="6146712827673079129551b12e6ce312 \ fc484f491cd0c91e5d7343776e055a77" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="rust16" +REQUIRES="rust-opt" MAINTAINER="Alexander Verbovetsky" EMAIL="alik@ejik.org"