pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust: add bits for building for earmv6hf on NetBSD.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Sat Oct 22 23:09:10 2022 +0000
Changeset: c4df483b9130edaeb85b0bab74a488396ba9cc0a
Modified Files:
rust/Makefile
rust/cross.mk
rust/distinfo
rust/do-cross.mk
rust/patches/patch-src_bootstrap_bootstrap.py
rust/patches/patch-vendor_openssl-src_src_lib.rs
Log Message:
rust: add bits for building for earmv6hf on NetBSD.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c4df483b9130edaeb85b0bab74a488396ba9cc0a
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust/Makefile | 2 +-
rust/cross.mk | 3 +++
rust/distinfo | 4 ++--
rust/do-cross.mk | 4 ++++
rust/patches/patch-src_bootstrap_bootstrap.py | 14 +++++++++-----
rust/patches/patch-vendor_openssl-src_src_lib.rs | 14 ++++++++++----
6 files changed, 29 insertions(+), 12 deletions(-)
diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 1bc142e1cf..16d627660d 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -403,7 +403,7 @@ CKSUMS+= 79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
CKSUM_CRATES+= vendor/openssl-src
CKSUMS+= 40cd1069246b552b04fcdfd13eb77b3a89194192f18c426b77377a78abbfd72f
-CKSUMS+= e74a32c20fad79380ec9009ac4469bd71d5fec442b66f2b8c547c3e607fd4d77
+CKSUMS+= 30a3a2d0c0f77bf271fd7e532fc944a2a6bfc0e8f2fe130d1a2edca3318024f2
CKSUM_CRATES+= vendor/kqueue
CKSUMS+= 900a966152b8fdccc4e953df94fa27024cb473f57f49df06cd8f2acaac869787
diff --git a/rust/cross.mk b/rust/cross.mk
index 76c1b66a8b..c6fecf3dc6 100644
--- a/rust/cross.mk
+++ b/rust/cross.mk
@@ -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
diff --git a/rust/distinfo b/rust/distinfo
index 10599f3d58..dbc74b0afb 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -113,7 +113,7 @@ SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 56621c10310914672a85
SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
SHA1 (patch-library_std_src_sys_unix_thread.rs) = e5f661b3dd00058e874fe60cd89d9e919325e99b
SHA1 (patch-library_unwind_build.rs) = df092d5c07fa0be63a9510f1d6a77e5094ca3b15
-SHA1 (patch-src_bootstrap_bootstrap.py) = 84af2ffa57ae1b68d12c6b9d3ce181a13576992c
+SHA1 (patch-src_bootstrap_bootstrap.py) = f8baa7770ccc57c24422650895ad887ae2621889
SHA1 (patch-src_bootstrap_builder.rs) = a99bdde69d3b55906f8d227a5604a1a6ef55bb1c
SHA1 (patch-src_bootstrap_compile.rs) = c57799aee9c12603f5e6a13cb6b5befc8f96b4b6
SHA1 (patch-src_bootstrap_lib.rs) = f6918e0939b6fe63ae9b524d4c809375149efb15
@@ -135,7 +135,7 @@ SHA1 (patch-vendor_kqueue_src_time.rs) = 21950e7d79fb88257bdb11b988f2a3ae0084ba3
SHA1 (patch-vendor_libc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = 351e213fc07b0dc7c35d70d6a0c2ecc6b5b9056e
SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 8364e19ea09203d32494c37ff3db19fe3d6b9d8a
SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
-SHA1 (patch-vendor_openssl-src_src_lib.rs) = 5077b0603515cc5869581be7b6a0830950ec323f
+SHA1 (patch-vendor_openssl-src_src_lib.rs) = af3827ec7398a2f78e0748e3ebb7497a26d4dbea
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) = e0c67288516ff8d379d6d1e7b05d4ab86f9ac0a7
diff --git a/rust/do-cross.mk b/rust/do-cross.mk
index f6c3d810e3..66f699b2b4 100644
--- a/rust/do-cross.mk
+++ b/rust/do-cross.mk
@@ -6,6 +6,7 @@ VERSION!= make show-var VARNAME=PKGVERSION
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
diff --git a/rust/patches/patch-src_bootstrap_bootstrap.py b/rust/patches/patch-src_bootstrap_bootstrap.py
index a77b009a53..9cce072657 100644
--- a/rust/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust/patches/patch-src_bootstrap_bootstrap.py
@@ -4,9 +4,9 @@ Use `uname -p` on NetBSD, as that is reliable and sensible there.
Handle earmv7hf for NetBSD.
Default to non-verbose compilation.
---- src/bootstrap/bootstrap.py.orig 2021-02-10 17:36:44.000000000 +0000
+--- src/bootstrap/bootstrap.py.orig 2022-09-19 14:07:21.000000000 +0000
+++ src/bootstrap/bootstrap.py
-@@ -218,6 +218,11 @@ def default_build_triple(verbose):
+@@ -244,6 +244,11 @@ def default_build_triple(verbose):
'OpenBSD': 'unknown-openbsd'
}
@@ -18,7 +18,7 @@ Default to non-verbose compilation.
# Consider the direct transformation first and then the special cases
if ostype in ostype_mapper:
ostype = ostype_mapper[ostype]
-@@ -271,6 +276,7 @@ def default_build_triple(verbose):
+@@ -297,6 +302,7 @@ def default_build_triple(verbose):
cputype_mapper = {
'BePC': 'i686',
'aarch64': 'aarch64',
@@ -26,11 +26,15 @@ Default to non-verbose compilation.
'amd64': 'x86_64',
'arm64': 'aarch64',
'i386': 'i686',
-@@ -309,10 +315,12 @@ def default_build_triple(verbose):
+@@ -335,10 +341,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':
-@@ -980,7 +988,7 @@ class RustBuild(object):
+@@ -757,7 +769,7 @@ class RustBuild(object):
self.cargo()))
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
diff --git a/rust/patches/patch-vendor_openssl-src_src_lib.rs b/rust/patches/patch-vendor_openssl-src_src_lib.rs
index c068dbbe42..a94c2fa472 100644
--- a/rust/patches/patch-vendor_openssl-src_src_lib.rs
+++ b/rust/patches/patch-vendor_openssl-src_src_lib.rs
@@ -13,7 +13,13 @@ Provide defaults for the various NetBSD targets.
"aarch64-pc-windows-msvc" => "VC-WIN64-ARM",
"arm-linux-androideabi" => "linux-armv4",
"armv7-linux-androideabi" => "linux-armv4",
-@@ -245,6 +247,7 @@ impl Build {
+@@ -240,11 +242,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 targets.
"asmjs-unknown-emscripten" => "gcc",
"i586-unknown-linux-gnu" => "linux-elf",
"i586-unknown-linux-musl" => "linux-elf",
-@@ -255,6 +258,8 @@ impl Build {
+@@ -255,6 +259,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 targets.
"mips-unknown-linux-gnu" => "linux-mips32",
"mips-unknown-linux-musl" => "linux-mips32",
"mips64-unknown-linux-gnuabi64" => "linux64-mips64",
-@@ -265,6 +270,7 @@ impl Build {
+@@ -265,6 +271,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 targets.
"powerpc64-unknown-freebsd" => "BSD-generic64",
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
"powerpc64-unknown-linux-musl" => "linux-ppc64",
-@@ -274,6 +280,7 @@ impl Build {
+@@ -274,6 +281,7 @@ impl Build {
"riscv64gc-unknown-linux-gnu" => "linux-generic64",
"s390x-unknown-linux-gnu" => "linux64-s390x",
"s390x-unknown-linux-musl" => "linux64-s390x",
Home |
Main Index |
Thread Index |
Old Index