pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust Remove a patch which no longer applies.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d359cfdc37f
branches:  trunk
changeset: 450583:3d359cfdc37f
user:      he <he%pkgsrc.org@localhost>
date:      Tue Apr 20 08:25:51 2021 +0000

description:
Remove a patch which no longer applies.
This appears to no longer be needed.
I could swear I had done a successful re-build before the previous commit,
so not sure how that happened.
Build fix, so no revision bump.

diffstat:

 lang/rust/distinfo                           |   3 +-
 lang/rust/patches/patch-library_std_build.rs |  32 ----------------------------
 2 files changed, 1 insertions(+), 34 deletions(-)

diffs (53 lines):

diff -r ef4b23f26c3b -r 3d359cfdc37f lang/rust/distinfo
--- a/lang/rust/distinfo        Tue Apr 20 06:30:47 2021 +0000
+++ b/lang/rust/distinfo        Tue Apr 20 08:25:51 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.129 2021/04/19 17:08:09 he Exp $
+$NetBSD: distinfo,v 1.130 2021/04/20 08:25:51 he Exp $
 
 SHA1 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 97804c99b787a54bf16c0c13665eb74cab6c7bba
 RMD160 (rust-1.49.0-aarch64-unknown-netbsd.tar.gz) = 5940c473d0655dc50efc10d2a7dc4bb7c0b85590
@@ -104,7 +104,6 @@
 SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = f0b41a3a5685ae33d037f8ded0b1fa6f1acb0867
 SHA1 (patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs) = f629fcf782c0c915c2921456eb1ffa8e91c244c1
 SHA1 (patch-library_backtrace_crates_backtrace-sys_src_libbacktrace_configure) = 5dc1cfc843894156b513c86453db5032917a5529
-SHA1 (patch-library_std_build.rs) = c69af2a424bca60bc91741b8d4cb5fd633bbacca
 SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe241e2d32
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = c431e3221849e3220fc63b072984ccb1896f83c8
 SHA1 (patch-library_unwind_build.rs) = 2cff0229bfb26445ea3f2e2e5b6e4ea8884df28f
diff -r ef4b23f26c3b -r 3d359cfdc37f lang/rust/patches/patch-library_std_build.rs
--- a/lang/rust/patches/patch-library_std_build.rs      Tue Apr 20 06:30:47 2021 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-library_std_build.rs,v 1.1 2020/11/13 20:35:58 he Exp $
-
-- Support PKGSRC_USE_SSP (ugly for now).
-- Add libexecinfo for backtrace().
-
---- library/std/build.rs.orig  2020-10-07 07:53:22.000000000 +0000
-+++ library/std/build.rs
-@@ -20,6 +20,7 @@ fn main() {
-             println!("cargo:rustc-cfg=freebsd12");
-         }
-     } else if target.contains("netbsd") {
-+        println!("cargo:rustc-link-lib=execinfo");
-         println!("cargo:rustc-link-lib=pthread");
-         println!("cargo:rustc-link-lib=rt");
-     } else if target.contains("dragonfly") || target.contains("openbsd") {
-@@ -29,12 +30,16 @@ 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");
-+      println!("cargo:rustc-link-lib=ssp");
-+      println!("cargo:rustc-link-lib=umem");
-     } else if target.contains("illumos") {
-         println!("cargo:rustc-link-lib=socket");
-         println!("cargo:rustc-link-lib=posix4");
-         println!("cargo:rustc-link-lib=pthread");
-         println!("cargo:rustc-link-lib=resolv");
-         println!("cargo:rustc-link-lib=nsl");
-+      println!("cargo:rustc-link-lib=ssp");
-         // Use libumem for the (malloc-compatible) allocator
-         println!("cargo:rustc-link-lib=umem");
-     } else if target.contains("apple-darwin") {



Home | Main Index | Thread Index | Old Index