[pkgsrc/trunk]: pkgsrc/lang/rust Regen distinfo and add more patch for RPATH ...

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3660dd828da
branches:  trunk
changeset: 417493:d3660dd828da
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Tue Nov 12 12:06:04 2019 +0000

description:
Regen distinfo and add more patch for RPATH to fix build

diffstat:

 lang/rust/Makefile                               |   3 +-
 lang/rust/distinfo                               |  36 ++++++++++++------------
 lang/rust/patches/patch-src_bootstrap_builder.rs |  15 ++++++++--
 3 files changed, 32 insertions(+), 22 deletions(-)

diffs (123 lines):

diff -r 82c2df8f8de0 -r d3660dd828da lang/rust/Makefile
--- a/lang/rust/Makefile        Tue Nov 12 10:50:31 2019 +0000
+++ b/lang/rust/Makefile        Tue Nov 12 12:06:04 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2019/11/11 14:56:41 jperkin Exp $
+# $NetBSD: Makefile,v 1.127 2019/11/12 12:06:04 ryoon Exp $
 
 DISTNAME=      rustc-1.39.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -292,6 +292,7 @@
 SUBST_FILES.rpath=     src/bootstrap/bin/rustc.rs
 SUBST_FILES.rpath+=    src/build_helper/lib.rs
 SUBST_FILES.rpath+=    src/librustc_codegen_ssa/back/linker.rs
+SUBST_FILES.rpath+=    src/bootstrap/builder.rs
 SUBST_VARS.rpath=      PREFIX
 
 post-extract:
diff -r 82c2df8f8de0 -r d3660dd828da lang/rust/distinfo
--- a/lang/rust/distinfo        Tue Nov 12 10:50:31 2019 +0000
+++ b/lang/rust/distinfo        Tue Nov 12 12:06:04 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2019/11/11 14:56:41 jperkin Exp $
+$NetBSD: distinfo,v 1.95 2019/11/12 12:06:04 ryoon 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
@@ -20,10 +20,6 @@
 RMD160 (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = 2b10578cae6523f88d2ce5af8e81dad67e1a5065
 SHA512 (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = 9d18f57d0d42df6f2f9e3c496a24b97472aca7fc75b7d5747aa57c1c99a923f63c9a22df69891cb2b372fd61242741b27cef2d2bebb95b3fffc4650d99e49259
 Size (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = 180844312 bytes
-SHA1 (rust-1.37.0-sparc64-unknown-netbsd.tar.gz) = 2f32d18698cfd5642088f6d7189a0e596204e0eb
-RMD160 (rust-1.37.0-sparc64-unknown-netbsd.tar.gz) = 88a52aecc08a1f19f55cd3020d25c7ac25abca66
-SHA512 (rust-1.37.0-sparc64-unknown-netbsd.tar.gz) = e7b257d92edef7ef5c5c33b5c690cf4b41517bb7e3b39d2907ee31668c3a9d81a9adaaeff97e8c485e40fdd36ff49994cfdac858801c8a4611150b567651fbf0
-Size (rust-1.37.0-sparc64-unknown-netbsd.tar.gz) = 189129050 bytes
 SHA1 (rust-1.37.0-x86_64-apple-darwin.tar.gz) = f3a69fb26eb4e7e5880f9a4217c8107cad3ffcff
 RMD160 (rust-1.37.0-x86_64-apple-darwin.tar.gz) = 91c94273dfdb277b38c6519f236c0c07e3b4099e
 SHA512 (rust-1.37.0-x86_64-apple-darwin.tar.gz) = 1d5fd005f86ecfc50518a142ceab0bac399c14efcbfae375d5ed13d6f1574f31af326e982ce5cc51b0cf9b4cab1cab749f290c07255ff0535a752ffa615a0c24
@@ -44,10 +40,14 @@
 RMD160 (rust-1.38.0-i686-unknown-netbsd.tar.gz) = c2716a3b917a0e291cd25d1c12910f30ee4b9878
 SHA512 (rust-1.38.0-i686-unknown-netbsd.tar.gz) = 8ccf290c34040c058f549fdd953e6e11568ca8e02585934ed896837b8be5ee241d56aa368ab3770cc74ce2e192a81918b478b07420443ed92c422c4327374212
 Size (rust-1.38.0-i686-unknown-netbsd.tar.gz) = 341906414 bytes
-SHA1 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 8dace3276e8be1ce9b0069170948e792e3f478f5
-RMD160 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = e6614e4d4f22a4052e25eb91d68049509fb39098
-SHA512 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = bd38a40356b85b2d1acc668f5cc6bfc4f9aedeeceda74de5244827af0d5ea87a9a40240299fe0c8344682f62e8b179ca2cf4adfc8527280c6a51e919e06110cc
-Size (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 332473263 bytes
+SHA1 (rust-1.38.0-sparc64-unknown-netbsd.tar.gz) = f8a84e6903b275dd6f1bb9e7c90186298e70e372
+RMD160 (rust-1.38.0-sparc64-unknown-netbsd.tar.gz) = 3a95ffc94d9577a6f370024805659604cc2fe542
+SHA512 (rust-1.38.0-sparc64-unknown-netbsd.tar.gz) = 3427493f6a539636b4db543021ebe4c8cabfb407841b1bda4685c39e9d9f5f01934ef2dc94e7cf25c313a07af82ad74359e59b0f393c5f2eb4c732ccdcf88582
+Size (rust-1.38.0-sparc64-unknown-netbsd.tar.gz) = 340053198 bytes
+SHA1 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 2907c2601150ffdda2dda5e7dbc98778e1f80045
+RMD160 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = b2679e49e7271a5b32e0fc472fee42808fdc6af2
+SHA512 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 24d901cb6094350535dac8f956989e9e80361286cf966a5b4cccc343c069255ecba9bb1bc151e3a7ca80795f056bcfe968604d0e21d6d820bfd085fc1fdf86aa
+Size (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 297828691 bytes
 SHA1 (rust-1.39.0-x86_64-sun-solaris.tar.gz) = a8fefd933cb4d8777382780153303fe24f812c16
 RMD160 (rust-1.39.0-x86_64-sun-solaris.tar.gz) = 6f95164db4462cfe9e0f21038695986aeabb8969
 SHA512 (rust-1.39.0-x86_64-sun-solaris.tar.gz) = ad4a702725efbffc50e4c908478cce2520d06214058e49257111533e88fb6d8e471da068d6b714c52b9b5dea2cb462351f6ee2d70d57fc7a90f3cad80540197e
@@ -72,10 +72,6 @@
 RMD160 (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 9e5413d4f42dd5eb3ba10633cee1ff05fdb5f56e
 SHA512 (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 4df6de00dda23fb107241d06255b168f4460bd41189cb4340c99f20740416ef66a302b6c2f7149bdef46c4d31700b6f779c7642b70cf0f6f2a1ea511c2d6a774
 Size (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 70015851 bytes
-SHA1 (rust-std-1.37.0-sparc64-unknown-netbsd.tar.gz) = 907db46f1100b7320757ac4a6d310f6378614af3
-RMD160 (rust-std-1.37.0-sparc64-unknown-netbsd.tar.gz) = 9fe4b65bf4958e063b8aa64393a2108cad7bcefc
-SHA512 (rust-std-1.37.0-sparc64-unknown-netbsd.tar.gz) = b81af6a8214f482b86a5b83b9c3ad8806f434a534d2b9e445a4a30283eab0404328eadb48bbf873bb6c4d33a8e76254fdfc751d021860615ffb2803e51ac91cd
-Size (rust-std-1.37.0-sparc64-unknown-netbsd.tar.gz) = 74968259 bytes
 SHA1 (rust-std-1.37.0-x86_64-apple-darwin.tar.gz) = 12a0f219bf9638ae495ecc9085642dc3cab1af58
 RMD160 (rust-std-1.37.0-x86_64-apple-darwin.tar.gz) = bacc38ce62b7cc64934fbc2007f5ba24593b6b69
 SHA512 (rust-std-1.37.0-x86_64-apple-darwin.tar.gz) = dace3dd91e79616d6cf3b60df2ffe4d347148bbb54306b031af63d86a154c400418944c6017ff6f65d38ef396d89b30d75110366a8286a763315ac7ebbbfef87
@@ -96,16 +92,20 @@
 RMD160 (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = a43ebc439004d0d8a3e5c149a95025e088427821
 SHA512 (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = cc0f250c021292405ea1043abbac8fc310c630d2c554fb58b4ebe7ca7b23fcf5c9d6553341282b661b15eb16958a3ccd0d7693707c4acb288cfa8f9fa08f1caa
 Size (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = 204889878 bytes
-SHA1 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 4316f27d90bf12d7dcc3e92dbdd7f5d8125c986e
-RMD160 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 6f20cdb3cb542485c94b1924e06c294c63ac63f3
-SHA512 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = abaab363a2995148493681f17306d6309cbe4c7d359b9ad1c961aa7e93692e60277ab0a98101d9da11fde1eb6097b42af074950c4359278f68247bb70bb3f11e
-Size (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 204274822 bytes
+SHA1 (rust-std-1.38.0-sparc64-unknown-netbsd.tar.gz) = 21f05aa0c3df4f33caa68957e796ec74bafe381d
+RMD160 (rust-std-1.38.0-sparc64-unknown-netbsd.tar.gz) = 0cf519baed4918ddc4825b5349489e3284cb6000
+SHA512 (rust-std-1.38.0-sparc64-unknown-netbsd.tar.gz) = e1418c2291703fdb5a9b39ae67cb65a3962809fa8466e9963cb8d93716d4710fe473527a9ca25b222063626f87ccde1f0a7e1e06009f2b194acd54bbd921cd54
+Size (rust-std-1.38.0-sparc64-unknown-netbsd.tar.gz) = 199522776 bytes
+SHA1 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = e821ae575d1f1e8b6c44af0bd0b59d814797029c
+RMD160 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = a9877f182d72729891a7ba918ab551ce79d5f9f8
+SHA512 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 7e0e031c1e2a5864f8f4185171ae44cba28c1f51a22ed7b9a724bc3478c6bc6defffdacab10fd970947a2899716de86c7dc5b64fa434254ea7e6c4f38e271b12
+Size (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 217882197 bytes
 SHA1 (rustc-1.39.0-src.tar.gz) = 82ef6f3b88b8d5e3bfa2fab67bbacf5d6f6ba6bb
 RMD160 (rustc-1.39.0-src.tar.gz) = d5b04b87fc336e3be7d592f70de0363aa66622aa
 SHA512 (rustc-1.39.0-src.tar.gz) = 77be74410b9f7a2e9f78f7a9860964e122ab9518553acc2cc80d5abeecf3302e9b3ed1fd29e022cccff1f9ff4a568b4015c0d3ac0a524f06e38e9cb360a3341e
 Size (rustc-1.39.0-src.tar.gz) = 152803201 bytes
 SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756
-SHA1 (patch-src_bootstrap_builder.rs) = f90a19cef1a53c4e7e24ab2ff441a618057efc8c
+SHA1 (patch-src_bootstrap_builder.rs) = a89dfcdf4ae573e1d6fcca4075e14cd543359732
 SHA1 (patch-src_bootstrap_lib.rs) = 59fc8949d98692550daba6f3e8119f71eed13fb2
 SHA1 (patch-src_build__helper_lib.rs) = ef0b522e303f0490b86e64f40733c2ecb498da5b
 SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0
diff -r 82c2df8f8de0 -r d3660dd828da lang/rust/patches/patch-src_bootstrap_builder.rs
--- a/lang/rust/patches/patch-src_bootstrap_builder.rs  Tue Nov 12 10:50:31 2019 +0000
+++ b/lang/rust/patches/patch-src_bootstrap_builder.rs  Tue Nov 12 12:06:04 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_bootstrap_builder.rs,v 1.3 2019/11/11 09:09:11 he Exp $
+$NetBSD: patch-src_bootstrap_builder.rs,v 1.4 2019/11/12 12:06:04 ryoon Exp $
 
 Do not install 'src'.
 
---- src/bootstrap/builder.rs.orig      2019-09-23 21:15:52.000000000 +0000
+--- src/bootstrap/builder.rs.orig      2019-11-04 15:45:21.000000000 +0000
 +++ src/bootstrap/builder.rs
-@@ -468,7 +468,6 @@ impl<'a> Builder<'a> {
+@@ -465,7 +465,6 @@ impl<'a> Builder<'a> {
                  install::Clippy,
                  install::Miri,
                  install::Analysis,
@@ -12,3 +12,12 @@
                  install::Rustc
              ),
          }
+@@ -971,7 +970,7 @@ impl<'a> Builder<'a> {
+             } else if !target.contains("windows") &&
+                       !target.contains("wasm32") &&
+                       !target.contains("fuchsia") {
+-                Some("-Wl,-rpath,$ORIGIN/../lib")
++                Some("-Wl,-rpath,@PREFIX@/lib")
+             } else {
+                 None
+             };