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
cvs diff -r1.87 -r1.88 pkgsrc/lang/rust/distinfo (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.87 2019/09/17 08:03:27 he Exp $ 1$NetBSD: distinfo,v 1.88 2019/09/19 17:37:29 jperkin Exp $
2 2
3SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e 3SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e
4RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0 4RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0
5SHA512 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 27f7fb0e4a4522b24f04c7f6b578c8717908978ab485c525adbc95716860a958f2c42d4148d81fd41ab0e593d3baae6a1ffc6767ed24879df7c2aa6d8bf14683 5SHA512 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 27f7fb0e4a4522b24f04c7f6b578c8717908978ab485c525adbc95716860a958f2c42d4148d81fd41ab0e593d3baae6a1ffc6767ed24879df7c2aa6d8bf14683
6Size (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 243045630 bytes 6Size (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 243045630 bytes
7SHA1 (rust-1.36.0-i686-apple-darwin.tar.gz) = 7e45ab4c622b711dd50c8a30721bc4791c86da15 7SHA1 (rust-1.36.0-i686-apple-darwin.tar.gz) = 7e45ab4c622b711dd50c8a30721bc4791c86da15
8RMD160 (rust-1.36.0-i686-apple-darwin.tar.gz) = e983ae2e9c98fd58f900ec08c0357422613476e6 8RMD160 (rust-1.36.0-i686-apple-darwin.tar.gz) = e983ae2e9c98fd58f900ec08c0357422613476e6
9SHA512 (rust-1.36.0-i686-apple-darwin.tar.gz) = bd79c5be2ce027a9bcd4870921b8b505a432d1e47f6b48afed0023f35eff2abb1b569741428f1a5b9d1154a3da6d72b8349b03a73a82a1b667fc1f6754da3681 9SHA512 (rust-1.36.0-i686-apple-darwin.tar.gz) = bd79c5be2ce027a9bcd4870921b8b505a432d1e47f6b48afed0023f35eff2abb1b569741428f1a5b9d1154a3da6d72b8349b03a73a82a1b667fc1f6754da3681
10Size (rust-1.36.0-i686-apple-darwin.tar.gz) = 257426824 bytes 10Size (rust-1.36.0-i686-apple-darwin.tar.gz) = 257426824 bytes
11SHA1 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 884e4d06466a402135a0c1666c7c48fa0ff09fd6 11SHA1 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 884e4d06466a402135a0c1666c7c48fa0ff09fd6
12RMD160 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = db96efb53f9caa8e4136ded5f3140c8f5298fb20 12RMD160 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = db96efb53f9caa8e4136ded5f3140c8f5298fb20
13SHA512 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 03ef8c62efc78ed90ed4437649ff6446771b0aaa5b0d03c596e201360fe8b058f5810053185152466ca92d0bf4ab7c8bea72fd0300e72919ca436c96fb79dd54 13SHA512 (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 03ef8c62efc78ed90ed4437649ff6446771b0aaa5b0d03c596e201360fe8b058f5810053185152466ca92d0bf4ab7c8bea72fd0300e72919ca436c96fb79dd54
14Size (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 209984253 bytes 14Size (rust-1.36.0-i686-unknown-freebsd.tar.gz) = 209984253 bytes
@@ -100,30 +100,30 @@ SHA1 (rust-std-1.37.0-x86_64-unknown-net @@ -100,30 +100,30 @@ SHA1 (rust-std-1.37.0-x86_64-unknown-net
100RMD160 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = f946a0b49b0fe22472ceadaadc5f8997d8bd268b 100RMD160 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = f946a0b49b0fe22472ceadaadc5f8997d8bd268b
101SHA512 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = fe77bdeb3afcd6b26e796ec03bcf10efcae9e2df833f3264b163bad109ccd1a88f71b298aa028303bc4dd17cf6c79145876a01e97292653c1e1d9eda6842dc01 101SHA512 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = fe77bdeb3afcd6b26e796ec03bcf10efcae9e2df833f3264b163bad109ccd1a88f71b298aa028303bc4dd17cf6c79145876a01e97292653c1e1d9eda6842dc01
102Size (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = 87786274 bytes 102Size (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = 87786274 bytes
103SHA1 (rustc-1.37.0-src.tar.gz) = 8613fc28896b2f0d6d8770ea52ce54804ca751df 103SHA1 (rustc-1.37.0-src.tar.gz) = 8613fc28896b2f0d6d8770ea52ce54804ca751df
104RMD160 (rustc-1.37.0-src.tar.gz) = 13355233d894bad13fd6b63277a72f81f9a25ff0 104RMD160 (rustc-1.37.0-src.tar.gz) = 13355233d894bad13fd6b63277a72f81f9a25ff0
105SHA512 (rustc-1.37.0-src.tar.gz) = d75dd3b664f4467750b93786126051f8a1d33e24823951bbe2a56b2c1f6c829c35dcfb7dbce2f98c5de212d882ab8bccdd99bb57facdb4bc1870eb81de824d74 105SHA512 (rustc-1.37.0-src.tar.gz) = d75dd3b664f4467750b93786126051f8a1d33e24823951bbe2a56b2c1f6c829c35dcfb7dbce2f98c5de212d882ab8bccdd99bb57facdb4bc1870eb81de824d74
106Size (rustc-1.37.0-src.tar.gz) = 154114925 bytes 106Size (rustc-1.37.0-src.tar.gz) = 154114925 bytes
107SHA1 (patch-src_bootstrap_bin_rustc.rs) = 5e6b0cb25401db4fef6e74f73764e69f3c09569c 107SHA1 (patch-src_bootstrap_bin_rustc.rs) = 5e6b0cb25401db4fef6e74f73764e69f3c09569c
108SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756 108SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756
109SHA1 (patch-src_bootstrap_builder.rs) = 7e23348dc5555fdb3833a7f8734cfe687c6e533c 109SHA1 (patch-src_bootstrap_builder.rs) = 7e23348dc5555fdb3833a7f8734cfe687c6e533c
110SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417 110SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417
111SHA1 (patch-src_build__helper_lib.rs) = ef0b522e303f0490b86e64f40733c2ecb498da5b 111SHA1 (patch-src_build__helper_lib.rs) = ef0b522e303f0490b86e64f40733c2ecb498da5b
112SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0 112SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0
113SHA1 (patch-src_librustc__llvm_build.rs) = d6e71891eb8d42a9c4175505ba7ed98338153860 113SHA1 (patch-src_librustc__llvm_build.rs) = 7cc2aa0568aa2cbf4eb1fdbb00922b10df0b3ff6
114SHA1 (patch-src_librustc__target_spec_solaris__base.rs) = 21db8af802edecb5e35ce78ee9af7c4935b4040f 114SHA1 (patch-src_librustc__target_spec_solaris__base.rs) = 21db8af802edecb5e35ce78ee9af7c4935b4040f
115SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa 115SHA1 (patch-src_librustc__target_spec_x86__64__sun__solaris.rs) = f6ad33b41906bbf83a1cbd0e2fe13a4da37266fa
116SHA1 (patch-src_libstd_build.rs) = aa7020339ccc2888d1302721e1a38f7a4e0925a3 116SHA1 (patch-src_libstd_build.rs) = 9cfa91a11a575d5fef6d3e208864745a24770850
117SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a 117SHA1 (patch-src_libstd_sys_unix_thread.rs) = 2554f1a42afaa0ddce5053860f4dabecdf6c527a
118SHA1 (patch-src_libunwind_build.rs) = c0a0aa9749705be07afe8eaaa0c7d70affa46566 118SHA1 (patch-src_libunwind_build.rs) = c0a0aa9749705be07afe8eaaa0c7d70affa46566
119SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427 119SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
120SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 19daf5f8a26bfaebca942b5cbe8521fb060fe8d9 120SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = 19daf5f8a26bfaebca942b5cbe8521fb060fe8d9
121SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a 121SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = 7588a46aaa277ef04b33ac6d904b9d1d81579f2a
122SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6 122SHA1 (patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h) = 977de4b2a9d37f7e7c782f2407c15591e032b6c6
123SHA1 (patch-src_llvm-project_llvm_lib_Support_Unix_Signals.inc) = 4639febcf009bde6256695060b4c8cce3b327082 123SHA1 (patch-src_llvm-project_llvm_lib_Support_Unix_Signals.inc) = 4639febcf009bde6256695060b4c8cce3b327082
124SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 498395d1ae5b791b9e4710a856fdebe2fb87011e 124SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 498395d1ae5b791b9e4710a856fdebe2fb87011e
125SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80 125SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = 3aac5d54a6fe96b9559552e67e497488142d4e80
126SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c 126SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 10e6c1253adac0262b000aec7636fa0d2ebb666c
127SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7 127SHA1 (patch-src_tools_rls_rls_src_cmd.rs) = fade3e60fecac5c4e4d4ee5bee82659b4eb385b7
128SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34 128SHA1 (patch-src_tools_rls_rls_src_server_io.rs) = 51af64526db55abcf6b4b3165df314a16cf62e34
129SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2 129SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2
cvs diff -r1.5 -r1.6 pkgsrc/lang/rust/patches/Attic/patch-src_librustc__llvm_build.rs (expand / switch to unified diff)

--- 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 @@ @@ -1,21 +1,21 @@
1$NetBSD: patch-src_librustc__llvm_build.rs,v 1.5 2019/04/14 12:49:17 he Exp $ 1$NetBSD: patch-src_librustc__llvm_build.rs,v 1.6 2019/09/19 17:37:29 jperkin Exp $
2 2
3fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this. 3fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
4 4
5--- src/librustc_llvm/build.rs.orig 2019-04-10 18:45:55.000000000 +0000 5--- src/librustc_llvm/build.rs.orig 2019-08-13 06:27:22.000000000 +0000
6+++ src/librustc_llvm/build.rs 6+++ src/librustc_llvm/build.rs
7@@ -246,7 +246,13 @@ fn main() { 7@@ -261,7 +261,13 @@ fn main() {
8 "c++" 8 "c++"
9 } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() { 9 } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
10 // NetBSD uses a separate library when relocation is required 10 // NetBSD uses a separate library when relocation is required
11- "stdc++_pic" 11- "stdc++_pic"
12+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { 12+ if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
13+ "c++_pic" 13+ "c++_pic"
14+ } else { 14+ } else {
15+ "stdc++_pic" 15+ "stdc++_pic"
16+ } 16+ }
17+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() { 17+ } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
18+ "c++" 18+ "c++"
19 } else if llvm_use_libcxx.is_some() { 19 } else if llvm_use_libcxx.is_some() {
20 "c++" 20 "c++"
21 } else { 21 } else {
cvs diff -r1.4 -r1.5 pkgsrc/lang/rust/patches/Attic/patch-src_libstd_build.rs (expand / switch to unified diff)

--- 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,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: patch-src_libstd_build.rs,v 1.4 2019/07/05 09:55:31 he Exp $ 1$NetBSD: patch-src_libstd_build.rs,v 1.5 2019/09/19 17:37:29 jperkin Exp $
2 2
3SunOS support: 3SunOS support:
4 - Support PKGSRC_USE_SSP (ugly for now). 4 - Support PKGSRC_USE_SSP (ugly for now).
5 - Add libumem support. 5 - Add libumem support.
6 - Add libexecinfo for backtrace(). 6 - Add libexecinfo for backtrace().
7 7
8--- src/libstd/build.rs.orig 2019-01-16 09:30:27.000000000 +0000 8--- src/libstd/build.rs.orig 2019-08-13 06:27:22.000000000 +0000
9+++ src/libstd/build.rs 9+++ src/libstd/build.rs
10@@ -18,6 +18,7 @@ fn main() { 10@@ -18,6 +18,7 @@ fn main() {
11 println!("cargo:rustc-link-lib=execinfo"); 11 println!("cargo:rustc-link-lib=execinfo");
12 println!("cargo:rustc-link-lib=pthread"); 12 println!("cargo:rustc-link-lib=pthread");
13 } else if target.contains("netbsd") { 13 } else if target.contains("netbsd") {
14+ println!("cargo:rustc-link-lib=execinfo"); 14+ println!("cargo:rustc-link-lib=execinfo");
15 println!("cargo:rustc-link-lib=pthread"); 15 println!("cargo:rustc-link-lib=pthread");
16 println!("cargo:rustc-link-lib=rt"); 16 println!("cargo:rustc-link-lib=rt");
17 } else if target.contains("dragonfly") || target.contains("openbsd") { 17 } else if target.contains("dragonfly") || target.contains("openbsd") {
18@@ -27,6 +28,9 @@ fn main() { 18@@ -27,6 +28,10 @@ fn main() {
19 println!("cargo:rustc-link-lib=posix4"); 19 println!("cargo:rustc-link-lib=posix4");
20 println!("cargo:rustc-link-lib=pthread"); 20 println!("cargo:rustc-link-lib=pthread");
21 println!("cargo:rustc-link-lib=resolv"); 21 println!("cargo:rustc-link-lib=resolv");
 22+ println!("cargo:rustc-link-lib=nsl");
22+ // pkgsrc hack until I can figure out how to pass it through properly 23+ // pkgsrc hack until I can figure out how to pass it through properly
23+ println!("cargo:rustc-link-lib=ssp"); 24+ println!("cargo:rustc-link-lib=ssp");
24+ println!("cargo:rustc-link-lib=umem"); 25+ println!("cargo:rustc-link-lib=umem");
25 } else if target.contains("apple-darwin") { 26 } else if target.contains("apple-darwin") {
26 println!("cargo:rustc-link-lib=System"); 27 println!("cargo:rustc-link-lib=System");
27  28