pkgsrc-WIP-changes archive

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

rust194: for now don't make "known target in 'unknown' list" fatal.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon Apr 6 08:37:18 2026 +0000
Changeset:	1e30675a49330d041b6a4f119137d0d422658799

Modified Files:
	rust194/distinfo
	rust194/patches/patch-src_bootstrap_src_core_sanity.rs

Log Message:
rust194: for now don't make "known target in 'unknown' list" fatal.

The "m68k-unknown-netbsd" entry may be in that list for a while,
until upstream LLVM is fixed to not only emit 16-bit PC-relative
relocations, which are ... inadequate for rust.

This should get rid of this as a fatal error if you need to rebuild
newer rust compilers using older pkgsrc rust compilers, which have
since 1.93 made m68k-unknown-netbsd a "known" target.

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

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

diffstat:
 rust194/distinfo                                       |  2 +-
 rust194/patches/patch-src_bootstrap_src_core_sanity.rs | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs:
diff --git a/rust194/distinfo b/rust194/distinfo
index e27c44462e..85a1e47549 100644
--- a/rust194/distinfo
+++ b/rust194/distinfo
@@ -123,7 +123,7 @@ SHA1 (patch-src_bootstrap_bootstrap.py) = fb89adaaf01f558d636734db5d778af4a3c67f
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = 5ecf4e371fa48bca72fa5b0adb55152c906bd813
 SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
-SHA1 (patch-src_bootstrap_src_core_sanity.rs) = 3960db30047a0a97c5f2ae28d4149b00584980c9
+SHA1 (patch-src_bootstrap_src_core_sanity.rs) = c176c60f21deeb43187451dc9bf099547f3bab14
 SHA1 (patch-src_bootstrap_src_lib.rs) = 735a3f6cbb3054200dd55eebce6e9acbd285f51e
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 446acdd51fb6ddcba733371263aa2f9949299d31
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
diff --git a/rust194/patches/patch-src_bootstrap_src_core_sanity.rs b/rust194/patches/patch-src_bootstrap_src_core_sanity.rs
index 3edb66e797..3a3b02f2ed 100644
--- a/rust194/patches/patch-src_bootstrap_src_core_sanity.rs
+++ b/rust194/patches/patch-src_bootstrap_src_core_sanity.rs
@@ -1,7 +1,8 @@
 $NetBSD$
 
 Temporarily add m68k-unknown-netbsd to STAGE0_MISSING_TARGETS.
-...while we bootstrap the target.
+...while we bootstrap the target, and don't make the presence
+while it's a known target a fatal error.
 
 --- src/bootstrap/src/core/sanity.rs.orig	2026-03-02 23:18:25.000000000 +0000
 +++ src/bootstrap/src/core/sanity.rs
@@ -13,3 +14,15 @@ Temporarily add m68k-unknown-netbsd to STAGE0_MISSING_TARGETS.
  ];
  
  /// Minimum version threshold for libstdc++ required when using prebuilt LLVM
+@@ -266,7 +267,10 @@ than building it.
+                 for duplicated_target in duplicated_targets {
+                     println!("  {duplicated_target}");
+                 }
+-                std::process::exit(1);
++// For now don't make this a fatal error.
++// e.g. m68k-unknown-netbsd may be in the list for a while
++// until LLVM is fixed to not emit 16-bit PC-relative relocations only...
++//              std::process::exit(1);
+             }
+ 
+             // Check if it's a built-in target.


Home | Main Index | Thread Index | Old Index