Thu Sep 19 17:37:29 2019 UTC ()
rust: SunOS now requires libnsl.
While here fix some tabs->spaces to make the test suite work again.
(jperkin)
diff -r1.87 -r1.88 pkgsrc/lang/rust/distinfo
diff -r1.5 -r1.6 pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs
diff -r1.4 -r1.5 pkgsrc/lang/rust/patches/patch-src_libstd_build.rs
--- pkgsrc/lang/rust/distinfo 2019/09/17 08:03:27 1.87
+++ pkgsrc/lang/rust/distinfo 2019/09/19 17:37:29 1.88
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.87 2019/09/17 08:03:27 he Exp $
+$NetBSD: distinfo,v 1.88 2019/09/19 17:37:29 jperkin Exp $
SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e
RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0
@@ -110,10 +110,10 @@
SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417
SHA1 (patch-src_build__helper_lib.rs) = ef0b522e303f0490b86e64f40733c2ecb498da5b
SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0
-SHA1 (patch-src_librustc__llvm_build.rs) = d6e71891eb8d42a9c4175505ba7ed98338153860
+SHA1 (patch-src_librustc__llvm_build.rs) = 7cc2aa0568aa2cbf4eb1fdbb00922b10df0b3ff6
SHA1 (patch-src_librustc__target_spec_solaris__base.rs) = 21db8af802edecb5e35ce78ee9af7c4935b4040f
SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa
-SHA1 (patch-src_libstd_build.rs) = aa7020339ccc2888d1302721e1a38f7a4e0925a3
+SHA1 (patch-src_libstd_build.rs) = 9cfa91a11a575d5fef6d3e208864745a24770850
SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a
SHA1 (patch-src_libunwind_build.rs) = c0a0aa9749705be07afe8eaaa0c7d70affa46566
SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
--- pkgsrc/lang/rust/patches/Attic/patch-src_librustc__llvm_build.rs 2019/04/14 12:49:17 1.5
+++ pkgsrc/lang/rust/patches/Attic/patch-src_librustc__llvm_build.rs 2019/09/19 17:37:29 1.6
@@ -1,21 +1,21 @@
-$NetBSD: patch-src_librustc__llvm_build.rs,v 1.5 2019/04/14 12:49:17 he Exp $
+$NetBSD: patch-src_librustc__llvm_build.rs,v 1.6 2019/09/19 17:37:29 jperkin Exp $
fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
---- src/librustc_llvm/build.rs.orig 2019-04-10 18:45:55.000000000 +0000
+--- src/librustc_llvm/build.rs.orig 2019-08-13 06:27:22.000000000 +0000
+++ src/librustc_llvm/build.rs
-@@ -246,7 +246,13 @@ fn main() {
+@@ -261,7 +261,13 @@ fn main() {
"c++"
} else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
// NetBSD uses a separate library when relocation is required
- "stdc++_pic"
-+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
-+ "c++_pic"
-+ } else {
++ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
++ "c++_pic"
++ } else {
+ "stdc++_pic"
-+ }
++ }
+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
-+ "c++"
++ "c++"
} else if llvm_use_libcxx.is_some() {
"c++"
} else {
--- pkgsrc/lang/rust/patches/Attic/patch-src_libstd_build.rs 2019/07/05 09:55:31 1.4
+++ pkgsrc/lang/rust/patches/Attic/patch-src_libstd_build.rs 2019/09/19 17:37:29 1.5
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_libstd_build.rs,v 1.4 2019/07/05 09:55:31 he Exp $
+$NetBSD: patch-src_libstd_build.rs,v 1.5 2019/09/19 17:37:29 jperkin Exp $
SunOS support:
- Support PKGSRC_USE_SSP (ugly for now).
- Add libumem support.
- Add libexecinfo for backtrace().
---- src/libstd/build.rs.orig 2019-01-16 09:30:27.000000000 +0000
+--- src/libstd/build.rs.orig 2019-08-13 06:27:22.000000000 +0000
+++ src/libstd/build.rs
@@ -18,6 +18,7 @@ fn main() {
println!("cargo:rustc-link-lib=execinfo");
@@ -15,10 +15,11 @@
println!("cargo:rustc-link-lib=pthread");
println!("cargo:rustc-link-lib=rt");
} else if target.contains("dragonfly") || target.contains("openbsd") {
-@@ -27,6 +28,9 @@ fn main() {
+@@ -27,6 +28,10 @@ fn main() {
println!("cargo:rustc-link-lib=posix4");
println!("cargo:rustc-link-lib=pthread");
println!("cargo:rustc-link-lib=resolv");
++ println!("cargo:rustc-link-lib=nsl");
+ // pkgsrc hack until I can figure out how to pass it through properly
+ println!("cargo:rustc-link-lib=ssp");
+ println!("cargo:rustc-link-lib=umem");