rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rust: Update to 1.49.0. 

Merge some bits from pkgsrc while here, and more tabs->spaces to fix the
test suite.
This commit is contained in:
Jonathan Perkin 2021-01-04 14:58:05 +00:00
parent 3c0c785332
commit fd082cb269
8 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rust/Makefile
View File

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.197 2020/09/29 16:45:16 gdt Exp $
DISTNAME= rustc-1.48.0-src
DISTNAME= rustc-1.49.0-src
PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/
@ -325,8 +325,8 @@ SUBST_VARS.rpath= PREFIX
# updating and verification.
#
CKSUM_CRATES+= vendor/libc
CKSUMS+= a9e46c0eee970cb5b4bd910924141d223fad4aa45380d3df1ce4b25992a13037
CKSUMS+= 41394431697e352653c37188233bd44776881eb704132203b1a232271d1afd92
CKSUMS+= 0134ce769d06b1b1f50ad15d1aa7bd8d44bcd2f66c6318dd906de8bc4a4044c7
CKSUMS+= 1107d18986be8af262f7a7c14761a9faf0228dc8a773379b9d7e8d2f711b3f37
CKSUM_CRATES+= vendor/lzma-sys
CKSUMS+= 6fd5e9245db34c6f557b8bfcaf03db82fc88c3b06dbfbb5f03b2bcd138983ef9
@ -341,8 +341,8 @@ CKSUMS+= fd072307ebbaa01cfe1fd7553d7f42d27093b2bd32dd81d419d2e1c9423495a0
CKSUMS+= 9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
CKSUM_CRATES+= vendor/openssl-src
CKSUMS+= 29499e62a2cde2fda48d21df58812ee5c198ef744522992bde8faae76747ac08
CKSUMS+= e34f9921c6531d043f3516821442aaeda86c7912d40cbddaf79bba6b08c37952
CKSUMS+= 03dcdaac7de880b860ecfe859ba2ac3e46c8f46a7bf948aa674147eebee421b0
CKSUMS+= 41ab6811d4ffde68f245e5097081ba8052a07a4b86df69a356ba11205e7e2210
SUBST_CLASSES+= cksum
SUBST_STAGE.cksum= pre-configure

18
rust/distinfo
View File

@ -100,21 +100,21 @@ SHA1 (rust-std-1.47.0-x86_64-unknown-netbsd.tar.gz) = c5cfef99946d0868031bcadd19
RMD160 (rust-std-1.47.0-x86_64-unknown-netbsd.tar.gz) = b463eff178c6ba0bb8f375e079c0e09a6bd00834
SHA512 (rust-std-1.47.0-x86_64-unknown-netbsd.tar.gz) = 5696d3ad8db20e250dc4d93130160b61b7e359623b0838edd8a836cc126264dcdccddba7f50c968d98c02472880ebffe2057f48b2ab2c8cab7be54eb708ad3ef
Size (rust-std-1.47.0-x86_64-unknown-netbsd.tar.gz) = 30938962 bytes
SHA1 (rustc-1.48.0-src.tar.gz) = a26f089d27c9cc283a7305fc8ece6b4674a036fd
RMD160 (rustc-1.48.0-src.tar.gz) = 28b6c2319a29c8f4282bf15da2c97d8c43bb27e1
SHA512 (rustc-1.48.0-src.tar.gz) = e28e5f0813cfd94fb92399a2d64aa19bdf0933b5fc768ea10da2a5b787c94bac6a5efb98b2c3702da3d1c46c6766b157df3727e5845b4b83a237b44ec45b27ba
Size (rustc-1.48.0-src.tar.gz) = 154487032 bytes
SHA1 (rustc-1.49.0-src.tar.gz) = 561f8d3b09bde24aa7998a8ae0e35d3429fa7016
RMD160 (rustc-1.49.0-src.tar.gz) = f690ef8098a64eaf1dab3122140cacf0cf4d6a32
SHA512 (rustc-1.49.0-src.tar.gz) = 033aa9fb9b9a79055ee075c33c27ae40defe7430972057a6477829070b5f54f8fc5082d36f5c751a2fb4cdfcf0d83db7b879dee15a8c4229b517295d6b7b6896
Size (rustc-1.49.0-src.tar.gz) = 157809463 bytes
SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 72746bbf0fa5e72fe151c95e3876b9eb1e70ae39
SHA1 (patch-compiler_rustc__llvm_build.rs) = b5157022f0f1942ae2db1ab78145af1526780b18
SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = c3a7ad7c218c405f5408562f720186cbfd4c665b
SHA1 (patch-compiler_rustc__target_src_spec_solaris__base.rs) = bcc420e4c8148cc0c92826aa7d146fc47e7c4863
SHA1 (patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs) = 2c6f22a6c8412573b0e5ad436c8a231a3b740326
SHA1 (patch-compiler_rustc__target_src_spec_netbsd__base.rs) = 877d185e5ca58a3a3f145558be527185a276c154
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) = 34b95b6dcaa788fe7e0e10e9c77a796d35e6ca14
SHA1 (patch-library_std_src_sys_unix_thread.rs) = f3af869fba5bc0ab8d28042f55fe830f93b8ef54
SHA1 (patch-library_unwind_build.rs) = ae096a20aed95304eb3806be4cd237fe4ffd9afb
SHA1 (patch-src_bootstrap_bootstrap.py) = 53e0409527f3e52dd00b5c86e6c38047626e2379
SHA1 (patch-src_bootstrap_builder.rs) = 59d7ac0c525f232ed5d89ef725b6cad9fa13d23f
SHA1 (patch-src_bootstrap_builder.rs) = 082d312bbad522ae6b0e2d9e08cb1ba0c8fbac25
SHA1 (patch-src_bootstrap_compile.rs) = 67d5ad13e13e6818535a319f55e990d511e7b83f
SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6
SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
@ -130,5 +130,5 @@ SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773
SHA1 (patch-vendor_libc_src_unix_solarish_mod.rs) = 804ea03be546fef0d2bd37d7f8abb26d38a7892b
SHA1 (patch-vendor_lzma-sys_config.h) = b654c7e129fa02697734bc87173f89b3056a5437
SHA1 (patch-vendor_net2_src_ext.rs) = 5c34f3eaaa0589eefe14d374d34fadd4900565fd
SHA1 (patch-vendor_openssl-src_src_lib.rs) = 1512fa1da8c19aebca27ac5576293b7e7447aa40
SHA1 (patch-vendor_openssl-src_src_lib.rs) = dd79a75e4d570567ac02e8dbb42695682762d9e4
SHA1 (patch-vendor_stacker_src_lib.rs) = 2f4db9971c0558ec7034052c810b8c8be80c4ae3

13
rust/options.mk
View File

@ -1,7 +1,7 @@
# $NetBSD: options.mk,v 1.7 2020/06/24 09:46:26 nia Exp $
# $NetBSD: options.mk,v 1.8 2021/01/01 20:44:48 he Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rust
PKG_SUPPORTED_OPTIONS= # empty
PKG_SUPPORTED_OPTIONS+= rust-cargo-static
.include "../../mk/bsd.fast.prefs.mk"
@ -14,8 +14,9 @@ PKG_SUGGESTED_OPTIONS+= rust-llvm
. endif
.endif
PKG_SUPPORTED_OPTIONS+= rust-cargo-static
PKG_SUGGESTED_OPTIONS+= rust-cargo-static
#.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= rust-cargo-static
#.endif
.include "../../mk/bsd.options.mk"
@ -39,10 +40,10 @@ MAKE_ENV+= LIBRARY_PATH=${BUILDLINK_PREFIX.llvm}/lib
# (openssl and curl specifically).
#
.if !empty(PKG_OPTIONS:Mrust-cargo-static)
CONFIGURE_ARGS+= --enable-cargo-native-static
CONFIGURE_ARGS+= --enable-cargo-native-static
.else
BUILDLINK_API_DEPENDS.nghttp2+= nghttp2>=1.41.0
BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
.include "../../www/curl/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.endif

2
rust/patches/patch-compiler_rustc__target_src_spec_netbsd__base.rs
View File

@ -9,7 +9,7 @@ search the directory containing the symlinks to -latomic.
// libraries which follow this flag. Thus, use it before
// specifying libraries to link to.
"-Wl,--as-needed".to_string(),
+ // For the benefit of powerpc, when libatomic-links is installed,
+ // For the benefit of powerpc, when libatomic-links is installed,
+ "-Wl,-L@PREFIX@/lib/libatomic".to_string(),
],
);

6
rust/patches/patch-compiler_rustc__target_src_spec_solaris__base.rs
View File

@ -2,11 +2,11 @@ $NetBSD$
Enable frame pointers on SunOS.
--- compiler/rustc_target/src/spec/solaris_base.rs.orig 2020-11-16 14:01:53.000000000 +0000
--- compiler/rustc_target/src/spec/solaris_base.rs.orig 2020-12-29 03:03:08.000000000 +0000
+++ compiler/rustc_target/src/spec/solaris_base.rs
@@ -7,6 +7,7 @@ pub fn opts() -> TargetOptions {
@@ -9,6 +9,7 @@ pub fn opts() -> TargetOptions {
has_rpath: true,
target_family: Some("unix".to_string()),
os_family: Some("unix".to_string()),
is_like_solaris: true,
+ eliminate_frame_pointer: false,
limit_rdylib_exports: false, // Linker doesn't support this

6
rust/patches/patch-compiler_rustc__target_src_spec_x86__64__sun__solaris.rs
View File

@ -2,13 +2,13 @@ $NetBSD$
Disable stack probes on SunOS.
--- compiler/rustc_target/src/spec/x86_64_sun_solaris.rs.orig 2020-11-16 14:01:53.000000000 +0000
--- compiler/rustc_target/src/spec/x86_64_sun_solaris.rs.orig 2020-12-29 03:03:08.000000000 +0000
+++ compiler/rustc_target/src/spec/x86_64_sun_solaris.rs
@@ -5,7 +5,6 @@ pub fn target() -> TargetResult {
@@ -5,7 +5,6 @@ pub fn target() -> Target {
base.pre_link_args.insert(LinkerFlavor::Gcc, vec!["-m64".to_string()]);
base.cpu = "x86-64".to_string();
base.max_atomic_width = Some(64);
- base.stack_probes = true;
Ok(Target {
Target {
llvm_target: "x86_64-pc-solaris".to_string(),

8
rust/patches/patch-src_bootstrap_builder.rs
View File

@ -5,17 +5,17 @@ Use @PREFIX@, not $ORIGIN in rpath.
Fix RPATH for pkgsrc.
--- src/bootstrap/builder.rs.orig 2020-11-16 14:01:53.000000000 +0000
--- src/bootstrap/builder.rs.orig 2020-12-29 03:03:09.000000000 +0000
+++ src/bootstrap/builder.rs
@@ -475,7 +475,6 @@ impl<'a> Builder<'a> {
@@ -480,7 +480,6 @@ impl<'a> Builder<'a> {
install::Clippy,
install::Miri,
install::Analysis,
- install::Src,
install::Rustc
),
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest,),
@@ -1001,7 +1000,7 @@ impl<'a> Builder<'a> {
Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest),
@@ -1065,7 +1064,7 @@ impl<'a> Builder<'a> {
rustflags.arg("-Zosx-rpath-install-name");
Some("-Wl,-rpath,@loader_path/../lib")
} else if !target.contains("windows") {

19
rust/patches/patch-vendor_openssl-src_src_lib.rs
View File

@ -2,7 +2,7 @@ $NetBSD: patch-vendor_openssl-src_src_lib.rs,v 1.1 2021/01/01 20:44:48 he Exp $
Provide defaults for the various NetBSD targets.
--- vendor/openssl-src/src/lib.rs.orig 2020-11-16 14:27:50.000000000 +0000
--- vendor/openssl-src/src/lib.rs.orig 2020-12-29 03:36:31.000000000 +0000
+++ vendor/openssl-src/src/lib.rs
@@ -167,6 +167,7 @@ impl Build {
"aarch64-unknown-freebsd" => "BSD-generic64",
@ -16,29 +16,30 @@ Provide defaults for the various NetBSD targets.
"armv7-unknown-freebsd" => "BSD-generic32",
"armv7-unknown-linux-gnueabihf" => "linux-armv4",
"armv7-unknown-linux-musleabihf" => "linux-armv4",
+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
+ "armv7-unknown-netbsd-eabihf" => "BSD-generic32",
"asmjs-unknown-emscripten" => "gcc",
"i686-apple-darwin" => "darwin-i386-cc",
"i686-linux-android" => "linux-elf",
@@ -186,6 +188,7 @@ impl Build {
"i586-unknown-linux-gnu" => "linux-elf",
"i586-unknown-linux-musl" => "linux-elf",
@@ -188,6 +190,7 @@ impl Build {
"i686-unknown-freebsd" => "BSD-x86-elf",
"i686-unknown-linux-gnu" => "linux-elf",
"i686-unknown-linux-musl" => "linux-elf",
+ "i686-unknown-netbsd" => "BSD-x86-elf",
+ "i686-unknown-netbsd" => "BSD-x86-elf",
"mips-unknown-linux-gnu" => "linux-mips32",
"mips-unknown-linux-musl" => "linux-mips32",
"mips64-unknown-linux-gnuabi64" => "linux64-mips64",
@@ -193,11 +196,13 @@ impl Build {
@@ -195,12 +198,14 @@ impl Build {
"mipsel-unknown-linux-gnu" => "linux-mips32",
"mipsel-unknown-linux-musl" => "linux-mips32",
"powerpc-unknown-linux-gnu" => "linux-ppc",
+ "powerpc-unknown-netbsd" => "BSD-generic32",
+ "powerpc-unknown-netbsd" => "BSD-generic32",
"powerpc64-unknown-freebsd" => "BSD-generic64",
"powerpc64-unknown-linux-gnu" => "linux-ppc64",
"powerpc64le-unknown-freebsd" => "BSD-generic64",
"powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
"riscv64gc-unknown-linux-gnu" => "linux-generic64",
"s390x-unknown-linux-gnu" => "linux64-s390x",
+ "sparc64-unknown-netbsd" => "BSD-generic64",
+ "sparc64-unknown-netbsd" => "BSD-generic64",
"x86_64-apple-darwin" => "darwin64-x86_64-cc",
"x86_64-linux-android" => "linux-x86_64",
"x86_64-pc-windows-gnu" => "mingw64",