summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/rust-for-mozilla/README3
-rwxr-xr-xextra/source/rust-for-mozilla/rust.SlackBuild6
2 files changed, 6 insertions, 3 deletions
diff --git a/extra/rust-for-mozilla/README b/extra/rust-for-mozilla/README
index e6dd2e220..60aee6c4b 100644
--- a/extra/rust-for-mozilla/README
+++ b/extra/rust-for-mozilla/README
@@ -8,8 +8,7 @@ same version of Firefox), see this link:
https://firefox-source-docs.mozilla.org/writing-rust-code/update-policy.html
This version of Rust has been compiled with the bundled version of LLVM to
-avoid depending on any particular version of LLVM. This may cause a warning
-from ldconfig, but that's harmless.
+avoid depending on any particular version of LLVM.
This Rust package will be updated in place to follow the requirements for the
various Mozilla packages in the main tree (for -current), or in /patches (for
diff --git a/extra/source/rust-for-mozilla/rust.SlackBuild b/extra/source/rust-for-mozilla/rust.SlackBuild
index f7e477545..ac4f11766 100755
--- a/extra/source/rust-for-mozilla/rust.SlackBuild
+++ b/extra/source/rust-for-mozilla/rust.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
VERSION=${VERSION:-1.54.0}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
# YES is probably better (when it works...)
@@ -264,6 +264,10 @@ find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+# Get rid of a possible duplicated libLLVM. Not only is it large, but it also
+# throws an error at boot with ldconfig:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libLLVM-*.so.old
+
# Commented out (for now) since we disable rpaths in config.toml:
## Remove any compiled-in RPATHs:
#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \