Skip to content

development/rust-opt: Do not use lib64. #15356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pghvlaans wants to merge 1 commit into from
+11 −30
Closed

development/rust-opt: Do not use lib64. #15356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions development/rust-opt/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,9 @@ This is to allow Rust-based SlackBuilds to build more recent versions
than would be possible with system Rust.

To use the rust-opt binaries in a SlackBuild, make the following export
statements:
statement:

export PATH="/opt/rust/bin:$PATH"
if [ -z "$LD_LIBRARY_PATH" ]; then
export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX"
else
export LD_LIBRARY_PATH="/opt/rust/lib$LIBDIRSUFFIX:$LD_LIBRARY_PATH"
fi

If your SlackBuild experiences build failures on 64-bit systems, please
ensure that the LIBDIRSUFFIX variable is set.
export PATH="/opt/rust/bin:$PATH"

rust-opt is not intended as a substitute for rustup or for the Slackware
Rust package in terms of Rust development purposes.
Expand Down
29 changes: 9 additions & 20 deletions development/rust-opt/rust-opt.SlackBuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Slackware build script for rust-opt

# Copyright 2024-2025 K. Eugene Carlson Tsukuba, Japan
# Copyright 2024-2026 K. Eugene Carlson Tsukuba, Japan
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
Expand All @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rust-opt
SRCNAM=rust
VERSION=${VERSION:-1.91.1}
BUILD=${BUILD:-1}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}

Expand All @@ -54,16 +54,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}

if [ "$ARCH" = "i586" ]; then
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
else
LIBDIRSUFFIX=""
fi

if [ "$ARCH" = "arm" ]; then
TRIPLET="$ARCH-unknown-linux-gnueabihf"
else
Expand All @@ -86,7 +76,6 @@ 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 {} \;

sed -i "s/PREFIX\/lib/PREFIX\/lib$LIBDIRSUFFIX/g" install.sh
./install.sh \
--destdir=$PKG \
--prefix="opt/$SRCNAM" \
Expand All @@ -100,8 +89,8 @@ rust-docs,\
rust-docs-json-preview,\
rustfmt-preview

find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null
find $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null
find $PKG/opt/$SRCNAM/lib -type f -name "*.so" -exec chmod +x {} \; 2> /dev/null
find $PKG/opt/$SRCNAM/lib -type f -name "*.so*stable" -exec chmod +x {} \; 2> /dev/null

# Stripping the libraries causes memory faults on Slackware64-15.0.
if [ $ARCH = "x86_64" ]; then
Expand All @@ -112,11 +101,11 @@ else
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
fi

rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/uninstall.sh
rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/install.log
rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/manifest-*
rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/rust-installer-version
rm -f $PKG/opt/$SRCNAM/lib$LIBDIRSUFFIX/rustlib/components
rm -f $PKG/opt/$SRCNAM/lib/rustlib/uninstall.sh
rm -f $PKG/opt/$SRCNAM/lib/rustlib/install.log
rm -f $PKG/opt/$SRCNAM/lib/rustlib/manifest-*
rm -f $PKG/opt/$SRCNAM/lib/rustlib/rust-installer-version
rm -f $PKG/opt/$SRCNAM/lib/rustlib/components

mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
Expand Down
Loading