Received: by mail.netbsd.org (Postfix, from userid 605) id 9FE0984D9C; Thu, 19 Sep 2019 17:37:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 27F0284D9A for ; Thu, 19 Sep 2019 17:37:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wU_-KKtnwUfU for ; Thu, 19 Sep 2019 17:37:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 647D084D76 for ; Thu, 19 Sep 2019 17:37:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5D4D1FBF4; Thu, 19 Sep 2019 17:37:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1568914649120180" MIME-Version: 1.0 Date: Thu, 19 Sep 2019 17:37:29 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/rust To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190919173729.5D4D1FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1568914649120180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Sep 19 17:37:29 UTC 2019 Modified Files: pkgsrc/lang/rust: distinfo pkgsrc/lang/rust/patches: patch-src_librustc__llvm_build.rs patch-src_libstd_build.rs Log Message: rust: SunOS now requires libnsl. While here fix some tabs->spaces to make the test suite work again. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 pkgsrc/lang/rust/distinfo cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/rust/patches/patch-src_libstd_build.rs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1568914649120180 Content-Disposition: inline Content-Length: 4674 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust/distinfo diff -u pkgsrc/lang/rust/distinfo:1.87 pkgsrc/lang/rust/distinfo:1.88 --- pkgsrc/lang/rust/distinfo:1.87 Tue Sep 17 08:03:27 2019 +++ pkgsrc/lang/rust/distinfo Thu Sep 19 17:37:29 2019 @@ -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_builder.rs) = 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 Index: pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs diff -u pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs:1.5 pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs:1.6 --- pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs:1.5 Sun Apr 14 12:49:17 2019 +++ pkgsrc/lang/rust/patches/patch-src_librustc__llvm_build.rs Thu Sep 19 17:37:29 2019 @@ -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 { Index: pkgsrc/lang/rust/patches/patch-src_libstd_build.rs diff -u pkgsrc/lang/rust/patches/patch-src_libstd_build.rs:1.4 pkgsrc/lang/rust/patches/patch-src_libstd_build.rs:1.5 --- pkgsrc/lang/rust/patches/patch-src_libstd_build.rs:1.4 Fri Jul 5 09:55:31 2019 +++ pkgsrc/lang/rust/patches/patch-src_libstd_build.rs Thu Sep 19 17:37:29 2019 @@ -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 @@ SunOS support: 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"); --_----------=_1568914649120180--