rust183: attempt to restore cross-buildability.

[Havard Eidnes (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon Dec 16 00:20:14 2024 +0000
Changeset:	595846c466de0d2d6d2d1dc771f6bdaaab58de6a

Modified Files:
	rust183/distinfo
	rust183/patches/patch-src_bootstrap_bootstrap.py

Log Message:
rust183: attempt to restore cross-buildability.

Done by undoing temporary fix for
https://github.com/rust-lang/rust/issues/125578.

Not yet fully verified, but this removal was there
before and got lost when comments were added
between versions.

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

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

diffstat:
 rust183/distinfo                                 |  2 +-
 rust183/patches/patch-src_bootstrap_bootstrap.py | 25 +++++++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diffs:
diff --git a/rust183/distinfo b/rust183/distinfo
index fa4a689904..22ee0794c9 100644
--- a/rust183/distinfo
+++ b/rust183/distinfo
@@ -122,7 +122,7 @@ SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee
 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
 SHA1 (patch-library_std_src_sys_pal_unix_mod.rs) = bfc59ae4568547e3ed71c8b31ba5b5b5363d5d40
 SHA1 (patch-library_stdarch_crates_std__detect_tests_cpu-detection.rs) = 97c3ad8ea39c25d41256fcad80fae1e6e4970124
-SHA1 (patch-src_bootstrap_bootstrap.py) = 6f1d3068da49f19c3e092230ba1c7d99af628d3a
+SHA1 (patch-src_bootstrap_bootstrap.py) = 150a5a7e057de9edbf96f3c387207fda8ba750f9
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = cc6558df42c9c9ac28fdb2ff180bdaa7f22ce816
 SHA1 (patch-src_bootstrap_src_core_builder.rs) = 6d76366201097adc56e494fa05ebbc1696bb2d98
diff --git a/rust183/patches/patch-src_bootstrap_bootstrap.py b/rust183/patches/patch-src_bootstrap_bootstrap.py
index f9671c8d80..badc6a4583 100644
--- a/rust183/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust183/patches/patch-src_bootstrap_bootstrap.py
@@ -6,7 +6,7 @@ Also use @PREFIX@ and not $ORIGIN in rpath.
 
 --- src/bootstrap/bootstrap.py.orig	2023-07-12 03:32:40.000000000 +0000
 +++ src/bootstrap/bootstrap.py
-@@ -270,6 +270,11 @@ def default_build_triple(verbose):
+@@ -286,6 +286,11 @@ def default_build_triple(verbose):
          'GNU': 'unknown-hurd',
      }
  
@@ -18,7 +18,7 @@ Also use @PREFIX@ and not $ORIGIN in rpath.
      # Consider the direct transformation first and then the special cases
      if kernel in kerneltype_mapper:
          kernel = kerneltype_mapper[kernel]
-@@ -373,10 +378,16 @@ def default_build_triple(verbose):
+@@ -389,10 +394,16 @@ def default_build_triple(verbose):
              kernel = 'linux-androideabi'
          else:
              kernel += 'eabihf'
@@ -36,7 +36,26 @@ Also use @PREFIX@ and not $ORIGIN in rpath.
          else:
              kernel += 'eabihf'
      elif cputype == 'mips':
-@@ -734,6 +745,7 @@ class RustBuild(object):
+@@ -623,12 +634,12 @@ class RustBuild(object):
+                 print('Choosing a pool size of', pool_size, 'for the unpacking of the tarballs')
+             p = Pool(pool_size)
+             try:
+-                # FIXME: A cheap workaround for https://github.com/rust-lang/rust/issues/125578,
+-                # remove this once the issue is closed.
+-                bootstrap_build_artifacts = os.path.join(self.bootstrap_out(), "debug")
+-                if os.path.exists(bootstrap_build_artifacts):
+-                    shutil.rmtree(bootstrap_build_artifacts)
+-
++#                # FIXME: A cheap workaround for https://github.com/rust-lang/rust/issues/125578,
++#                # remove this once the issue is closed.
++#                bootstrap_build_artifacts = os.path.join(self.bootstrap_out(), "debug")
++#                if os.path.exists(bootstrap_build_artifacts):
++#                    shutil.rmtree(bootstrap_build_artifacts)
++#
+                 p.map(unpack_component, tarballs_download_info)
+             finally:
+                 p.close()
+@@ -758,6 +769,7 @@ class RustBuild(object):
  
          patchelf = "{}/bin/patchelf".format(nix_deps_dir)
          rpath_entries = [