From 6057bc3cac36b3ed71cec8fa1c2cef145bed5599 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sat, 28 Oct 2023 22:03:51 +0000
Subject: Sat Oct 28 22:03:51 UTC 2023

d/rust-1.70.0-x86_64-3.txz:  Rebuilt.
  Fixed the installation of rls and added rust-analyzer (the successor to rls)
  and rust-demangler. Thanks to Heinz Wiesinger.
l/enchant-2.6.2-x86_64-1.txz:  Upgraded.
l/gexiv2-0.14.2-x86_64-2.txz:  Rebuilt.
  Recompiled against exiv2-0.28.0.
l/libsigc++3-3.6.0-x86_64-1.txz:  Upgraded.
l/vid.stab-1.1.1-x86_64-1.txz:  Upgraded.
x/ibus-m17n-1.4.23-x86_64-1.txz:  Upgraded.
testing/packages/rust-1.73.0-x86_64-2.txz:  Rebuilt.
  Fixed the installation of rls and added rust-analyzer (the successor to rls)
  and rust-demangler. Thanks to Heinz Wiesinger.
---
 testing/source/rust/rust.SlackBuild | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'testing/source/rust/rust.SlackBuild')

diff --git a/testing/source/rust/rust.SlackBuild b/testing/source/rust/rust.SlackBuild
index a0c1058b2..b8ab13a14 100755
--- a/testing/source/rust/rust.SlackBuild
+++ b/testing/source/rust/rust.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=rust
 SRCNAM="${PKGNAM}c"
 VERSION=${VERSION:-1.73.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
 # YES is probably better (when it works...)
@@ -164,7 +164,7 @@ link-shared = true
 build = "$BARCH-unknown-linux-$BABI"
 host = ["$TARCH-unknown-linux-$BABI"]
 target = ["$TARCH-unknown-linux-$BABI"]
-tools = ["analysis", "cargo", "clippy", "rls", "rustfmt", "src"]
+tools = ["analysis", "cargo", "clippy", "rls", "rustfmt", "src", "rust-analyzer", "rust-demangler"]
 submodules = false
 vendor = true
 extended = true
@@ -234,6 +234,11 @@ fi
 python3 ./x.py build || exit 1
 DESTDIR=$PKG python3 x.py install || exit 1
 
+# In case the rls stub doesn't get installed by the 'install' target:
+if [ ! -x $PKG/usr/bin/rls ]; then
+  install -m755 build/*-linux-gnu/stage1-tools-bin/rls $PKG/usr/bin/rls
+fi
+
 # Fix path to lldb_commands:
 if [ -x $PKG/usr/bin/rust-lldb ]; then
   if [ ! "$LIBDIRSUFFIX" = "" ]; then
-- 
cgit v1.2.3-65-gdbad