Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.48.0 +PORTVERSION?= 1.49.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -69,9 +69,8 @@ WASM_VARS_OFF= _RUST_BUILD_WASM=false # See WRKSRC/src/stage0.txt for the date and version values. -BOOTSTRAPS_DATE?= 2020-10-08 -RUST_BOOTSTRAP_VERSION?= 1.47.0 -CARGO_BOOTSTRAP_VERSION?= 0.48.0 +BOOTSTRAPS_DATE?= 2020-11-19 +RUST_BOOTSTRAP_VERSION?= 1.48.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} @@ -87,7 +86,7 @@ _RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} _RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} -_CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${_RUST_TARGET} +_CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${_RUST_TARGET} .include Index: lang/rust/distinfo =================================================================== --- lang/rust/distinfo +++ lang/rust/distinfo @@ -1,51 +1,51 @@ -TIMESTAMP = 1605689255 -SHA256 (rust/rustc-1.48.0-src.tar.xz) = ff0a242392a1865d7b2d08eb5ca6c1b3fd0820741d4c13a51a4b2d5d2bb53908 -SIZE (rust/rustc-1.48.0-src.tar.xz) = 105951736 -SHA256 (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 4809cfc78c13049f3c8da500f33242964dbe7aa4df3b511432a7f745ee9898e8 -SIZE (rust/2020-10-08/rustc-1.47.0-aarch64-unknown-freebsd.tar.xz) = 50672176 -SHA256 (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 0278b986c43e04611ee718c13babbd72fbe08d7765fff68d9a8b6d5bdc999831 -SIZE (rust/2020-10-08/rust-std-1.47.0-aarch64-unknown-freebsd.tar.xz) = 16961564 -SHA256 (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = bf8003784eb79710323c86fe46e42a37c901f2c64da6a122e0ea26a278b618a2 -SIZE (rust/2020-10-08/cargo-0.48.0-aarch64-unknown-freebsd.tar.xz) = 3267200 -SHA256 (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 4a6d872a6f4ba837e65f3a0689b59c3769c3645eede963e80919e374eafcd676 -SIZE (rust/2020-10-08/rustc-1.47.0-x86_64-unknown-freebsd.tar.xz) = 38800024 -SHA256 (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 783b5659440331807600d8e391f9da35684465843cd671e6236929fc295faf1d -SIZE (rust/2020-10-08/rust-std-1.47.0-x86_64-unknown-freebsd.tar.xz) = 18402664 -SHA256 (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 068d5a21faa84d8d7cf6c0c840f7060b370cb9a61ffd9e42d79bad87e0e2e58f -SIZE (rust/2020-10-08/cargo-0.48.0-x86_64-unknown-freebsd.tar.xz) = 4817536 -SHA256 (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = c1fa3a4f23c79cd7eee9bf876b04fba7f5d137c0ae7eedf52650874c5aaccf73 -SIZE (rust/2020-10-08/rustc-1.47.0-armv6-unknown-freebsd.tar.xz) = 37540840 -SHA256 (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = c80f48a0d2dc1da2767ba53f99005076857a1229687685a759a1558abee9056c -SIZE (rust/2020-10-08/rust-std-1.47.0-armv6-unknown-freebsd.tar.xz) = 16950080 -SHA256 (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = e3a323d54310501ead63da5ee1921355af415eaa4cfc8d9526351469e3b021e2 -SIZE (rust/2020-10-08/cargo-0.48.0-armv6-unknown-freebsd.tar.xz) = 4234128 -SHA256 (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 465abb5c5e9a645f3e45b1a9d5fdc9f6587feae12278ff1c6578ac182c6e04a5 -SIZE (rust/2020-10-08/rustc-1.47.0-armv7-unknown-freebsd.tar.xz) = 37322636 -SHA256 (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 8c5d8f9257044a95278fc9db563c6421d95c1a5ee74fb7e9717ed3526998947b -SIZE (rust/2020-10-08/rust-std-1.47.0-armv7-unknown-freebsd.tar.xz) = 16895888 -SHA256 (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4b0b7de3c50636d57fb9b137b0aacb479e71ec48eb5b0472c204f0420ab5bb76 -SIZE (rust/2020-10-08/cargo-0.48.0-armv7-unknown-freebsd.tar.xz) = 4224144 -SHA256 (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 42fe57233c01aee72857363c1a9159edb966ebc8e531bf0567f2ff74e46e3c53 -SIZE (rust/2020-10-08/rustc-1.47.0-i686-unknown-freebsd.tar.xz) = 40170160 -SHA256 (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 724c0f627a2167bfb0d4622a9306eb0385624b966669fecf114f59c1dda61ce9 -SIZE (rust/2020-10-08/rust-std-1.47.0-i686-unknown-freebsd.tar.xz) = 18333648 -SHA256 (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = ed3cd6121bd5e1a54526d61525ac546706b69cf9fa7ba79f7a0cf94464f3d4cf -SIZE (rust/2020-10-08/cargo-0.48.0-i686-unknown-freebsd.tar.xz) = 4891828 -SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 47e3df2e0a8fce74026bc48da0aad67228b6df7ea3fc75434fa36d0148a7afad -SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 43535196 -SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = c4a3c622e987352f6c574ead2c44f5009a64e9dcc292a7dbbb3efeaf2f0e0fb7 -SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16909364 -SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 76e97500d41060ae62bcca97e188c7b2200a06744402001aa108643e2fb08ea1 -SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4707416 -SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = dbd867e7dafca668feca05db717ebf6e6d6d31544f09a3ecd28de61edd971342 -SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 38752420 -SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 91958a7c3d07c47cd017e31c2a9d599c66da2b593002c73d1a1bb3fa97e9f79b -SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64le-unknown-freebsd.tar.xz) = 17004748 -SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 9409208a1fd44182c08e4111b28542a6ec6ee0a257347d8a5af06b981e9ce35f -SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64le-unknown-freebsd.tar.xz) = 4651420 -SHA256 (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 86b4ef213c780a5d2c88e85a5ca20ea2219fa919407a6bfc7661f2f23675a55f -SIZE (rust/2020-10-08/rustc-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 36841600 -SHA256 (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 62d951e288b2c56aa11780a95ce16cd9e56b4b13814b0c1bd2c2cc1ed187b283 -SIZE (rust/2020-10-08/rust-std-1.47.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16841320 -SHA256 (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = b628741be429426848c5f0a76e8aefa00a097c108512d48722795e04231a819e -SIZE (rust/2020-10-08/cargo-0.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4405904 +TIMESTAMP = 1609603291 +SHA256 (rust/rustc-1.49.0-src.tar.xz) = ebe910edc824a0a037a10be443446a0511923ba8342fa3c331ec8a22481d5d15 +SIZE (rust/rustc-1.49.0-src.tar.xz) = 108330280 +SHA256 (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = ddd1df1c6f8e512db33ee2ff43066ce6da12b93683a98acc536d5dc91e16a0be +SIZE (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 35584644 +SHA256 (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 0f7261e974fa49863aacc43d64024298efb75c897b014767006b3338fce5ac46 +SIZE (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 16716936 +SHA256 (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 463b643ed433e96588a5d2453ac8515cfd4249c155469610153d385d7872b150 +SIZE (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 4140392 +SHA256 (rust/2020-11-19/rustc-1.48.0-x86_64-unknown-freebsd.tar.xz) = 60306c65024dd56fc23ad23f3815bd2a405603eb9ca2f0695954127bc0c36308 +SIZE (rust/2020-11-19/rustc-1.48.0-x86_64-unknown-freebsd.tar.xz) = 38980996 +SHA256 (rust/2020-11-19/rust-std-1.48.0-x86_64-unknown-freebsd.tar.xz) = 2240679f9b4b94fa8dd028f215872d4255a67a6d8c119faeb73624e9a161ce60 +SIZE (rust/2020-11-19/rust-std-1.48.0-x86_64-unknown-freebsd.tar.xz) = 19142612 +SHA256 (rust/2020-11-19/cargo-1.48.0-x86_64-unknown-freebsd.tar.xz) = 284fc96854d9f189288a6b2e3039f0606ea64f937bae0ac63d55fd970bcc016a +SIZE (rust/2020-11-19/cargo-1.48.0-x86_64-unknown-freebsd.tar.xz) = 4822700 +SHA256 (rust/2020-11-19/rustc-1.48.0-armv6-unknown-freebsd.tar.xz) = 632ebc660a62d64ce96862bb1078a2402c69e9b0532efa9d7eed819067c24797 +SIZE (rust/2020-11-19/rustc-1.48.0-armv6-unknown-freebsd.tar.xz) = 37503040 +SHA256 (rust/2020-11-19/rust-std-1.48.0-armv6-unknown-freebsd.tar.xz) = e9545ce421149cfdd33ba0063b61c4e4a763ec76e3abc6abac6746974abe0b24 +SIZE (rust/2020-11-19/rust-std-1.48.0-armv6-unknown-freebsd.tar.xz) = 16662048 +SHA256 (rust/2020-11-19/cargo-1.48.0-armv6-unknown-freebsd.tar.xz) = f04648e7a4261d5bcc5c33c016ec6d6fe6a98c240e9d9556b1f2a28d9af4c39a +SIZE (rust/2020-11-19/cargo-1.48.0-armv6-unknown-freebsd.tar.xz) = 4249176 +SHA256 (rust/2020-11-19/rustc-1.48.0-armv7-unknown-freebsd.tar.xz) = 070eb9a6e3b4aabbc655686d4d43e607844a575e0ebebc1467598a23fc6f9826 +SIZE (rust/2020-11-19/rustc-1.48.0-armv7-unknown-freebsd.tar.xz) = 37454264 +SHA256 (rust/2020-11-19/rust-std-1.48.0-armv7-unknown-freebsd.tar.xz) = f5988190009891364f5fb0472bb03040d392674ed942755cd20a0438e8aeea01 +SIZE (rust/2020-11-19/rust-std-1.48.0-armv7-unknown-freebsd.tar.xz) = 16601188 +SHA256 (rust/2020-11-19/cargo-1.48.0-armv7-unknown-freebsd.tar.xz) = c0de3b44d341508cbaa48a34eb2c1e577636bb67d9d5c1fe9d4ac9b137b1e447 +SIZE (rust/2020-11-19/cargo-1.48.0-armv7-unknown-freebsd.tar.xz) = 4239624 +SHA256 (rust/2020-11-19/rustc-1.48.0-i686-unknown-freebsd.tar.xz) = 333946b1e923bd47166cefb4cb79b23ad2455ab2d59da0c0ba3e598c18861735 +SIZE (rust/2020-11-19/rustc-1.48.0-i686-unknown-freebsd.tar.xz) = 40390492 +SHA256 (rust/2020-11-19/rust-std-1.48.0-i686-unknown-freebsd.tar.xz) = 3b60d571ae6898a5d945f3636151339443a01e3c95fd0724a93cc4cdf1cf7e7b +SIZE (rust/2020-11-19/rust-std-1.48.0-i686-unknown-freebsd.tar.xz) = 19066848 +SHA256 (rust/2020-11-19/cargo-1.48.0-i686-unknown-freebsd.tar.xz) = 31ff75bcf7b05f37030732dbf3e69becd9f170d7360b04fe64e2db86337493d6 +SIZE (rust/2020-11-19/cargo-1.48.0-i686-unknown-freebsd.tar.xz) = 4908060 +SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5047ec64a5ddc12d9413e53e4101f19332761bf27842b2c32e44c985d008f0db +SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 43681308 +SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = d466b3e3c01dd0455b235956677b6aa4e95a020ee71173961aaf156e0b833877 +SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16659968 +SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a4671cbe5bab5fd75b1373f35d6c91b60760e944bdd9bf3ff3dc8601ea42066e +SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 4715748 +SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 9c044d7498c12aa4179a0121aa5339a8293abc2c75ec71c1bdcf97ec3f4d93ff +SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 38987020 +SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 6dddd82c3842d7da26aeacc6445cbe7ca65e96f0cdb7f1b4d3369030f6f91215 +SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 16742116 +SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = e287c3216d92326b5703287fb58ebea7d9690c2744021872e1097335715ab5fd +SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64le-unknown-freebsd.tar.xz) = 4656276 +SHA256 (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 0e3bbb22a95d338fa4ee80e9fe65eaa4b1d3a826fa3bc1fa20522aa10d4ef119 +SIZE (rust/2020-11-19/rustc-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 37129484 +SHA256 (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 79bd3ccb036153e63df229bc4d65a45e8f5f0daba930214dc1c70cb76e66cd8f +SIZE (rust/2020-11-19/rust-std-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 16631184 +SHA256 (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 7f6ab7edf18c87997fb0b6f563ab776a6af22dcbb655acc6d7c81b0a6fe0837c +SIZE (rust/2020-11-19/cargo-1.48.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4412520 Index: lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs =================================================================== --- lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs +++ lang/rust/files/powerpc64-elfv2/patch-compiler_rustc__target_src_spec_powerpc64__unknown__freebsd.rs @@ -1,14 +1,14 @@ ---- compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs.orig 2020-07-15 11:31:58 UTC +--- compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs.orig 2020-12-29 04:03:08 UTC +++ compiler/rustc_target/src/spec/powerpc64_unknown_freebsd.rs -@@ -17,6 +17,10 @@ pub fn target() -> TargetResult { - target_env: String::new(), - target_vendor: "unknown".to_string(), - linker_flavor: LinkerFlavor::Gcc, -- options: TargetOptions { target_mcount: "_mcount".to_string(), ..base }, +@@ -11,6 +11,10 @@ pub fn target() -> Target { + pointer_width: 64, + data_layout: "E-m:e-i64:64-n32:64".to_string(), + arch: "powerpc64".to_string(), +- options: TargetOptions { endian: "big".to_string(), mcount: "_mcount".to_string(), ..base }, + options: TargetOptions { -+ target_mcount: "_mcount".to_string(), ++ endian: "big".to_string(), ++ mcount: "_mcount".to_string(), + llvm_abiname: "elfv2".to_string(), -+ ..base -+ }, - }) ++ ..base }, + } } Index: lang/rust/files/powerpc64le/patch-vendor_openssl-src_src_lib.rs =================================================================== --- lang/rust/files/powerpc64le/patch-vendor_openssl-src_src_lib.rs +++ lang/rust/files/powerpc64le/patch-vendor_openssl-src_src_lib.rs @@ -1,10 +0,0 @@ ---- vendor/openssl-src/src/lib.rs.orig 2020-09-30 18:01:13.855023000 -0500 -+++ vendor/openssl-src/src/lib.rs 2020-09-30 18:02:06.365292000 -0500 -@@ -173,6 +173,7 @@ impl Build { - "powerpc-unknown-linux-gnu" => "linux-ppc", - "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",