pkgsrc-WIP-changes archive

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

rust: fix bootstrap.py to again recognize earmv7hf cpu type.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Fri Jul 14 21:20:34 2023 +0000
Changeset:	b3a5abf771777d8cf580b114d18099548f2cef0c

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

Log Message:
rust: fix bootstrap.py to again recognize earmv7hf cpu type.

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

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

diffstat:
 rust/distinfo                                 | 2 +-
 rust/patches/patch-src_bootstrap_bootstrap.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diffs:
diff --git a/rust/distinfo b/rust/distinfo
index 051b81dc3f..d6504e54ec 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -135,7 +135,7 @@ SHA1 (patch-library_core_src_ffi_mod.rs) = 7678d57edc05a66abca73d4676cbb7bd58874
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = 36a3085500ecbb34f8ecc08388c164da54bdf5d4
 SHA1 (patch-library_std_src_sys_unix_thread__parking_netbsd.rs) = c29eb1cf074766d34bd2b8c348ce29c6ae2ba163
-SHA1 (patch-src_bootstrap_bootstrap.py) = 6f7f0d8f405068e614fc2a870e96dc0828f9a980
+SHA1 (patch-src_bootstrap_bootstrap.py) = db024675298542bfe22fa782c32ef280f361d07e
 SHA1 (patch-src_bootstrap_builder.rs) = 98daac929d2bbc9c475c39d225d50d37491528a8
 SHA1 (patch-src_bootstrap_compile.rs) = 71b58c0e14b820dafc48ce087292267e7d2eed0f
 SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
diff --git a/rust/patches/patch-src_bootstrap_bootstrap.py b/rust/patches/patch-src_bootstrap_bootstrap.py
index e69484b406..2f6b1b974b 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -28,11 +28,12 @@ Handle earmv[67]hf for NetBSD.
              kernel = 'linux-androideabi'
          else:
              kernel += 'eabihf'
+-    elif cputype in {'armv7l', 'armv8l'}:
 +    elif cputype in {'armv6hf', 'earmv6hf'}:
 +        cputype = 'armv6'
 +        if kernel == 'unknown-netbsd':
 +            kernel += '-eabihf'
-     elif cputype in {'armv7l', 'armv8l'}:
++    elif cputype in {'armv7l', 'earmv7hf', 'armv8l'}:
          cputype = 'armv7'
          if kernel == 'linux-android':
              kernel = 'linux-androideabi'


Home | Main Index | Thread Index | Old Index