diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -60,7 +60,7 @@ CARGO_BUILDDEP?= yes .if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT} .endif # Location of cargo binary (default to lang/rust's Cargo binary) diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -79,7 +79,7 @@ BUILD_DEPENDS+= llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \ rust-cbindgen>=0.19.0:devel/rust-cbindgen \ - ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT} \ + ${RUST_DEFAULT}>=1.56.0:lang/${RUST_DEFAULT} \ node:www/node LIB_DEPENDS+= libdrm.so:graphics/libdrm .if ${MOZILLA_VER:R:R} >= 85 @@ -101,7 +101,7 @@ .endif # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) unless LTO is enabled .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} || ${PORT_OPTIONS:MLTO} -LLVM_DEFAULT= 12 # chase bundled LLVM in lang/rust for LTO +LLVM_DEFAULT= 13 # chase bundled LLVM in lang/rust for LTO .endif # Require newer Clang than what's in base system unless user opted out . if ${CC} == cc && ${CXX} == c++ && exists(/usr/lib/libc++.so) diff --git a/lang/rust-bootstrap/Makefile b/lang/rust-bootstrap/Makefile --- a/lang/rust-bootstrap/Makefile +++ b/lang/rust-bootstrap/Makefile @@ -2,7 +2,7 @@ # to upload them to ~/public_distfiles on freefall in preparation # for the next lang/rust update. PORTNAME= rust -PORTVERSION= 1.55.0 +PORTVERSION= 1.56.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}- diff --git a/lang/rust-bootstrap/distinfo b/lang/rust-bootstrap/distinfo --- a/lang/rust-bootstrap/distinfo +++ b/lang/rust-bootstrap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631002417 -SHA256 (rust/rustc-1.55.0-src.tar.xz) = aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556 -SIZE (rust/rustc-1.55.0-src.tar.xz) = 117197580 +TIMESTAMP = 1634575103 +SHA256 (rust/rustc-1.56.0-src.tar.xz) = f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320 +SIZE (rust/rustc-1.56.0-src.tar.xz) = 121802340 diff --git a/lang/rust/Makefile b/lang/rust/Makefile --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,7 +1,7 @@ # Created by: Jyun-Yan You PORTNAME= rust -PORTVERSION?= 1.55.0 +PORTVERSION?= 1.56.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/:src \ @@ -53,7 +53,6 @@ OPTIONS_DEFINE= DOCS GDB SOURCES WASM OPTIONS_DEFAULT= SOURCES WASM OPTIONS_EXCLUDE_armv6= DOCS -OPTIONS_EXCLUDE_armv7= DOCS GDB_DESC= Install ports gdb (necessary for debugging rust programs) SOURCES_DESC= Install source files @@ -68,10 +67,8 @@ WASM_VARS_OFF= _RUST_BUILD_WASM=false # See WRKSRC/src/stage0.txt for the date and version values. -BOOTSTRAPS_DATE?= 2021-07-29 -BOOTSTRAPS_DATE_powerpc?= 2021-09-09 -RUST_BOOTSTRAP_VERSION?= 1.54.0 -RUST_BOOTSTRAP_VERSION_powerpc?= 1.55.0 +BOOTSTRAPS_DATE?= 2021-09-09 +RUST_BOOTSTRAP_VERSION?= 1.55.0 BOOTSTRAPS_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}} BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl} @@ -170,7 +167,6 @@ @${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml @${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml - @${ECHO_CMD} 'codegen-units=1' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml diff --git a/lang/rust/distinfo b/lang/rust/distinfo --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,57 +1,57 @@ -TIMESTAMP = 1631724657 -SHA256 (rust/rustc-1.55.0-src.tar.xz) = aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556 -SIZE (rust/rustc-1.55.0-src.tar.xz) = 117197580 -SHA256 (rust/2021-07-29/rustc-1.54.0-aarch64-unknown-freebsd.tar.xz) = 56efb59e3f7147d0c9ee2bb471737e5779cb1ea5e73234a64dc6291e666e49a3 -SIZE (rust/2021-07-29/rustc-1.54.0-aarch64-unknown-freebsd.tar.xz) = 46151160 -SHA256 (rust/2021-07-29/rust-std-1.54.0-aarch64-unknown-freebsd.tar.xz) = 9fa671383ab60de43df07e08c0b0615854e769be6dc8cacafbb1fd518aba3ea7 -SIZE (rust/2021-07-29/rust-std-1.54.0-aarch64-unknown-freebsd.tar.xz) = 18330268 -SHA256 (rust/2021-07-29/cargo-1.54.0-aarch64-unknown-freebsd.tar.xz) = c3de6774bfdad350d378e33ff1b8798018656aae7f5d07a2db4863527c580adb -SIZE (rust/2021-07-29/cargo-1.54.0-aarch64-unknown-freebsd.tar.xz) = 4403188 -SHA256 (rust/2021-07-29/rustc-1.54.0-x86_64-unknown-freebsd.tar.xz) = 5a8ad87eac3c0b829f2c7a9b29a5f06cff07523fd2ea95e9cdb30df997b905ab -SIZE (rust/2021-07-29/rustc-1.54.0-x86_64-unknown-freebsd.tar.xz) = 41303952 -SHA256 (rust/2021-07-29/rust-std-1.54.0-x86_64-unknown-freebsd.tar.xz) = 7735c8fc42be576cb8decbce68ce57ba585213f2d7ae3d87cc1c2504202ef2f2 -SIZE (rust/2021-07-29/rust-std-1.54.0-x86_64-unknown-freebsd.tar.xz) = 19183104 -SHA256 (rust/2021-07-29/cargo-1.54.0-x86_64-unknown-freebsd.tar.xz) = 397d2b9698c19b5777a88e72a900ea2ab2b3e44574beecb952509fff28da306e -SIZE (rust/2021-07-29/cargo-1.54.0-x86_64-unknown-freebsd.tar.xz) = 5142356 -SHA256 (rust/2021-07-29/rustc-1.54.0-armv6-unknown-freebsd.tar.xz) = 2f59d74563a8c4009de3a8a34772d42d9e101985ba6901fe9eec6e602a70e7fa -SIZE (rust/2021-07-29/rustc-1.54.0-armv6-unknown-freebsd.tar.xz) = 46926436 -SHA256 (rust/2021-07-29/rust-std-1.54.0-armv6-unknown-freebsd.tar.xz) = f4897bd301f9e52047084ce86825129c8d6325a6e18ff41acfc83a4ea3099983 -SIZE (rust/2021-07-29/rust-std-1.54.0-armv6-unknown-freebsd.tar.xz) = 17622324 -SHA256 (rust/2021-07-29/cargo-1.54.0-armv6-unknown-freebsd.tar.xz) = 50052a2f091bf767a4de94abc65a517ad925bd3242493c19d43d9d63304828dd -SIZE (rust/2021-07-29/cargo-1.54.0-armv6-unknown-freebsd.tar.xz) = 4551464 -SHA256 (rust/2021-07-29/rustc-1.54.0-armv7-unknown-freebsd.tar.xz) = 3927fc48020b3b94bdbaf160720664b4a6cdeb6f96b3415d7026326873e20368 -SIZE (rust/2021-07-29/rustc-1.54.0-armv7-unknown-freebsd.tar.xz) = 46448620 -SHA256 (rust/2021-07-29/rust-std-1.54.0-armv7-unknown-freebsd.tar.xz) = bc80b15a9ba60c66250d1b31fb610941205b3a2d2787021a5bdb96e667b28d45 -SIZE (rust/2021-07-29/rust-std-1.54.0-armv7-unknown-freebsd.tar.xz) = 18206828 -SHA256 (rust/2021-07-29/cargo-1.54.0-armv7-unknown-freebsd.tar.xz) = b0d89e13cc35a943ba3da5de5247d97d6b3dac0abcd331736bc9176e413e8eee -SIZE (rust/2021-07-29/cargo-1.54.0-armv7-unknown-freebsd.tar.xz) = 4542272 -SHA256 (rust/2021-07-29/rustc-1.54.0-i686-unknown-freebsd.tar.xz) = 6cf57c022f8f8ca41ce89ef5497d0dda7d371293be7ee4e5dccb3675ea9f72fc -SIZE (rust/2021-07-29/rustc-1.54.0-i686-unknown-freebsd.tar.xz) = 49120788 -SHA256 (rust/2021-07-29/rust-std-1.54.0-i686-unknown-freebsd.tar.xz) = fcb2575667eaf5c1a1bd96fbd544f7d79704faae90eadcdec9229119abfdbf28 -SIZE (rust/2021-07-29/rust-std-1.54.0-i686-unknown-freebsd.tar.xz) = 19086512 -SHA256 (rust/2021-07-29/cargo-1.54.0-i686-unknown-freebsd.tar.xz) = c0fc5501eaea33ec266d1c0fa21c1fb5075896091f54fed4b70ad850836a12d7 -SIZE (rust/2021-07-29/cargo-1.54.0-i686-unknown-freebsd.tar.xz) = 5219840 +TIMESTAMP = 1634575102 +SHA256 (rust/rustc-1.56.0-src.tar.xz) = f13468889833c88e744ad579c5d8fbb7ecb53216159b54481a90e5dcdaa9e320 +SIZE (rust/rustc-1.56.0-src.tar.xz) = 121802340 +SHA256 (rust/2021-09-09/rustc-1.55.0-aarch64-unknown-freebsd.tar.xz) = 29560cf6b45b4dc9a128c17f9d901b54b4d1d3d9cad4d0bdc05aca194b41dd3f +SIZE (rust/2021-09-09/rustc-1.55.0-aarch64-unknown-freebsd.tar.xz) = 46686528 +SHA256 (rust/2021-09-09/rust-std-1.55.0-aarch64-unknown-freebsd.tar.xz) = eec90b645eefefb3a052be28665cb737f76b660ae2db9a1393b50461ef5ce348 +SIZE (rust/2021-09-09/rust-std-1.55.0-aarch64-unknown-freebsd.tar.xz) = 18828192 +SHA256 (rust/2021-09-09/cargo-1.55.0-aarch64-unknown-freebsd.tar.xz) = 6285f42cd47a6c4ab94a43a6f46094f4a73218dd40dc678ac13d6f378975a137 +SIZE (rust/2021-09-09/cargo-1.55.0-aarch64-unknown-freebsd.tar.xz) = 4479688 +SHA256 (rust/2021-09-09/rustc-1.55.0-x86_64-unknown-freebsd.tar.xz) = 522f5639daa8b4275bbf1479c1a5b2d6c374020b048eefd9bd4b05e9802a4805 +SIZE (rust/2021-09-09/rustc-1.55.0-x86_64-unknown-freebsd.tar.xz) = 42185720 +SHA256 (rust/2021-09-09/rust-std-1.55.0-x86_64-unknown-freebsd.tar.xz) = 99fce10914ccd14f205c96eb80d102cd79a84133183834c5df2b8c5543024194 +SIZE (rust/2021-09-09/rust-std-1.55.0-x86_64-unknown-freebsd.tar.xz) = 19530980 +SHA256 (rust/2021-09-09/cargo-1.55.0-x86_64-unknown-freebsd.tar.xz) = 4b700830a5482979b201ccc6b0b14fe5e6db28a27a70780a305f5be3f452a307 +SIZE (rust/2021-09-09/cargo-1.55.0-x86_64-unknown-freebsd.tar.xz) = 5199584 +SHA256 (rust/2021-09-09/rustc-1.55.0-armv6-unknown-freebsd.tar.xz) = 18f3396cde609f353f1bdde6ae1f669581de1ec9a5a396d5868917f249643155 +SIZE (rust/2021-09-09/rustc-1.55.0-armv6-unknown-freebsd.tar.xz) = 47608836 +SHA256 (rust/2021-09-09/rust-std-1.55.0-armv6-unknown-freebsd.tar.xz) = e086292a71fc513ace373f0208affe402ac4488743e6c2929d92c4d7e0997761 +SIZE (rust/2021-09-09/rust-std-1.55.0-armv6-unknown-freebsd.tar.xz) = 17897508 +SHA256 (rust/2021-09-09/cargo-1.55.0-armv6-unknown-freebsd.tar.xz) = 23f7040f4cb4fcfacf4795449804a8b64db8aa21aac4eb4c5aa6de8adc84c159 +SIZE (rust/2021-09-09/cargo-1.55.0-armv6-unknown-freebsd.tar.xz) = 4607048 +SHA256 (rust/2021-09-09/rustc-1.55.0-armv7-unknown-freebsd.tar.xz) = d067d57b587b342680f0ca18ab1f2af100803dc4bd2b824a8033421b156b14df +SIZE (rust/2021-09-09/rustc-1.55.0-armv7-unknown-freebsd.tar.xz) = 47647600 +SHA256 (rust/2021-09-09/rust-std-1.55.0-armv7-unknown-freebsd.tar.xz) = c6d71af3d485a67bf48e2277765a22584f52724cd9682782e052a103d816dc6d +SIZE (rust/2021-09-09/rust-std-1.55.0-armv7-unknown-freebsd.tar.xz) = 18488040 +SHA256 (rust/2021-09-09/cargo-1.55.0-armv7-unknown-freebsd.tar.xz) = 16a16a0d670d6e6e964994a39e531d7eef9e6861806ca9de1d34a3b3ca553394 +SIZE (rust/2021-09-09/cargo-1.55.0-armv7-unknown-freebsd.tar.xz) = 4589416 +SHA256 (rust/2021-09-09/rustc-1.55.0-i686-unknown-freebsd.tar.xz) = b865fc32e5e91111fd2ad90fd893923910cd46e5ab457a8ded6397b74e610d96 +SIZE (rust/2021-09-09/rustc-1.55.0-i686-unknown-freebsd.tar.xz) = 50347892 +SHA256 (rust/2021-09-09/rust-std-1.55.0-i686-unknown-freebsd.tar.xz) = 71e460d7610592e41e8d5e326eb970b2c5584178abbf7c26d8fa215c16398f04 +SIZE (rust/2021-09-09/rust-std-1.55.0-i686-unknown-freebsd.tar.xz) = 19393280 +SHA256 (rust/2021-09-09/cargo-1.55.0-i686-unknown-freebsd.tar.xz) = 94e8f12be0f7c491055fa4f88476d42f7fe4c4775993a7465e6731e27f9b01d6 +SIZE (rust/2021-09-09/cargo-1.55.0-i686-unknown-freebsd.tar.xz) = 5271776 SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc-unknown-freebsd.tar.xz) = 7c3d2cab681b09aac0711c09a8b3f8d4e178f368cfe5ba51b067b07ca830b20b SIZE (rust/2021-09-09/rustc-1.55.0-powerpc-unknown-freebsd.tar.xz) = 49009564 SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc-unknown-freebsd.tar.xz) = c20d673c868da9c0b3fa17d6226974151efe4dd6422399b52ba4aa57707541b7 SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc-unknown-freebsd.tar.xz) = 17595980 SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc-unknown-freebsd.tar.xz) = a441ccfab4501d1ed2cb8d67bc2c90cacae4d98933c6c82e1ef51cb5a0b3c8c2 SIZE (rust/2021-09-09/cargo-1.55.0-powerpc-unknown-freebsd.tar.xz) = 5015316 -SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e8e053a8342f57ddbfbb3f4c214f36c00fdccbf0b2df606deb3bad1549b763c0 -SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 55871324 -SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = bcbf8d84580446a715ba398778f56e437d97f62ce30c8c4c59140eb8b597fff7 -SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 17444940 -SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 149aa51d0abcbe8774438a016df30707c58dab0fd2d788d726db209259163292 -SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5025436 -SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 77b45e9b81827a2aa5a70902d1529c5f44e29c176365d2ac8d66a0a0c9e2dd64 -SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 49194104 -SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = f0442fd38bdd40e547989a897826dc0536b98cccec6f62e6e24aaab03e87733f -SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 17547780 -SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 3336d8516385817977129bc287df36adb3f750da906c7fb6d3cd490795acbd69 -SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64le-unknown-freebsd.tar.xz) = 4956324 -SHA256 (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 5d1e6e16d853ac6a2f724c556f613201a6e156da079f85d1e9f4c06feee63a10 -SIZE (rust/2021-07-29/rustc-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 47172304 -SHA256 (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 6fd90639d63bce2af5240334387194117c4c78442227f90870d27ec11c29c7e2 -SIZE (rust/2021-07-29/rust-std-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17413108 -SHA256 (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = bdc28cc18eb4118faaa952e89c39d6113bf1d30b8b750bd8bd52f1827a6936cd -SIZE (rust/2021-07-29/cargo-1.54.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4714772 +SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = a540d96ba3de0ef26c6a25d6dc8cd05cd8ce70cebca3e8133c3b2ecc3b5f08c0 +SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 56762480 +SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = b1781903a25f6b804013a6bf69cc00c8a26279335f7d81776a08db4cfd1cc16d +SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 17733272 +SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 9c45a3c2e5f0aa4f70d5be85e9791e29ea953d4b2229bd8f7e94f26730f5812b +SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5060744 +SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 73ffacdd8a1b41863464b273cdfaf659492325b25e72ec839c8d2f93c313d860 +SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 49886844 +SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 4d1dd307b6e632c26ccbf2cdfc18ff38a88e4bc4c9bc517b659b20e48304bb86 +SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 17887308 +SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 9e6c36063fcf4da9e0725207c569189ab1897403be6e6037f80bda03c16e5c12 +SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64le-unknown-freebsd.tar.xz) = 4994980 +SHA256 (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 6811bd7329e9f9a37c33e0e1a213190c5b6c26cb4c573555172d029468f032e7 +SIZE (rust/2021-09-09/rustc-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 47847012 +SHA256 (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 892debb299bb150b8798478627ba3652d8c1f8f02b8b720f21697cda9d4af3a4 +SIZE (rust/2021-09-09/rust-std-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17689860 +SHA256 (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 1c6ae90f873104cb43be4173cce78d5b354d451fcb37a8dac0538f1e504890d3 +SIZE (rust/2021-09-09/cargo-1.55.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4747664 diff --git a/lang/rust/files/patch-src_bootstrap_install.rs b/lang/rust/files/patch-src_bootstrap_install.rs --- a/lang/rust/files/patch-src_bootstrap_install.rs +++ b/lang/rust/files/patch-src_bootstrap_install.rs @@ -6,12 +6,12 @@ --- src/bootstrap/install.rs.orig 2021-03-22 17:05:25 UTC +++ src/bootstrap/install.rs -@@ -138,7 +138,7 @@ macro_rules! install { +@@ -133,7 +133,7 @@ macro_rules! install { } install!((self, builder, _config), - Docs, "src/doc", _config.docs, only_hosts: false, { + Docs, "src/doc", _config.docs, only_hosts: true, { - if let Some(tarball) = builder.ensure(dist::Docs { host: self.target }) { - install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); - } else { + let tarball = builder.ensure(dist::Docs { host: self.target }).expect("missing docs"); + install_sh(builder, "docs", self.compiler.stage, Some(self.target), &tarball); + }; diff --git a/lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs b/lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs deleted file mode 100644 --- a/lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs +++ /dev/null @@ -1,22 +0,0 @@ -Revert https://github.com/rust-lang/cargo/commit/6f214ac7520d71c480dbe93e3874f14cfdaf594b -since it break CARGO_USE_GITHUB ports. - ---- src/tools/cargo/src/cargo/util/toml/mod.rs.orig 2021-09-06 18:42:51 UTC -+++ src/tools/cargo/src/cargo/util/toml/mod.rs -@@ -1780,11 +1780,12 @@ impl DetailedTomlDependency

{ - - for &(key, key_name) in &git_only_keys { - if key.is_some() { -- bail!( -- "key `{}` is ignored for dependency ({}).", -- key_name, -- name_in_toml -+ let msg = format!( -+ "key `{}` is ignored for dependency ({}). \ -+ This will be considered an error in future versions", -+ key_name, name_in_toml - ); -+ cx.warnings.push(msg) - } - } - } diff --git a/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_mod.rs b/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_mod.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_mod.rs +++ /dev/null @@ -1,10 +0,0 @@ ---- compiler/rustc_target/src/spec/mod.rs.orig 2020-09-30 18:06:16.613040000 -0500 -+++ compiler/rustc_target/src/spec/mod.rs 2021-04-23 18:06:47.040460000 -0500 -@@ -765,6 +765,7 @@ fn $module() { - ("armv6-unknown-freebsd", armv6_unknown_freebsd), - ("armv7-unknown-freebsd", armv7_unknown_freebsd), - ("i686-unknown-freebsd", i686_unknown_freebsd), -+ ("powerpc-unknown-freebsd", powerpc_unknown_freebsd), - ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd), - ("x86_64-unknown-freebsd", x86_64_unknown_freebsd), - diff --git a/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_powerpc__unknown__freebsd.rs b/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_powerpc__unknown__freebsd.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-compiler_rustc__target_src_spec_powerpc__unknown__freebsd.rs +++ /dev/null @@ -1,27 +0,0 @@ ---- /dev/null 2021-04-24 17:00:30.889028000 -0500 -+++ compiler/rustc_target/src/spec/powerpc_unknown_freebsd.rs 2021-04-24 17:00:25.903298000 -0500 -@@ -0,0 +1,24 @@ -+use crate::abi::Endian; -+use crate::spec::{LinkerFlavor, RelocModel, Target, TargetOptions}; -+ -+pub fn target() -> Target { -+ let mut base = super::freebsd_base::opts(); -+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m32".to_string()); -+ // Extra hint to linker that we are generating secure-PLT code. -+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("--target=powerpc-unknown-freebsd13.0".to_string()); -+ base.max_atomic_width = Some(32); -+ -+ Target { -+ llvm_target: "powerpc-unknown-freebsd13.0".to_string(), -+ pointer_width: 32, -+ data_layout: "E-m:e-p:32:32-i64:64-n32".to_string(), -+ arch: "powerpc".to_string(), -+ options: TargetOptions { -+ endian: Endian::Big, -+ features: "+secure-plt".to_string(), -+ relocation_model: RelocModel::Pic, -+ mcount: "_mcount".to_string(), -+ ..base -+ }, -+ } -+} diff --git a/lang/rust/files/powerpc/patch-src_bootstrap_native.rs b/lang/rust/files/powerpc/patch-src_bootstrap_native.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-src_bootstrap_native.rs +++ /dev/null @@ -1,25 +0,0 @@ ---- src/bootstrap/native.rs.orig 2021-05-03 20:57:16.000000000 +0000 -+++ src/bootstrap/native.rs 2021-05-06 20:37:55.448200000 +0000 -@@ -118,6 +118,10 @@ impl Step for Llvm { - let idx = target.triple.find('-').unwrap(); - - format!("riscv{}{}", &target.triple[5..7], &target.triple[idx..]) -+ } else if self.target.starts_with("powerpc") && self.target.ends_with("freebsd") { -+ // FreeBSD 13 had incompatible ABI changes on all PowerPC platforms. -+ // Set the version suffix to 13.0 so the correct target details are used. -+ format!("{}{}", self.target, "13.0") - } else { - target.to_string() - }; -@@ -274,6 +278,11 @@ impl Step for Llvm { - if num_linkers > 0 { - cfg.define("LLVM_PARALLEL_LINK_JOBS", num_linkers.to_string()); - } -+ } -+ -+ // Workaround for ppc32 lld limitation -+ if target == "powerpc-unknown-freebsd" { -+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-fuse-ld=bfd"); - } - - // http://llvm.org/docs/HowToCrossCompileLLVM.html diff --git a/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_mod.rs b/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_mod.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_mod.rs +++ /dev/null @@ -1,12 +0,0 @@ ---- vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC -+++ vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/mod.rs -@@ -1486,6 +1486,9 @@ cfg_if! { - } else if #[cfg(target_arch = "powerpc64")] { - mod powerpc64; - pub use self::powerpc64::*; -+ } else if #[cfg(target_arch = "powerpc")] { -+ mod powerpc; -+ pub use self::powerpc::*; - } else { - // Unknown target_arch - } diff --git a/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_powerpc.rs b/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_powerpc.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-vendor_libc-0.2.93_src_unix_bsd_freebsdlike_freebsd_powerpc.rs +++ /dev/null @@ -1,50 +0,0 @@ ---- vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC -+++ vendor/libc-0.2.93/src/unix/bsd/freebsdlike/freebsd/powerpc.rs -@@ -0,0 +1,47 @@ -+pub type c_char = u8; -+pub type c_long = i32; -+pub type c_ulong = u32; -+pub type wchar_t = i32; -+pub type time_t = i64; -+pub type suseconds_t = i32; -+pub type register_t = i32; -+ -+s! { -+ pub struct stat { -+ pub st_dev: ::dev_t, -+ pub st_ino: ::ino_t, -+ pub st_mode: ::mode_t, -+ pub st_nlink: ::nlink_t, -+ pub st_uid: ::uid_t, -+ pub st_gid: ::gid_t, -+ pub st_rdev: ::dev_t, -+ pub st_atime: ::time_t, -+ pub st_atime_nsec: ::c_long, -+ pub st_mtime: ::time_t, -+ pub st_mtime_nsec: ::c_long, -+ pub st_ctime: ::time_t, -+ pub st_ctime_nsec: ::c_long, -+ pub st_size: ::off_t, -+ pub st_blocks: ::blkcnt_t, -+ pub st_blksize: ::blksize_t, -+ pub st_flags: ::fflags_t, -+ pub st_gen: u32, -+ pub st_lspare: i32, -+ pub st_birthtime: ::time_t, -+ pub st_birthtime_nsec: ::c_long, -+ } -+} -+ -+// should be pub(crate), but that requires Rust 1.18.0 -+cfg_if! { -+ if #[cfg(libc_const_size_of)] { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1; -+ } else { -+ #[doc(hidden)] -+ pub const _ALIGNBYTES: usize = 4 - 1; -+ } -+} -+ -+pub const MAP_32BIT: ::c_int = 0x00080000; -+pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4 diff --git a/lang/rust/files/powerpc/patch-vendor_openssl__src_src_lib.rs b/lang/rust/files/powerpc/patch-vendor_openssl__src_src_lib.rs deleted file mode 100644 --- a/lang/rust/files/powerpc/patch-vendor_openssl__src_src_lib.rs +++ /dev/null @@ -1,10 +0,0 @@ ---- vendor/openssl-src/src/lib.rs.orig 2021-04-23 22:26:56.124321000 -0500 -+++ vendor/openssl-src/src/lib.rs 2021-04-23 22:27:38.643235000 -0500 -@@ -194,6 +194,7 @@ impl Build { - "mips64el-unknown-linux-gnuabi64" => "linux64-mips64", - "mipsel-unknown-linux-gnu" => "linux-mips32", - "mipsel-unknown-linux-musl" => "linux-mips32", -+ "powerpc-unknown-freebsd" => "BSD-generic32", - "powerpc-unknown-linux-gnu" => "linux-ppc", - "powerpc64-unknown-freebsd" => "BSD-generic64", - "powerpc64-unknown-linux-gnu" => "linux-ppc64",