CVS commit: pkgsrc/lang/rust

["Havard Eidnes" <he%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   he
Date:           Sun Oct 23 14:48:31 UTC 2022

Modified Files:
        pkgsrc/lang/rust: Makefile cross.mk distinfo do-cross.mk
        pkgsrc/lang/rust/patches: patch-src_bootstrap_bootstrap.py
            patch-vendor_openssl-src_src_lib.rs

Log Message:
lang/rust: add bits required to build armv6 bootstrap kits.


To generate a diff of this commit:
cvs rdiff -u -r1.267 -r1.268 pkgsrc/lang/rust/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/rust/cross.mk
cvs rdiff -u -r1.150 -r1.151 pkgsrc/lang/rust/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/rust/do-cross.mk
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.267 pkgsrc/lang/rust/Makefile:1.268
--- pkgsrc/lang/rust/Makefile:1.267     Mon Oct 10 20:34:15 2022
+++ pkgsrc/lang/rust/Makefile   Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.267 2022/10/10 20:34:15 he Exp $
+# $NetBSD: Makefile,v 1.268 2022/10/23 14:48:31 he Exp $
 
 DISTNAME=      rustc-1.63.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -399,7 +399,7 @@ CKSUMS+=    79915b243d02df1dc698f5c2de3a935
 
 CKSUM_CRATES+= vendor/openssl-src
 CKSUMS+=       65a4daf6f0d6ad80a83d63614288c3a9df9adcebe5f3d7ff2ad34dd3d2c75196
-CKSUMS+=       7ff3cb1d807d93defda37c2ec01e01223295bcc3d20d218436c07e89cae80fe2
+CKSUMS+=       a2fbabba485081fcad2ea712f4c1b38f111ade4c75ca61d3c8579c99aa5a173d
 
 SUBST_CLASSES+=                cksum
 SUBST_STAGE.cksum=     pre-configure

Index: pkgsrc/lang/rust/cross.mk
diff -u pkgsrc/lang/rust/cross.mk:1.7 pkgsrc/lang/rust/cross.mk:1.8
--- pkgsrc/lang/rust/cross.mk:1.7       Mon May 31 10:17:53 2021
+++ pkgsrc/lang/rust/cross.mk   Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.7 2021/05/31 10:17:53 he Exp $
+# $NetBSD: cross.mk,v 1.8 2022/10/23 14:48:31 he Exp $
 
 # These settings may be used to cross-build rust.
 #
@@ -13,6 +13,7 @@
 # to do a cross-build.  The wrapper script assumes dest/ and tools/
 # as a result of a cross-build of NetBSD as subdirectories of this root
 #CROSS_ROOT=           /u/evbarm-armv7hf
+#CROSS_ROOT=           /u/evbarm-armv6hf
 #CROSS_ROOT=           /u/sparc64
 #CROSS_ROOT=           /u/macppc
 #CROSS_ROOT=           /u/9.0-macppc
@@ -24,6 +25,7 @@
 
 # The GNU cross target designation
 #GNU_CROSS_TARGET=     armv7--netbsdelf-eabihf
+#GNU_CROSS_TARGET=     armv6--netbsdelf-eabihf
 #GNU_CROSS_TARGET=     sparc64--netbsd
 #GNU_CROSS_TARGET=     powerpc--netbsd
 #GNU_CROSS_TARGET=     aarch64--netbsd
@@ -36,6 +38,7 @@
 # host the compiler is supposed to run on.
 # Rust's target designation
 #TARGET=               armv7-unknown-netbsd-eabihf
+#TARGET=               armv6-unknown-netbsd-eabihf
 #TARGET=               sparc64-unknown-netbsd
 #TARGET=               powerpc-unknown-netbsd
 #TARGET=               aarch64-unknown-netbsd

Index: pkgsrc/lang/rust/distinfo
diff -u pkgsrc/lang/rust/distinfo:1.150 pkgsrc/lang/rust/distinfo:1.151
--- pkgsrc/lang/rust/distinfo:1.150     Mon Oct 10 20:34:15 2022
+++ pkgsrc/lang/rust/distinfo   Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.150 2022/10/10 20:34:15 he Exp $
+$NetBSD: distinfo,v 1.151 2022/10/23 14:48:31 he Exp $
 
 BLAKE2s (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = 2732461c3d84cd516563afedc5513f377e3a6796c931ef03601fdcbcc4e6fe33
 SHA512 (rust-1.62.0-x86_64-unknown-illumos.tar.gz) = e99f53fd801d09f28dfd0568a8f2e97a5c4d5d0de7bea28f5afdc91d02f27ff887627f7717c032b90af412e4c04fc11c80c91f42e4b8dab885a311d56fdd5542
@@ -113,7 +113,7 @@ SHA1 (patch-library_backtrace_src_symbol
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = ef9e2b2e78602d5779e5d17e979347b0237ea4a6
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = aafa957d5cfa0f48a6e43c20cfa346261ec7aa76
 SHA1 (patch-library_unwind_build.rs) = 7ece6de566ead1d9aae490ba91d81ac2d0bc50a8
-SHA1 (patch-src_bootstrap_bootstrap.py) = acd1839b8381ed39e907652213627e6eb713da48
+SHA1 (patch-src_bootstrap_bootstrap.py) = b840c3ca90955b8b8327ee0db2807abc5dad18f0
 SHA1 (patch-src_bootstrap_builder.rs) = ef84496eaeca753200e7a8fc7cf1c460ca3c464c
 SHA1 (patch-src_bootstrap_compile.rs) = 4dfce147e78968b67c5e32edbadf487cea21c613
 SHA1 (patch-src_bootstrap_lib.rs) = 5815a67cbb5b40f652dfe60d1b715e69bdeec1b5
@@ -135,7 +135,7 @@ SHA1 (patch-vendor_libc-0.2.119_src_unix
 SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 31b1f5d1c9d289ecbd219b8bb2fd3839db5e7862
 SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 5b45640b2f0015142bd1eda5d5f02c7dbfe9210c
 SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = e62697daa7e7fa3d7b89f338c3a26066b93d7b34
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = 6995ddbf7d17bcd1cb6733a73c29ccdae4f2ab97
 SHA1 (patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs) = 4e86aec4c89db9a331950a12f8ec7b8aaa50eed7
 SHA1 (patch-vendor_stacker_src_lib.rs) = e00a1e95eb16540ff182715db778bf97ebd07a5e
 SHA1 (patch-vendor_target-lexicon_src_targets.rs) = 421aa776a05a64674ffa447b85cfe463075160a2

Index: pkgsrc/lang/rust/do-cross.mk
diff -u pkgsrc/lang/rust/do-cross.mk:1.3 pkgsrc/lang/rust/do-cross.mk:1.4
--- pkgsrc/lang/rust/do-cross.mk:1.3    Thu Sep  1 09:59:46 2022
+++ pkgsrc/lang/rust/do-cross.mk        Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: do-cross.mk,v 1.3 2022/09/01 09:59:46 jperkin Exp $
+# $NetBSD: do-cross.mk,v 1.4 2022/10/23 14:48:31 he Exp $
 # Do all the NetBSD cross builds
 # Collect the bootstrap kits in dist/
 
@@ -6,6 +6,7 @@ VERSION!=       make show-var VARNAME=PKGVERSI
 V_NOREV!=      make show-var VARNAME=PKGVERSION_NOREV
 
 SHORT_TARGETS+=        armv7
+SHORT_TARGETS+=        armv6
 SHORT_TARGETS+=        sparc64
 SHORT_TARGETS+=        powerpc
 SHORT_TARGETS+=        powerpc90
@@ -19,6 +20,7 @@ SHORT_TARGETS+=       i386
 # Root of target directories.
 # Must have dest/ (build.sh's DESTDIR) and tools/ subdirectories
 ROOT.armv7?=           /u/evbarm-armv7hf
+ROOT.armv6?=           /u/evbarm-armv6hf
 ROOT.sparc64?=         /u/sparc64
 ROOT.powerpc?=         /u/macppc
 ROOT.powerpc90?=       /u/9.0-macppc
@@ -28,6 +30,7 @@ ROOT.i386?=           /u/i386
 
 # Mapping to GNU triple
 G_TGT.armv7=           armv7--netbsdelf-eabihf
+G_TGT.armv6=           armv6--netbsdelf-eabihf
 G_TGT.sparc64=         sparc64--netbsd
 G_TGT.powerpc=         powerpc--netbsd
 G_TGT.powerpc90=       powerpc--netbsd
@@ -37,6 +40,7 @@ G_TGT.i386=           i486--netbsdelf
 
 # Mapping to rust's TARGET specification
 TGT.armv7=             armv7-unknown-netbsd-eabihf
+TGT.armv6=             armv6-unknown-netbsd-eabihf
 TGT.sparc64=           sparc64-unknown-netbsd
 TGT.powerpc=           powerpc-unknown-netbsd
 TGT.powerpc90=         powerpc-unknown-netbsd

Index: pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py
diff -u pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py:1.13 pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py:1.14
--- pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py:1.13      Mon Oct 10 20:34:15 2022
+++ pkgsrc/lang/rust/patches/patch-src_bootstrap_bootstrap.py   Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.13 2022/10/10 20:34:15 he Exp $
+$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.14 2022/10/23 14:48:31 he Exp $
 
 Use `uname -p` on NetBSD, as that is reliable and sensible there.
 Handle earmv7hf for NetBSD.
@@ -26,11 +26,15 @@ Default to non-verbose compilation.
          'amd64': 'x86_64',
          'arm64': 'aarch64',
          'i386': 'i686',
-@@ -369,10 +375,12 @@ def default_build_triple(verbose):
+@@ -369,10 +375,16 @@ def default_build_triple(verbose):
              ostype = 'linux-androideabi'
          else:
              ostype += 'eabihf'
 -    elif cputype in {'armv7l', 'armv8l'}:
++    elif cputype == 'armv6hf':
++        cputype = 'armv6'
++        if ostype == 'unknown-netbsd':
++            ostype += '-eabihf'
 +    elif cputype in {'armv7l', 'armv8l', 'earmv7hf'}:
          cputype = 'armv7'
          if ostype == 'linux-android':
@@ -40,7 +44,7 @@ Default to non-verbose compilation.
          else:
              ostype += 'eabihf'
      elif cputype == 'mips':
-@@ -791,7 +799,7 @@ class RustBuild(object):
+@@ -791,7 +803,7 @@ class RustBuild(object):
                  self.cargo()))
          args = [self.cargo(), "build", "--manifest-path",
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]

Index: pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs
diff -u pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs:1.6 pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs:1.7
--- pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs:1.6    Sat Nov 20 16:09:46 2021
+++ pkgsrc/lang/rust/patches/patch-vendor_openssl-src_src_lib.rs        Sun Oct 23 14:48:31 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.6 2021/11/20 16:09:46 he Exp $
+$NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.7 2022/10/23 14:48:31 he Exp $
 
 Provide defaults for the various NetBSD targets.
 
@@ -13,7 +13,13 @@ Provide defaults for the various NetBSD 
              "aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
              "arm-linux-androideabi" => "linux-armv4",
              "armv7-linux-androideabi" => "linux-armv4",
-@@ -234,6 +236,7 @@ impl Build {
+@@ -229,11 +231,13 @@ impl Build {
+             "armv5te-unknown-linux-gnueabi" => "linux-armv4",
+             "armv5te-unknown-linux-musleabi" => "linux-armv4",
+             "armv6-unknown-freebsd" => "BSD-generic32",
++            "armv6-unknown-netbsd-eabihf" => "BSD-generic32",
+             "armv7-unknown-freebsd" => "BSD-generic32",
+             "armv7-unknown-linux-gnueabi" => "linux-armv4",
              "armv7-unknown-linux-musleabi" => "linux-armv4",
              "armv7-unknown-linux-gnueabihf" => "linux-armv4",
              "armv7-unknown-linux-musleabihf" => "linux-armv4",
@@ -21,7 +27,7 @@ Provide defaults for the various NetBSD 
              "asmjs-unknown-emscripten" => "gcc",
              "i586-unknown-linux-gnu" => "linux-elf",
              "i586-unknown-linux-musl" => "linux-elf",
-@@ -244,6 +247,8 @@ impl Build {
+@@ -244,6 +248,8 @@ impl Build {
              "i686-unknown-freebsd" => "BSD-x86-elf",
              "i686-unknown-linux-gnu" => "linux-elf",
              "i686-unknown-linux-musl" => "linux-elf",
@@ -30,7 +36,7 @@ Provide defaults for the various NetBSD 
              "mips-unknown-linux-gnu" => "linux-mips32",
              "mips-unknown-linux-musl" => "linux-mips32",
              "mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -254,6 +259,7 @@ impl Build {
+@@ -254,6 +260,7 @@ impl Build {
              "mipsel-unknown-linux-musl" => "linux-mips32",
              "powerpc-unknown-freebsd" => "BSD-generic32",
              "powerpc-unknown-linux-gnu" => "linux-ppc",
@@ -38,7 +44,7 @@ Provide defaults for the various NetBSD 
              "powerpc64-unknown-freebsd" => "BSD-generic64",
              "powerpc64-unknown-linux-gnu" => "linux-ppc64",
              "powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -263,6 +269,7 @@ impl Build {
+@@ -263,6 +270,7 @@ impl Build {
              "riscv64gc-unknown-linux-gnu" => "linux-generic64",
              "s390x-unknown-linux-gnu" => "linux64-s390x",
              "s390x-unknown-linux-musl" => "linux64-s390x",