pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust: install rust-src, required for rust-analyzer



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Thu Jan 12 11:26:08 2023 +0100
Changeset:	30dec24333d846e56b1ec7dd1ae83e3fa19caf59

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/patches/patch-src_bootstrap_builder.rs

Log Message:
rust: install rust-src, required for rust-analyzer

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=30dec24333d846e56b1ec7dd1ae83e3fa19caf59

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/Makefile                               | 10 ++++++++++
 rust/distinfo                               |  2 +-
 rust/patches/patch-src_bootstrap_builder.rs | 11 +----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 54a960ac4a..3f53a30759 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -141,6 +141,16 @@ CONFIGURE_ARGS+=	--set llvm.targets="Mips"
 CONFIGURE_ARGS+=	--set llvm.targets="Mips;X86"
 .endif
 
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/backtrace/ci/android-sdk.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/backtrace/ci/debuglink.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/backtrace/ci/run.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/backtrace/ci/run-docker.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/core/src/unicode/printable.py
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/style.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/run.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/run-docker.sh
+CHECK_INTERPRETER_SKIP+=	lib/rustlib/src/rust/library/stdarch/ci/dox.sh
+
 .if ${OPSYS} == "NetBSD"
 # This block contains information about known trouble on NetBSD and workarounds.
 
diff --git a/rust/distinfo b/rust/distinfo
index 07560106c0..9da5bf293d 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -122,7 +122,7 @@ SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e
 SHA1 (patch-library_std_src_sys_unix_thread__parker_netbsd.rs) = a8dcda5f9ff273b53f5b59718020c24526399a37
 SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
 SHA1 (patch-src_bootstrap_bootstrap.py) = fdb4e2e7fd61ae10f4f4b06ef895a8ebf47fbf7a
-SHA1 (patch-src_bootstrap_builder.rs) = 30065ebf270f725d4decda1eb4ced603da25748b
+SHA1 (patch-src_bootstrap_builder.rs) = 98daac929d2bbc9c475c39d225d50d37491528a8
 SHA1 (patch-src_bootstrap_compile.rs) = 94b05db59b8bc50dce48537aeb72ba9ce293bb07
 SHA1 (patch-src_bootstrap_install.rs) = 65b0571a6297c3469cd50cde9a8dbf86638136f4
 SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
diff --git a/rust/patches/patch-src_bootstrap_builder.rs b/rust/patches/patch-src_bootstrap_builder.rs
index 7856ff5fe5..6d772a0ffe 100644
--- a/rust/patches/patch-src_bootstrap_builder.rs
+++ b/rust/patches/patch-src_bootstrap_builder.rs
@@ -1,19 +1,10 @@
 $NetBSD: patch-src_bootstrap_builder.rs,v 1.11 2020/07/06 13:56:32 he Exp $
 
-Do not install 'src'.
 Use @PREFIX@, not $ORIGIN in rpath.
 
 --- src/bootstrap/builder.rs.orig	2022-12-12 16:02:12.000000000 +0000
 +++ src/bootstrap/builder.rs
-@@ -745,7 +745,6 @@ impl<'a> Builder<'a> {
-                 install::Clippy,
-                 install::Miri,
-                 install::Analysis,
--                install::Src,
-                 install::Rustc
-             ),
-             Kind::Run => describe!(
-@@ -1711,7 +1710,7 @@ impl<'a> Builder<'a> {
+@@ -1710,7 +1710,7 @@ impl<'a> Builder<'a> {
                  Some("-Wl,-rpath,@loader_path/../lib")
              } else if !target.contains("windows") {
                  rustflags.arg("-Clink-args=-Wl,-z,origin");


Home | Main Index | Thread Index | Old Index