pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust179: Make this build again for NetBSD/mipsel.
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Tue Aug 6 17:10:27 2024 +0000
Changeset: d482886a26adbe0ed5f08b4927e32918e0653a21
Modified Files:
rust179/Makefile
rust179/distinfo
Added Files:
rust179/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
rust179/patches/patch-vendor_nix-0.26.4_src_sys_signal.rs
Log Message:
rust179: Make this build again for NetBSD/mipsel.
* Turn off use of thread-local storage also for NetBSD/mipsel.
* Patch one vendor crate which makes a sweeping assumption about "mips"
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d482886a26adbe0ed5f08b4927e32918e0653a21
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust179/Makefile | 4 ++++
rust179/distinfo | 2 ++
...c__target_src_spec_targets_mipsel__unknown__netbsd.rs | 14 ++++++++++++++
.../patches/patch-vendor_nix-0.26.4_src_sys_signal.rs | 16 ++++++++++++++++
4 files changed, 36 insertions(+)
diffs:
diff --git a/rust179/Makefile b/rust179/Makefile
index dfa816f212..13721627d6 100644
--- a/rust179/Makefile
+++ b/rust179/Makefile
@@ -435,6 +435,10 @@ CKSUMS+= 4261f87c06e6505afd9f7bdafe5aebdd153a1c6f928203cec2dd125642d60fc1
CKSUMS+= c87f041ff9ada85cddcb2a787788e05b2ab5ffc0a85f502fe7e3f7cbda59d49c
CKSUMS+= 67b877964bc0e40c84669c423818a3cb39501eaedfc3f5caf9c33d4779c3d03f
+CKSUM_CRATES+= vendor/nix-0.26.4
+CKSUMS+= c3e13a2edea54d190a4b051f62efc97953c00b5051a9fda0e39e3bc732a31939
+CKSUMS+= 349c52bd7ec69d921644155b2a0b4996d894823d5219ef7e7f31f091f2be55c7
+
SUBST_CLASSES+= cksum
SUBST_STAGE.cksum= pre-configure
.for crate in ${CKSUM_CRATES}
diff --git a/rust179/distinfo b/rust179/distinfo
index 260770fa0e..0320b4e5ba 100644
--- a/rust179/distinfo
+++ b/rust179/distinfo
@@ -115,6 +115,7 @@ SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c3
SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs) = 620eaf74c1dd030973af53dfe4f9aa998be5b123
SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__unknown__netbsd.rs) = 1a02f2dd61a5f9cc4be1f66ac3404c961810c731
SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = e97b7978cc525db7eadf967d51f4818a3c145754
+SHA1 (patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs) = 7deeb7d1d3306e96891dec144ac90398b88c6ad4
SHA1 (patch-compiler_rustc__target_src_spec_targets_sparc64__unknown__netbsd.rs) = 847022a9c02d277f39e2c842f23a9ed401bc5534
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
@@ -138,6 +139,7 @@ SHA1 (patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs) = d4d9288cb199af9bc7e32
SHA1 (patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_mips.rs) = 0895df54084281263b9dae67e57f68168fb66bd4
SHA1 (patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs) = 8699853de4225d4e5953d6bf17b59bc463fa7b5d
SHA1 (patch-vendor_libc-0.2.151_src_unix_solarish_mod.rs) = 50a296ba939f8c12a445526b16f50e8111a762a7
+SHA1 (patch-vendor_nix-0.26.4_src_sys_signal.rs) = b93638e8b434059c3f6554dfc0c7e0d08e16c61b
SHA1 (patch-vendor_openssl-src-111.28.1+1.1.1w_openssl_Configurations_10-main.conf) = f14fa72626a831ca56a3b9d63d33f4ed72486e42
SHA1 (patch-vendor_openssl-src-111.28.1+1.1.1w_src_lib.rs) = ab83fe8e2e6a0ee4df75ba90388e10b815ef6ce9
SHA1 (patch-vendor_openssl-sys-0.9.102_build_find__normal.rs) = 2cf1432ed2be79677d41f267f9a08ff3082e9cbc
diff --git a/rust179/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs b/rust179/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
new file mode 100644
index 0000000000..9f9b89dbe0
--- /dev/null
+++ b/rust179/patches/patch-compiler_rustc__target_src_spec_targets_mipsel__unknown__netbsd.rs
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Let's see if turning off thread local storage makes a difference...
+
+--- compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs.orig 2024-08-05 20:02:56.368978562 +0000
++++ compiler/rustc_target/src/spec/targets/mipsel_unknown_netbsd.rs
+@@ -21,6 +21,7 @@ pub fn target() -> Target {
+ features: "+soft-float".into(),
+ mcount: "__mcount".into(),
+ endian: Endian::Little,
++ has_thread_local: false, // Let's see if there's a difference...
+ ..base
+ },
+ }
diff --git a/rust179/patches/patch-vendor_nix-0.26.4_src_sys_signal.rs b/rust179/patches/patch-vendor_nix-0.26.4_src_sys_signal.rs
new file mode 100644
index 0000000000..9811f4975c
--- /dev/null
+++ b/rust179/patches/patch-vendor_nix-0.26.4_src_sys_signal.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid use of nonexistent SigevThreadId on NetBSD/mipsel.
+
+--- vendor/nix-0.26.4/src/sys/signal.rs.orig 2024-08-06 07:00:59.438254328 +0000
++++ vendor/nix-0.26.4/src/sys/signal.rs
+@@ -1069,7 +1069,8 @@ mod sigevent {
+ SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
+ #[cfg(all(target_os = "linux", target_env = "uclibc"))]
+ SigevNotify::SigevThreadId{..} => libc::SIGEV_THREAD_ID,
+- #[cfg(any(all(target_os = "linux", target_env = "musl"), target_arch = "mips"))]
++ #[cfg(all(target_os = "linux", any(target_env = "musl", target_arch = "mips")))]
++
+ SigevNotify::SigevThreadId{..} => 4 // No SIGEV_THREAD_ID defined
+ };
+ sev.sigev_signo = match sigev_notify {
Home |
Main Index |
Thread Index |
Old Index