Page MenuHomeFreeBSD
Files F106157053

D31872.id95218.diff
No OneTemporary
Actions

D31872.id95218.diff
View Options

Index: Mk/Uses/cargo.mk
===================================================================
--- Mk/Uses/cargo.mk
+++ Mk/Uses/cargo.mk
@@ -60,7 +60,7 @@
CARGO_BUILDDEP?= yes
.if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.54.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT}
.endif
# Location of cargo binary (default to lang/rust's Cargo binary)
@@ -69,6 +69,9 @@
# Location of the cargo output directory.
CARGO_TARGET_DIR?= ${WRKDIR}/target
+# Default target platform (affects some RUSTFLAGS if passed)
+CARGO_BUILD_TARGET?= ${ARCH:S/amd64/x86_64/:S/i386/i686/}-unknown-${OPSYS:tl}
+
# Environment for cargo
# - CARGO_HOME: local cache of the registry index
# - CARGO_BUILD_JOBS: configure number of jobs to run
@@ -80,11 +83,13 @@
CARGO_ENV+= \
CARGO_HOME=${WRKDIR}/cargo-home \
CARGO_BUILD_JOBS=${MAKE_JOBS_NUMBER} \
+ CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET} \
CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \
+ CARGO_TARGET_${CARGO_BUILD_TARGET:S/-/_/g:tu}_LINKER="${CC}" \
RUST_BACKTRACE=1 \
RUSTC=${LOCALBASE}/bin/rustc \
RUSTDOC=${LOCALBASE}/bin/rustdoc \
- RUSTFLAGS="${RUSTFLAGS} -C linker=${CC:Q} ${LDFLAGS:C/.+/-C link-arg=&/}"
+ RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-arg=&/}"
# Adjust -C target-cpu if -march/-mcpu is set by bsd.cpu.mk
.if ${ARCH} == amd64 || ${ARCH} == i386
Index: Mk/bsd.gecko.mk
===================================================================
--- Mk/bsd.gecko.mk
+++ 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.54.0:lang/${RUST_DEFAULT} \
+ ${RUST_DEFAULT}>=1.55.0:lang/${RUST_DEFAULT} \
node:www/node
LIB_DEPENDS+= libdrm.so:graphics/libdrm
.if ${MOZILLA_VER:R:R} >= 85
Index: audio/gnome-podcasts/files/patch-scripts_cargo.sh
===================================================================
--- /dev/null
+++ audio/gnome-podcasts/files/patch-scripts_cargo.sh
@@ -0,0 +1,8 @@
+--- scripts/cargo.sh.orig 2021-09-08 13:34:20 UTC
++++ scripts/cargo.sh
+@@ -22,4 +22,4 @@ if test -d vendor; then
+ fi
+
+ cargo build ${ARGS[@]} --manifest-path="$1"/Cargo.toml -p podcasts-gtk
+-cp "$CARGO_TARGET_DIR"/${TARGET}/podcasts-gtk "$OUTPUT"
++cp "$CARGO_TARGET_DIR"/${CARGO_BUILD_TARGET}/${TARGET}/podcasts-gtk "$OUTPUT"
Index: audio/shortwave/files/patch-build-aux_cargo.sh
===================================================================
--- /dev/null
+++ audio/shortwave/files/patch-build-aux_cargo.sh
@@ -0,0 +1,15 @@
+--- build-aux/cargo.sh.orig 2021-09-08 13:22:45 UTC
++++ build-aux/cargo.sh
+@@ -17,10 +17,10 @@ then
+ echo "** DEBUG MODE **"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml && \
+- cp "$CARGO_TARGET_DIR"/debug/shortwave $APP_OUTPUT
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/shortwave $APP_OUTPUT
+ else
+ echo "** RELEASE MODE **"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+- cp "$CARGO_TARGET_DIR"/release/shortwave $APP_OUTPUT
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/shortwave $APP_OUTPUT
+ fi
Index: databases/redisjson/Makefile
===================================================================
--- databases/redisjson/Makefile
+++ databases/redisjson/Makefile
@@ -110,6 +110,6 @@
PLIST_FILES= lib/librejson.so
do-install:
- ${INSTALL_LIB} ${WRKDIR}/target/release/librejson.so ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/librejson.so ${STAGEDIR}${PREFIX}/lib
.include <bsd.port.mk>
Index: deskutils/solanum/files/patch-build-aux_cargo.sh
===================================================================
--- /dev/null
+++ deskutils/solanum/files/patch-build-aux_cargo.sh
@@ -0,0 +1,16 @@
+--- build-aux/cargo.sh.orig 2021-09-08 15:16:18 UTC
++++ build-aux/cargo.sh
+@@ -14,11 +14,11 @@ then
+ echo "RELEASE MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+- cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT"
+ else
+ echo "DEBUG MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml --verbose && \
+- cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT"
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT"
+ fi
+
Index: devel/pijul/Makefile
===================================================================
--- devel/pijul/Makefile
+++ devel/pijul/Makefile
@@ -283,7 +283,7 @@
${MV} ${WRKSRC}/cargo-crates/pijul-1.0.0-alpha.54/* ${WRKSRC}/
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/target/release/pijul ${STAGEDIR}${PREFIX}/bin/pijul
+ ${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/pijul ${STAGEDIR}${PREFIX}/bin/pijul
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pijul
Index: devel/rust-analyzer/Makefile
===================================================================
--- devel/rust-analyzer/Makefile
+++ devel/rust-analyzer/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rust-analyzer
-DISTVERSION= 2021-09-06
+DISTVERSION= 2021-09-13
CATEGORIES= devel
MAINTAINER= rust@FreeBSD.org
@@ -30,10 +30,10 @@
cargo_metadata-0.14.0 \
cc-1.0.70 \
cfg-if-1.0.0 \
- chalk-derive-0.70.0 \
- chalk-ir-0.70.0 \
- chalk-recursive-0.70.0 \
- chalk-solve-0.70.0 \
+ chalk-derive-0.71.0 \
+ chalk-ir-0.71.0 \
+ chalk-recursive-0.71.0 \
+ chalk-solve-0.71.0 \
countme-2.0.4 \
cov-mark-2.0.0-pre.1 \
crc32fast-1.2.1 \
@@ -104,7 +104,7 @@
pin-project-lite-0.2.7 \
proc-macro2-1.0.29 \
pulldown-cmark-0.8.0 \
- pulldown-cmark-to-cmark-6.0.2 \
+ pulldown-cmark-to-cmark-6.0.3 \
quote-1.0.9 \
rayon-1.5.1 \
rayon-core-1.9.1 \
@@ -147,7 +147,7 @@
tracing-core-0.1.19 \
tracing-log-0.1.2 \
tracing-subscriber-0.2.20 \
- tracing-tree-0.1.9 \
+ tracing-tree-0.1.10 \
ungrammar-1.14.4 \
unicase-2.6.0 \
unicode-bidi-0.3.6 \
@@ -164,8 +164,8 @@
write-json-0.1.2 \
xflags-0.2.3 \
xflags-macros-0.2.3 \
- xshell-0.1.15 \
- xshell-macros-0.1.15
+ xshell-0.1.17 \
+ xshell-macros-0.1.17
CARGO_INSTALL_PATH= crates/rust-analyzer
Index: devel/rust-analyzer/distinfo
===================================================================
--- devel/rust-analyzer/distinfo
+++ devel/rust-analyzer/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1630998662
+TIMESTAMP = 1631515179
SHA256 (rust/crates/addr2line-0.16.0.crate) = 3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd
SIZE (rust/crates/addr2line-0.16.0.crate) = 33440
SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
@@ -33,14 +33,14 @@
SIZE (rust/crates/cc-1.0.70.crate) = 57200
SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934
-SHA256 (rust/crates/chalk-derive-0.70.0.crate) = 1b29a4ef88867aee29bc709976d9b0a20ddb2c52aeca0bd635893a74fa77d7f6
-SIZE (rust/crates/chalk-derive-0.70.0.crate) = 3467
-SHA256 (rust/crates/chalk-ir-0.70.0.crate) = 3efd5b260d23af3daebae111ea4066604dd3cdb18ca610358ab2e2a7aab71461
-SIZE (rust/crates/chalk-ir-0.70.0.crate) = 51627
-SHA256 (rust/crates/chalk-recursive-0.70.0.crate) = 7c8089c69051fa6bfdadb67f6dc951881f99fef6814e0e0c27c47218e34d8adb
-SIZE (rust/crates/chalk-recursive-0.70.0.crate) = 14668
-SHA256 (rust/crates/chalk-solve-0.70.0.crate) = 3ad0c276126d7787577d22f82785d8f2795318ad30349e66b487a6d6a591e351
-SIZE (rust/crates/chalk-solve-0.70.0.crate) = 97159
+SHA256 (rust/crates/chalk-derive-0.71.0.crate) = 059cce4ba41e57dd82f55b348d3e83cb30fd142479d00287f08c4ae66f9e7197
+SIZE (rust/crates/chalk-derive-0.71.0.crate) = 3467
+SHA256 (rust/crates/chalk-ir-0.71.0.crate) = c0f9b041f3fcc136dbf8a92cef5f6ac743f9800467763502f5924349b781cbe0
+SIZE (rust/crates/chalk-ir-0.71.0.crate) = 51631
+SHA256 (rust/crates/chalk-recursive-0.71.0.crate) = b1dd77179b3310dea3838b73e0f5990fcf4d1c00bfd2bc43d984faa8d2783ff1
+SIZE (rust/crates/chalk-recursive-0.71.0.crate) = 14672
+SHA256 (rust/crates/chalk-solve-0.71.0.crate) = 0c8ff6810c6bcac76950d1d292f71862e5757f483b8745a9186e649076b913be
+SIZE (rust/crates/chalk-solve-0.71.0.crate) = 97603
SHA256 (rust/crates/countme-2.0.4.crate) = 328b822bdcba4d4e402be8d9adb6eebf269f969f8eadef977a553ff3c4fbcb58
SIZE (rust/crates/countme-2.0.4.crate) = 9128
SHA256 (rust/crates/cov-mark-2.0.0-pre.1.crate) = 0d48d8f76bd9331f19fe2aaf3821a9f9fb32c3963e1e3d6ce82a8c09cef7444a
@@ -181,8 +181,8 @@
SIZE (rust/crates/proc-macro2-1.0.29.crate) = 38772
SHA256 (rust/crates/pulldown-cmark-0.8.0.crate) = ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8
SIZE (rust/crates/pulldown-cmark-0.8.0.crate) = 106330
-SHA256 (rust/crates/pulldown-cmark-to-cmark-6.0.2.crate) = 95048382115a9da7be92ad51c84064d585b7da17472dcaa7f5eed8853c4c3707
-SIZE (rust/crates/pulldown-cmark-to-cmark-6.0.2.crate) = 7957
+SHA256 (rust/crates/pulldown-cmark-to-cmark-6.0.3.crate) = a72d775989b8b4cc8e5e924a99d6b3ed960da727f78394b7abd539301972e08e
+SIZE (rust/crates/pulldown-cmark-to-cmark-6.0.3.crate) = 8021
SHA256 (rust/crates/quote-1.0.9.crate) = c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7
SIZE (rust/crates/quote-1.0.9.crate) = 25042
SHA256 (rust/crates/rayon-1.5.1.crate) = c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90
@@ -267,8 +267,8 @@
SIZE (rust/crates/tracing-log-0.1.2.crate) = 14915
SHA256 (rust/crates/tracing-subscriber-0.2.20.crate) = b9cbe87a2fa7e35900ce5de20220a582a9483a7063811defce79d7cbd59d4cfe
SIZE (rust/crates/tracing-subscriber-0.2.20.crate) = 109378
-SHA256 (rust/crates/tracing-tree-0.1.9.crate) = 1712b40907f8d9bc2bc66763ab61dec914b7123d7149e59feb0d4e2a95fc4967
-SIZE (rust/crates/tracing-tree-0.1.9.crate) = 13127
+SHA256 (rust/crates/tracing-tree-0.1.10.crate) = 4d850f81a21b3877d4360a079c35b7b78f2674f2dafa5c9d381c53c65acebea3
+SIZE (rust/crates/tracing-tree-0.1.10.crate) = 12828
SHA256 (rust/crates/ungrammar-1.14.4.crate) = 0d6e36d57b143472488b1594fe25c376fa9683bccfd80d858b2180c97806835b
SIZE (rust/crates/ungrammar-1.14.4.crate) = 8254
SHA256 (rust/crates/unicase-2.6.0.crate) = 50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6
@@ -301,9 +301,9 @@
SIZE (rust/crates/xflags-0.2.3.crate) = 9943
SHA256 (rust/crates/xflags-macros-0.2.3.crate) = da260301476ad19a4733a0e930db8227a48ea04561e235a5102978145ec69fcc
SIZE (rust/crates/xflags-macros-0.2.3.crate) = 10622
-SHA256 (rust/crates/xshell-0.1.15.crate) = 07a06b78bf7920975954d1bef9dadedbb522dc886e14532b7cd4c83a10601867
-SIZE (rust/crates/xshell-0.1.15.crate) = 20590
-SHA256 (rust/crates/xshell-macros-0.1.15.crate) = d2b955be4ccb0caffb7312052b5b9d31f24cac4c4898869290f1580cb6d73dc2
-SIZE (rust/crates/xshell-macros-0.1.15.crate) = 2678
-SHA256 (rust-analyzer-rust-analyzer-2021-09-06_GH0.tar.gz) = 00634658dec338258174ad1c133adc69b6b69d8006ba2c5ba45fff4b7c8d593b
-SIZE (rust-analyzer-rust-analyzer-2021-09-06_GH0.tar.gz) = 2061390
+SHA256 (rust/crates/xshell-0.1.17.crate) = eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14
+SIZE (rust/crates/xshell-0.1.17.crate) = 21019
+SHA256 (rust/crates/xshell-macros-0.1.17.crate) = 4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39
+SIZE (rust/crates/xshell-macros-0.1.17.crate) = 2682
+SHA256 (rust-analyzer-rust-analyzer-2021-09-13_GH0.tar.gz) = 344d52fabb3334840014b33b76adf9efd1c3c23aa37d647e2aa635bbe3390adc
+SIZE (rust-analyzer-rust-analyzer-2021-09-13_GH0.tar.gz) = 2063610
Index: editors/parinfer-rust/Makefile
===================================================================
--- editors/parinfer-rust/Makefile
+++ editors/parinfer-rust/Makefile
@@ -115,7 +115,7 @@
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/parinfer-rust
- ${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libparinfer_rust.so \
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libparinfer_rust.so \
${STAGEDIR}${PREFIX}/lib
@${MKDIR} ${STAGEDIR}${PREFIX}/share/kak/rc/extra \
${STAGEDIR}${PREFIX}/share/vim/vimfiles/doc \
Index: games/abstreet/Makefile
===================================================================
--- games/abstreet/Makefile
+++ games/abstreet/Makefile
@@ -474,7 +474,7 @@
${ECHO} "Please upload the file ${DISTDIR}/${PORTNAME}-data-${DISTVERSION}.tgz"
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/target/release/game ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-game
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/game ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-game
cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
cd ${WRKDIR}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
Index: lang/rust-bootstrap/Makefile
===================================================================
--- lang/rust-bootstrap/Makefile
+++ lang/rust-bootstrap/Makefile
@@ -2,16 +2,12 @@
# to upload them to ~/public_distfiles on freefall in preparation
# for the next lang/rust update.
PORTNAME= rust
-PORTVERSION= 1.54.0
+PORTVERSION= 1.55.0
CATEGORIES= lang
-MASTER_SITES= https://static.rust-lang.org/dist/:rust \
- LOCAL/tobik/rust:${FLAVOR} \
- https://download.freebsd.org/ftp/${_RUST_FBSD_SUBDIR_${FLAVOR}}/:${FLAVOR}
-# http://pkg.freebsd.org/FreeBSD:12:powerpc64/quarterly/All/gcc9-9.3.0_1.txz?dummy=/:powerpc64_gcc
+MASTER_SITES= https://static.rust-lang.org/dist/
+PKGNAMEPREFIX= ${FLAVOR:S/_/-/g}-
PKGNAMESUFFIX= -bootstrap
DISTNAME= ${PORTNAME}c-${PORTVERSION}-src
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:rust \
- ${_RUST_FBSD_DIST_${FLAVOR}:@f@bootstrap/$f:${FLAVOR}@}
DIST_SUBDIR= rust
MAINTAINER= rust@FreeBSD.org
@@ -22,10 +18,12 @@
LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE-APACHE
LICENSE_FILE_MIT= ${WRKSRC}/LICENSE-MIT
+IGNORE=skip for exp-run
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= untested on other archs
-BUILD_DEPENDS= cmake:devel/cmake \
+BUILD_DEPENDS= ${FLAVOR:S/_/-/g}-freebsd-sysroot>=a2021.09.14:devel/freebsd-sysroot@${FLAVOR} \
+ cmake:devel/cmake \
gmake:devel/gmake \
rust>=${PORTVERSION}:lang/rust
@@ -33,29 +31,12 @@
powerpc64le powerpc
FLAVOR?= ${FLAVORS:[1]}
-aarch64_PKGNAMEPREFIX= aarch64-
-aarch64_BUILD_DEPENDS= llvm90>0:devel/llvm90
-amd64_PKGNAMEPREFIX= amd64-
-armv6_PKGNAMEPREFIX= armv6-
-armv7_PKGNAMEPREFIX= armv7-
-i386_PKGNAMEPREFIX= i386-
-powerpc64_elfv1_PKGNAMEPREFIX= powerpc64-elfv1-
-powerpc64_elfv1_BUILD_DEPENDS= powerpc64-gcc9>0:devel/freebsd-gcc9@powerpc64
-powerpc64_elfv2_PKGNAMEPREFIX= powerpc64-elfv2-
-powerpc64le_PKGNAMEPREFIX= powerpc64le-
-powerpc_PKGNAMEPREFIX= powerpc-
-powerpc_BUILD_DEPENDS= powerpc-binutils>0:devel/binutils@powerpc
-
USES= ninja:build perl5 python:3.6+,build tar:xz
.if ${FLAVOR} == powerpc64_elfv1
USE_GCC= 9:build
.endif
# for openssl-src crate
USE_PERL5= build
-.if ${FLAVOR} == aarch64
-CC= clang90
-CXX= clang++90
-.endif
PATCHDIR= ${.CURDIR}/../rust/files
# rustc stashes intermediary files in TMPDIR (default /tmp) which
# might cause issues for users that for some reason space limit
@@ -65,40 +46,11 @@
# Resulting packages are not specific to amd64
NO_ARCH= yes
-_RUST_FBSD_DIST_aarch64= FreeBSD-${_RUST_FBSD_VER}-arm64${EXTRACT_SUFX}
-_RUST_FBSD_DIST_amd64= FreeBSD-${_RUST_FBSD_VER}-amd64${EXTRACT_SUFX}
-# base.txz for armv* created from WANDBOARD images as there seem
-# to be no generic base.txz for it.
-_RUST_FBSD_DIST_armv6= FreeBSD-${_RUST_FBSD_VER}-arm-armv6${EXTRACT_SUFX}
-_RUST_FBSD_DIST_armv7= FreeBSD-${_RUST_FBSD_VER}-arm-armv7${EXTRACT_SUFX}
-_RUST_FBSD_DIST_i386= FreeBSD-${_RUST_FBSD_VER}-i386${EXTRACT_SUFX}
-_RUST_FBSD_DIST_powerpc64_elfv1= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1${EXTRACT_SUFX} \
- FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv1-gcc9-9.3.0${EXTRACT_SUFX}
-_RUST_FBSD_DIST_powerpc64_elfv2= FreeBSD-${_RUST_FBSD_VER}-powerpc64-elfv2-v1300123${EXTRACT_SUFX}
-_RUST_FBSD_DIST_powerpc64le= FreeBSD-${_RUST_FBSD_VER}-powerpc64le-r366300${EXTRACT_SUFX}
-_RUST_FBSD_DIST_powerpc= FreeBSD-${_RUST_FBSD_VER}-powerpc${EXTRACT_SUFX}
-_RUST_FBSD_VER= ${_RUST_FBSD_VER_${FLAVOR}:U11.4-RELEASE}
-_RUST_FBSD_VER_aarch64= 12.2-RELEASE
-_RUST_FBSD_VER_armv7= 12.2-RELEASE
-_RUST_FBSD_VER_powerpc64_elfv1= 12.2-RELEASE
-_RUST_FBSD_VER_powerpc64_elfv2= 13.0-CURRENT
-_RUST_FBSD_VER_powerpc64le= 13.0-CURRENT
-_RUST_FBSD_VER_powerpc= 13.0-RELEASE
-_RUST_FBSD_SUBDIR_aarch64= releases/arm64/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_amd64= releases/amd64/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_i386= releases/i386/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_powerpc64_elfv1= releases/powerpc/powerpc64/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_powerpc64_elfv2= snapshots/powerpc/powerpc64/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_powerpc64le= snapshots/powerpc/powerpc64le/${_RUST_FBSD_VER}/base.txz?dummy=
-_RUST_FBSD_SUBDIR_powerpc= releases/powerpc/powerpc/${_RUST_FBSD_VER}/base.txz?dummy=
-
_CARGO_VENDOR_DIR= ${WRKSRC}/vendor
_RUST_ARCH_amd64= x86_64
_RUST_ARCH_i386= i686
_RUST_ARCH_powerpc64_elfv1= powerpc64
_RUST_ARCH_powerpc64_elfv2= powerpc64
-_RUST_ARCH_powerpc64le= powerpc64le
-_RUST_ARCH_powerpc= powerpc
_RUST_HOST= ${_RUST_ARCH_${ARCH}:U${ARCH}}-unknown-${OPSYS:tl}
_RUST_TARGET= ${_RUST_ARCH_${FLAVOR}:U${FLAVOR}}-unknown-${OPSYS:tl}
_RUST_LLVM_TARGET= ${_RUST_LLVM_TARGET_${FLAVOR}}
@@ -111,10 +63,6 @@
_RUST_LLVM_TARGET_powerpc64_elfv2= PowerPC
_RUST_LLVM_TARGET_powerpc64le= PowerPC
_RUST_LLVM_TARGET_powerpc= PowerPC
-_RUST_LLVM_TRIPLE= ${_RUST_LLVM_TRIPLE_${FLAVOR}:U${_RUST_TARGET}}
-_RUST_LLVM_TRIPLE_armv6= armv6-gnueabihf-freebsd
-_RUST_LLVM_TRIPLE_armv7= armv7-gnueabihf-freebsd
-_RUST_LLVM_TRIPLE_powerpc= powerpc-unknown-freebsd13.0 # secure-plt
.include <bsd.port.pre.mk>
@@ -131,12 +79,6 @@
EXTRA_PATCHES+= ${PATCHDIR}/${FLAVOR:S/_/-/}
.endif
-.if make(distclean) || make(makesum)
-.MAKEFLAGS: MASTER_SITES="${FLAVORS:@_flavor@${:!${SETENV} FLAVOR=${_flavor} ${MAKE} -VMASTER_SITES!}@:O:u:q}" # PR 249537
-DISTFILES:= ${DISTFILES:M*\:rust} \
- ${FLAVORS:O:@_flavor@${:!${SETENV} FLAVOR=${_flavor} ${MAKE} -V'DISTFILES:N*\:rust'!}@}
-.endif
-
post-patch:
# Disable vendor checksums
@${REINPLACE_CMD} 's,"files":{[^}]*},"files":{},' \
@@ -145,7 +87,7 @@
@${REINPLACE_CMD} -e 's,"c++","stdc++",g' \
${WRKSRC}/compiler/rustc_llvm/build.rs
@${REINPLACE_CMD} -e 's,%CC%,${CC},g' \
- -e 's,%WRKDIR%,${WRKDIR},g' \
+ -e 's,%WRKDIR%,${LOCALBASE}/freebsd-sysroot/powerpc64-elfv1,g' \
${WRKSRC}/compiler/rustc_llvm/build.rs \
${WRKSRC}/src/bootstrap/native.rs
.endif
@@ -188,9 +130,9 @@
# host compiler that can build the host->target compiler
@${ECHO_CMD} 'targets="${_RUST_LLVM_TARGET};X86"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml
- @${ECHO_CMD} 'cc="${WRKDIR}/${_RUST_TARGET}-cc"' >> ${WRKSRC}/config.toml
- @${ECHO_CMD} 'cxx="${WRKDIR}/${_RUST_TARGET}-c++"' >> ${WRKSRC}/config.toml
- @${ECHO_CMD} 'linker="${WRKDIR}/${_RUST_TARGET}-cc"' >> ${WRKSRC}/config.toml
+ @${ECHO_CMD} 'cc="${LOCALBASE}/freebsd-sysroot/${FLAVOR:S/_/-/g}/bin/cc"' >> ${WRKSRC}/config.toml
+ @${ECHO_CMD} 'cxx="${LOCALBASE}/freebsd-sysroot/${FLAVOR:S/_/-/g}/bin/c++"' >> ${WRKSRC}/config.toml
+ @${ECHO_CMD} 'linker="${LOCALBASE}/freebsd-sysroot/${FLAVOR:S/_/-/g}/bin/cc"' >> ${WRKSRC}/config.toml
.for _key _util in ar ${AR} ranlib ${RANLIB}
@bin="$$(which ${_util})"; \
${ECHO_CMD} "${_key}=\"$$bin\"" >> ${WRKSRC}/config.toml
@@ -203,40 +145,6 @@
.endif
@${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml
-.if ${FLAVOR} == powerpc64_elfv1
- @${RLN} ${WRKDIR}${LOCALBASE}/lib/gcc9/libstdc++.a ${WRKDIR}/usr/lib/libstdc++.a
- @${RLN} ${WRKDIR}${LOCALBASE}/lib/gcc9/libstdc++.a ${WRKDIR}/usr/lib/libc++.a
- @gcc="$$(${ECHO_CMD} ${LOCALBASE}/bin/${_RUST_TARGET}*[0-9]-gcc9)"; \
- ${PRINTF} '#!/bin/sh\nexec %s --sysroot=${WRKDIR} -Wl,-rpath=${LOCALBASE}/lib/gcc9 -L${WRKDIR}${LOCALBASE}/lib/gcc9 "$$@"\n' "$${gcc}" \
- > ${WRKDIR}/${_RUST_TARGET}-cc
- @gcc="$$(${ECHO_CMD} ${LOCALBASE}/bin/${_RUST_TARGET}*[0-9]-g++9)"; \
- cxxinc="/$$(cd ${WRKDIR} && ${ECHO_CMD} ${LOCALBASE:S,^/,,}/lib/gcc9/include/c++/powerpc64-*)"; \
- ${PRINTF} '#!/bin/sh\nexec %s --sysroot=${WRKDIR} -isystem=${LOCALBASE}/lib/gcc9/include/c++ -isystem=%s -Wl,-rpath=${LOCALBASE}/lib/gcc9 -L${WRKDIR}${LOCALBASE}/lib/gcc9 "$$@"\n' "$${gcc}" "$${cxxinc}" \
- > ${WRKDIR}/${_RUST_TARGET}-c++
-.elif ${FLAVOR} == powerpc64_elfv2
- @${PRINTF} '#!/bin/sh\nexec ${CC} --sysroot=${WRKDIR} -mabi=elfv2 --target=${_RUST_LLVM_TRIPLE} "$$@"\n' \
- > ${WRKDIR}/${_RUST_TARGET}-cc
- @${PRINTF} '#!/bin/sh\nexec ${CXX} --sysroot=${WRKDIR} -mabi=elfv2 --target=${_RUST_LLVM_TRIPLE} -stdlib=libc++ "$$@"\n' \
- > ${WRKDIR}/${_RUST_TARGET}-c++
-.elif ${FLAVOR} == powerpc
- @bfd="$$(${ECHO_CMD} ${LOCALBASE}/bin/${_RUST_TARGET}*[0-9]-ld.bfd)"; \
- ${PRINTF} '#!/bin/sh\nexec ${CC} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} -Wno-unused-command-line-argument -fuse-ld=%s "$$@"\n' "$${bfd}" \
- > ${WRKDIR}/${_RUST_TARGET}-cc; \
- ${PRINTF} '#!/bin/sh\nexec ${CXX} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} -Wno-unused-command-line-argument -fuse-ld=%s "$$@"\n' "$${bfd}" \
- > ${WRKDIR}/${_RUST_TARGET}-c++
-.else
- @${PRINTF} '#!/bin/sh\nexec ${CC} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} "$$@"\n' \
- > ${WRKDIR}/${_RUST_TARGET}-cc
- @${PRINTF} '#!/bin/sh\nexec ${CXX} --sysroot=${WRKDIR} --target=${_RUST_LLVM_TRIPLE} -stdlib=libc++ "$$@"\n' \
- > ${WRKDIR}/${_RUST_TARGET}-c++
-.endif
- @${CHMOD} +x ${WRKDIR}/${_RUST_TARGET}-c*
-# sanity check cross compilers. we cannot execute the result but
-# at least check that it can link a simple program before going further.
- @${PRINTF} '#include <stdio.h>\nint main(){return printf("hello\\n");}' | ${WRKDIR}/${_RUST_TARGET}-cc -o ${WRKDIR}/test-c -xc -
-# produce some useful info for the build logs like what release/arch test-c is compiled for
- @cd ${WRKDIR} && ${FILE} test-c && ${READELF} -A test-c
- @${PRINTF} '#include <iostream>\nint main(){std::cout<<"hello"<<std::endl;return 0;}' | ${WRKDIR}/${_RUST_TARGET}-c++ -o ${WRKDIR}/test-c++ -xc++ -
do-build:
@cd ${WRKSRC} && \
Index: lang/rust-bootstrap/distinfo
===================================================================
--- lang/rust-bootstrap/distinfo
+++ lang/rust-bootstrap/distinfo
@@ -1,23 +1,3 @@
-TIMESTAMP = 1629292342
-SHA256 (rust/rustc-1.54.0-src.tar.xz) = a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4
-SIZE (rust/rustc-1.54.0-src.tar.xz) = 116286856
-SHA256 (rust/bootstrap/FreeBSD-12.2-RELEASE-arm64.tar.xz) = 3f82224fbcc6b2a2e1a1358cec5f32c0a08b5c5e6796e1a998369eb624a11cf3
-SIZE (rust/bootstrap/FreeBSD-12.2-RELEASE-arm64.tar.xz) = 158493712
-SHA256 (rust/bootstrap/FreeBSD-11.4-RELEASE-amd64.tar.xz) = 3bac8257bdd5e5b071f7b80cc591ebecd01b9314ca7839a2903096cbf82169f9
-SIZE (rust/bootstrap/FreeBSD-11.4-RELEASE-amd64.tar.xz) = 132075024
-SHA256 (rust/bootstrap/FreeBSD-11.4-RELEASE-arm-armv6.tar.xz) = 8a7c95aaac4fe9591f586fa274c1ffb9adba2e0f191a5a26f6222331a7ae0afb
-SIZE (rust/bootstrap/FreeBSD-11.4-RELEASE-arm-armv6.tar.xz) = 25605880
-SHA256 (rust/bootstrap/FreeBSD-12.2-RELEASE-arm-armv7.tar.xz) = b56bfaf0e9994723b2bb8c36b268ea1d0c6e9378c83211ed84ecca5c0a5420da
-SIZE (rust/bootstrap/FreeBSD-12.2-RELEASE-arm-armv7.tar.xz) = 70116512
-SHA256 (rust/bootstrap/FreeBSD-11.4-RELEASE-i386.tar.xz) = ae602552ff4c26f31b304e4a1ffc066db826e75d07ba9a4bf33649e9549bf27b
-SIZE (rust/bootstrap/FreeBSD-11.4-RELEASE-i386.tar.xz) = 110296208
-SHA256 (rust/bootstrap/FreeBSD-13.0-RELEASE-powerpc.tar.xz) = 8d980deacf7db15775445d00ce49b56a2a8eb519994052a92d2c6a40985910ab
-SIZE (rust/bootstrap/FreeBSD-13.0-RELEASE-powerpc.tar.xz) = 146274724
-SHA256 (rust/bootstrap/FreeBSD-12.2-RELEASE-powerpc64-elfv1.tar.xz) = 762ec55a9bd40dc93231e24f2df53c58d90b7cef63892b2740a59f9e8f40898e
-SIZE (rust/bootstrap/FreeBSD-12.2-RELEASE-powerpc64-elfv1.tar.xz) = 109121900
-SHA256 (rust/bootstrap/FreeBSD-12.2-RELEASE-powerpc64-elfv1-gcc9-9.3.0.tar.xz) = b1bd46b347e0ef55e8868537aaefe323622adf6fa081bef9ca5f24fc711d40ea
-SIZE (rust/bootstrap/FreeBSD-12.2-RELEASE-powerpc64-elfv1-gcc9-9.3.0.tar.xz) = 36842348
-SHA256 (rust/bootstrap/FreeBSD-13.0-CURRENT-powerpc64-elfv2-v1300123.tar.xz) = 0713b0c4bd3c19520714054b087d8f0d8dc7acc3610d8ae30df51ab07d566d92
-SIZE (rust/bootstrap/FreeBSD-13.0-CURRENT-powerpc64-elfv2-v1300123.tar.xz) = 75289700
-SHA256 (rust/bootstrap/FreeBSD-13.0-CURRENT-powerpc64le-r366300.tar.xz) = a828a3a968c9911655148fa080587ecd7673aa3d58588ed3dafa55a5c2e12dd3
-SIZE (rust/bootstrap/FreeBSD-13.0-CURRENT-powerpc64le-r366300.tar.xz) = 167748612
+TIMESTAMP = 1631002417
+SHA256 (rust/rustc-1.55.0-src.tar.xz) = aec85a7c1f40b7a40818a58ae13632f8a12cfaa4d3e2a10957d0e9d16dfdd556
+SIZE (rust/rustc-1.55.0-src.tar.xz) = 117197580
Index: lang/rust-nightly/Makefile
===================================================================
--- lang/rust-nightly/Makefile
+++ lang/rust-nightly/Makefile
@@ -7,6 +7,7 @@
PKGNAMESUFFIX= -nightly
DISTNAME= rustc-nightly-src
+IGNORE=skip for exp-run
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures
Index: lang/rust/Makefile
===================================================================
--- lang/rust/Makefile
+++ lang/rust/Makefile
@@ -1,8 +1,8 @@
# Created by: Jyun-Yan You <jyyou@cs.nctu.edu.tw>
PORTNAME= rust
-PORTVERSION?= 1.54.0
-PORTREVISION?= 2
+PORTVERSION?= 1.55.0
+PORTREVISION?= 0
CATEGORIES= lang
MASTER_SITES= https://static.rust-lang.org/dist/:src \
https://dev-static.rust-lang.org/dist/:src \
@@ -68,8 +68,10 @@
WASM_VARS_OFF= _RUST_BUILD_WASM=false
# See WRKSRC/src/stage0.txt for the date and version values.
-BOOTSTRAPS_DATE?= 2021-06-17
-RUST_BOOTSTRAP_VERSION?= 1.53.0
+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_SUFFIX?= ${BOOTSTRAPS_SUFFIX_${ARCH}}
BOOTSTRAPS_SUFFIX_powerpc64?= -${PPC_ABI:tl}
@@ -173,9 +175,7 @@
@${ECHO_CMD} 'sysconfdir="${PREFIX}/etc"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} '[rust]' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'channel="${PKGNAMESUFFIX:Ustable:S/^-//}"' >> ${WRKSRC}/config.toml
-.if defined(NIGHTLY_DATE)
@${ECHO_CMD} 'codegen-units=1' >> ${WRKSRC}/config.toml
-.endif
@${ECHO_CMD} 'default-linker="${CC}"' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'deny-warnings=false' >> ${WRKSRC}/config.toml
@${ECHO_CMD} 'verbose-tests=true' >> ${WRKSRC}/config.toml
Index: lang/rust/distinfo
===================================================================
--- lang/rust/distinfo
+++ lang/rust/distinfo
@@ -1,57 +1,57 @@
-TIMESTAMP = 1629292249
-SHA256 (rust/rustc-1.54.0-src.tar.xz) = a2934f85f76a35a3796c0fefd31e91f5b6dd8377cd8c3769c1c10e7ce7a495f4
-SIZE (rust/rustc-1.54.0-src.tar.xz) = 116286856
-SHA256 (rust/2021-06-17/rustc-1.53.0-aarch64-unknown-freebsd.tar.xz) = e34bc2850c1e76cc8e0e5dda656694f2e2e6284f66e93fc5cb2479ba8b1cccbb
-SIZE (rust/2021-06-17/rustc-1.53.0-aarch64-unknown-freebsd.tar.xz) = 45271048
-SHA256 (rust/2021-06-17/rust-std-1.53.0-aarch64-unknown-freebsd.tar.xz) = a035ef383a9122e9cc30ba5975bbecc7cd6a134b9b8380bab2a18a8eeac399f7
-SIZE (rust/2021-06-17/rust-std-1.53.0-aarch64-unknown-freebsd.tar.xz) = 17196428
-SHA256 (rust/2021-06-17/cargo-1.53.0-aarch64-unknown-freebsd.tar.xz) = e96ccd334ebbb679ac1f2da6e09b28c68b82661c2159e3b9190719359e0ec4f7
-SIZE (rust/2021-06-17/cargo-1.53.0-aarch64-unknown-freebsd.tar.xz) = 4401588
-SHA256 (rust/2021-06-17/rustc-1.53.0-x86_64-unknown-freebsd.tar.xz) = 853010d8748f4851b394898888d99a89805f74bb9476ee729b89b4b6e3d8a009
-SIZE (rust/2021-06-17/rustc-1.53.0-x86_64-unknown-freebsd.tar.xz) = 40967620
-SHA256 (rust/2021-06-17/rust-std-1.53.0-x86_64-unknown-freebsd.tar.xz) = 84a6ae0cc5da6490c0423c7cd5066c8de6957e9e6e6f272a7b23469f306d1857
-SIZE (rust/2021-06-17/rust-std-1.53.0-x86_64-unknown-freebsd.tar.xz) = 22646668
-SHA256 (rust/2021-06-17/cargo-1.53.0-x86_64-unknown-freebsd.tar.xz) = ad9501ba9511813d135eb7f803f75b59497f02ecb04e3d44674d43782326d70f
-SIZE (rust/2021-06-17/cargo-1.53.0-x86_64-unknown-freebsd.tar.xz) = 5155176
-SHA256 (rust/2021-06-17/rustc-1.53.0-armv6-unknown-freebsd.tar.xz) = 6a519885a99a7852c6cfbce7432235ddcd76c2ecd4c7d41f2bd0ab6e5decd9e4
-SIZE (rust/2021-06-17/rustc-1.53.0-armv6-unknown-freebsd.tar.xz) = 46405940
-SHA256 (rust/2021-06-17/rust-std-1.53.0-armv6-unknown-freebsd.tar.xz) = 854d6bab840963326cbc96a2595a13d330a49b74661f3494398558b27c21315f
-SIZE (rust/2021-06-17/rust-std-1.53.0-armv6-unknown-freebsd.tar.xz) = 17134736
-SHA256 (rust/2021-06-17/cargo-1.53.0-armv6-unknown-freebsd.tar.xz) = 82f1c9f977a22d245a399fb901e35e3ae1aa78ccd20652aad0a568709316ce4d
-SIZE (rust/2021-06-17/cargo-1.53.0-armv6-unknown-freebsd.tar.xz) = 4544880
-SHA256 (rust/2021-06-17/rustc-1.53.0-armv7-unknown-freebsd.tar.xz) = e784383ae7ce49c568d75d02c4c858d984c6a521acfa54d1003ae645b72a7686
-SIZE (rust/2021-06-17/rustc-1.53.0-armv7-unknown-freebsd.tar.xz) = 46399456
-SHA256 (rust/2021-06-17/rust-std-1.53.0-armv7-unknown-freebsd.tar.xz) = d1542d274cfb0b8d6c1b29bb93d748fad0199dcb9110d90d0f3d2d69afa26d5f
-SIZE (rust/2021-06-17/rust-std-1.53.0-armv7-unknown-freebsd.tar.xz) = 17304176
-SHA256 (rust/2021-06-17/cargo-1.53.0-armv7-unknown-freebsd.tar.xz) = 55b0c7d619785ea8873b77a018a610f03b06f911f3051addceee49482fe7e4cb
-SIZE (rust/2021-06-17/cargo-1.53.0-armv7-unknown-freebsd.tar.xz) = 4533940
-SHA256 (rust/2021-06-17/rustc-1.53.0-i686-unknown-freebsd.tar.xz) = 7539cbbc6c0066ebace7aada572020f899f830cc247864e77c7c15d739077c8a
-SIZE (rust/2021-06-17/rustc-1.53.0-i686-unknown-freebsd.tar.xz) = 48599256
-SHA256 (rust/2021-06-17/rust-std-1.53.0-i686-unknown-freebsd.tar.xz) = b2a47cfbe9cec9b3e91abd9bcb8df9d8bf67f790dd73e60d9cca43502dff4402
-SIZE (rust/2021-06-17/rust-std-1.53.0-i686-unknown-freebsd.tar.xz) = 22529204
-SHA256 (rust/2021-06-17/cargo-1.53.0-i686-unknown-freebsd.tar.xz) = 7e6cd0c5c02b0168d77f93d2564dc204141b70e1c883eb86b6c57743b0595c36
-SIZE (rust/2021-06-17/cargo-1.53.0-i686-unknown-freebsd.tar.xz) = 5205264
-SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc-unknown-freebsd.tar.xz) = 6b8b3b715dfe97cab4ef0791d75dfdbdf50dacaeff4010751d035b3deda83150
-SIZE (rust/2021-06-17/rustc-1.53.0-powerpc-unknown-freebsd.tar.xz) = 47256744
-SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc-unknown-freebsd.tar.xz) = 450463c4063d5a82c0d8ee73cae4de8e855ff76f53c8a1cf3ed04b8615d38e74
-SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc-unknown-freebsd.tar.xz) = 16767420
-SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc-unknown-freebsd.tar.xz) = 029392eabed33aadf6294e4f1d42ecf8226e187a4873242a791bfcf5e6844ef3
-SIZE (rust/2021-06-17/cargo-1.53.0-powerpc-unknown-freebsd.tar.xz) = 4949280
-SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 8d03cc993c0b799b66517ae11f050830f25b7a93a4c337b1bf4ffcad0d9099fe
-SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 55399432
-SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 284b8849990df55c540b86f46d306af1960f364b263f1474ecc317f7a741f6bd
-SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 16998160
-SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = e1fb85decdcc10317fff06ccf350b5a57303dcd719df50979f38447b7020ca1f
-SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv1.tar.xz) = 5016992
-SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 5a32604c1c3bcb64919ed11db4b5cbb6cef5aea54d4e7f35fad445220f5dbfa6
-SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 48344072
-SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 8cdf9cf3be93494649d250a222dd4a8db6867a679f1c110dfe92bd9f2b761535
-SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 17106944
-SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 8665168eea8b04ee983de7ced7f7c6a3e88ec136561a0a8c89355ed3d55365dc
-SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64le-unknown-freebsd.tar.xz) = 4969784
-SHA256 (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 0df88d458b36bd5b7684b222ec555eb9a26db23f6355ec2034314f63a711c8de
-SIZE (rust/2021-06-17/rustc-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 46170144
-SHA256 (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 3728222329ca5175a2c58043893db99f6ae52a69ce79a8dd531d10a75cad01be
-SIZE (rust/2021-06-17/rust-std-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 17010544
-SHA256 (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4ff53b2649df6d6f449ff4be81b5e6ccbf8a1ae6b0a6ce70767547ef7e2e45c7
-SIZE (rust/2021-06-17/cargo-1.53.0-powerpc64-unknown-freebsd-elfv2.tar.xz) = 4710772
+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
+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
Index: lang/rust/files/patch-src_llvm-project_compiler-rt_lib_builtins_cpu__model.c
===================================================================
--- lang/rust/files/patch-src_llvm-project_compiler-rt_lib_builtins_cpu__model.c
+++ lang/rust/files/patch-src_llvm-project_compiler-rt_lib_builtins_cpu__model.c
@@ -1,16 +1,19 @@
---- src/llvm-project/compiler-rt/lib/builtins/cpu_model.c.orig 2021-05-22 10:27:43 UTC
+https://reviews.llvm.org/D109330
+
+--- src/llvm-project/compiler-rt/lib/builtins/cpu_model.c.orig 2021-07-12 08:53:30 UTC
+++ src/llvm-project/compiler-rt/lib/builtins/cpu_model.c
-@@ -775,7 +775,12 @@ _Bool __aarch64_have_lse_atomics
+@@ -775,8 +775,14 @@ _Bool __aarch64_have_lse_atomics
#define HWCAP_ATOMICS (1 << 8)
#endif
static void CONSTRUCTOR_ATTRIBUTE init_have_lse_atomics(void) {
-- unsigned long hwcap = getauxval(AT_HWCAP);
-+ unsigned long hwcap = 0;
-+#if defined(__linux__)
-+ hwcap = getauxval(AT_HWCAP);
-+#elif defined(__FreeBSD__)
-+ elf_aux_info(AT_HWCAP, &hwcap, sizeof(unsigned long));
-+#endif
++#if defined(__FreeBSD__)
++ unsigned long hwcap;
++ int result = elf_aux_info(AT_HWCAP, &hwcap, sizeof hwcap);
++ __aarch64_have_lse_atomics = result == 0 && (hwcap & HWCAP_ATOMICS) != 0;
++#else
+ unsigned long hwcap = getauxval(AT_HWCAP);
__aarch64_have_lse_atomics = (hwcap & HWCAP_ATOMICS) != 0;
++#endif
}
#endif // defined(__has_include)
+ #endif // __has_include(<sys/auxv.h>)
Index: lang/rust/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs
===================================================================
--- /dev/null
+++ lang/rust/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs
@@ -0,0 +1,45 @@
+We run cargo update during USES=cargo ports builds to update specific
+crates and patch Cargo.lock for us. For normal crates this is based
+on what's available in the vendor dir. For Git sources this pulls
+new changes from the net instead even if we replace the source with
+a static path in a patch section in the config file. Add a hack
+to skip this.
+
+This is for experimentation to solve [1]. For this to maybe be
+useful for USES=cargo, the patch-in-config feature also needs to
+be stabilized first. It will be available in Rust 1.56.
+
+[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256581
+
+--- src/tools/cargo/src/cargo/sources/git/source.rs.orig 2021-09-06 18:42:51 UTC
++++ src/tools/cargo/src/cargo/sources/git/source.rs
+@@ -84,6 +84,9 @@ impl<'cfg> Debug for GitSource<'cfg> {
+
+ impl<'cfg> Source for GitSource<'cfg> {
+ fn query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> {
++ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
++ return Ok(());
++ }
+ let src = self
+ .path_source
+ .as_mut()
+@@ -92,6 +95,9 @@ impl<'cfg> Source for GitSource<'cfg> {
+ }
+
+ fn fuzzy_query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> {
++ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
++ return Ok(());
++ }
+ let src = self
+ .path_source
+ .as_mut()
+@@ -112,6 +118,9 @@ impl<'cfg> Source for GitSource<'cfg> {
+ }
+
+ fn update(&mut self) -> CargoResult<()> {
++ if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
++ return Ok(());
++ }
+ let git_path = self.config.git_path();
+ let git_path = self.config.assert_package_cache_locked(&git_path);
+ let db_path = git_path.join("db").join(&self.ident);
Index: lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs
===================================================================
--- /dev/null
+++ lang/rust/files/patch-src_tools_cargo_src_cargo_util_toml_mod.rs
@@ -0,0 +1,22 @@
+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<P: ResolveToPath> DetailedTomlDependency<P> {
+
+ 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)
+ }
+ }
+ }
Index: lang/rust/files/patch-vendor_openssl-sys_build_main.rs
===================================================================
--- lang/rust/files/patch-vendor_openssl-sys_build_main.rs
+++ /dev/null
@@ -1,19 +0,0 @@
---- vendor/openssl-sys/build/main.rs.orig 2021-07-26 15:20:39 UTC
-+++ vendor/openssl-sys/build/main.rs
-@@ -232,6 +232,7 @@ See rust-openssl README for more information:
- (3, 2, _) => ('3', '2', 'x'),
- (3, 3, 0) => ('3', '3', '0'),
- (3, 3, 1) => ('3', '3', '1'),
-+ (3, 3, _) => ('3', '3', 'x'),
- _ => version_error(),
- };
-
-@@ -272,7 +273,7 @@ fn version_error() -> ! {
- "
-
- This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
--through 3.3.1, but a different version of OpenSSL was found. The build is now aborting
-+through 3.3.x, but a different version of OpenSSL was found. The build is now aborting
- due to this version mismatch.
-
- "
Index: lang/rust/files/powerpc/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
===================================================================
--- lang/rust/files/powerpc/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_mod.rs
+++ /dev/null
@@ -1,12 +0,0 @@
---- vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig
-+++ vendor/libc/src/unix/bsd/freebsdlike/freebsd/mod.rs
-@@ -1568,6 +1568,9 @@ cfg_if! {
- } else if #[cfg(target_arch = "arm")] {
- mod arm;
- pub use self::arm::*;
-+ } else if #[cfg(target_arch = "powerpc")] {
-+ mod powerpc;
-+ pub use self::powerpc::*;
- } else if #[cfg(target_arch = "powerpc64")] {
- mod powerpc64;
- pub use self::powerpc64::*;
Index: lang/rust/files/powerpc/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_powerpc.rs
===================================================================
--- lang/rust/files/powerpc/patch-vendor_libc_src_unix_bsd_freebsdlike_freebsd_powerpc.rs
+++ /dev/null
@@ -1,50 +0,0 @@
---- /dev/null
-+++ vendor/libc/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 = u32;
-+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,
-+ __unused: [u8; 8],
-+ }
-+}
-+
-+// 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
Index: lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs
===================================================================
--- lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs
+++ lang/rust/files/powerpc64-elfv1/patch-src_bootstrap_native.rs
@@ -1,6 +1,6 @@
---- src/bootstrap/native.rs.orig 2019-11-04 15:45:21 UTC
+--- src/bootstrap/native.rs.orig 2021-09-06 18:42:35 UTC
+++ src/bootstrap/native.rs
-@@ -241,6 +241,10 @@ impl Step for Llvm {
+@@ -277,6 +277,10 @@ impl Step for Llvm {
}
}
@@ -8,6 +8,6 @@
+ cfg.define("CMAKE_EXE_LINKER_FLAGS", "-Wl,-rpath=/usr/local/lib/%CC% -L/usr/local/lib/%CC%");
+ }
+
- // http://llvm.org/docs/HowToCrossCompileLLVM.html
- if target != builder.config.build && !emscripten {
- builder.ensure(Llvm {
+ // https://llvm.org/docs/HowToCrossCompileLLVM.html
+ if target != builder.config.build {
+ builder.ensure(Llvm { target: builder.config.build });
Index: lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_mod.rs
===================================================================
--- lang/rust/files/powerpc64le/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 2020-09-30 18:06:47.040460000 -0500
-@@ -553,6 +553,7 @@ supported_targets! {
- ("armv7-unknown-freebsd", armv7_unknown_freebsd),
- ("i686-unknown-freebsd", i686_unknown_freebsd),
- ("powerpc64-unknown-freebsd", powerpc64_unknown_freebsd),
-+ ("powerpc64le-unknown-freebsd", powerpc64le_unknown_freebsd),
- ("x86_64-unknown-freebsd", x86_64_unknown_freebsd),
-
- ("x86_64-unknown-dragonfly", x86_64_unknown_dragonfly),
Index: lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_powerpc64le__unknown__freebsd.rs
===================================================================
--- lang/rust/files/powerpc64le/patch-compiler_rustc__target_src_spec_powerpc64le__unknown__freebsd.rs
+++ /dev/null
@@ -1,19 +0,0 @@
---- compiler/rustc_target/src/spec/powerpc64le_unknown_freebsd.rs.orig 2021-01-07 03:05:53 UTC
-+++ compiler/rustc_target/src/spec/powerpc64le_unknown_freebsd.rs
-@@ -0,0 +1,16 @@
-+use crate::spec::{LinkerFlavor, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = super::freebsd_base::opts();
-+ base.cpu = "ppc64le".to_string();
-+ base.pre_link_args.entry(LinkerFlavor::Gcc).or_default().push("-m64".to_string());
-+ base.max_atomic_width = Some(64);
-+
-+ Target {
-+ llvm_target: "powerpc64le-unknown-freebsd".to_string(),
-+ pointer_width: 64,
-+ data_layout: "e-m:e-i64:64-n32:64".to_string(),
-+ arch: "powerpc64".to_string(),
-+ options: TargetOptions { mcount: "_mcount".to_string(), ..base },
-+ }
-+}
Index: multimedia/kooha/files/patch-build-aux_cargo.sh
===================================================================
--- /dev/null
+++ multimedia/kooha/files/patch-build-aux_cargo.sh
@@ -0,0 +1,18 @@
+--- build-aux/cargo.sh.orig 2021-09-10 08:14:31 UTC
++++ build-aux/cargo.sh
+@@ -8,13 +8,13 @@ export CARGO_HOME="$MESON_BUILD_ROOT"/cargo-home
+ if [ "$4" = "Devel" ]
+ then
+ echo "DEBUG MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml && \
+- cp "$CARGO_TARGET_DIR"/debug/$5 $3
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/$5 $3
+ else
+ echo "RELEASE MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml --release && \
+- cp "$CARGO_TARGET_DIR"/release/$5 $3
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/$5 $3
+ fi
+
Index: net-im/libsignal-client/Makefile
===================================================================
--- net-im/libsignal-client/Makefile
+++ net-im/libsignal-client/Makefile
@@ -234,7 +234,7 @@
PLIST_FILES= lib/libsignal_jni.so
do-install:
- ${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libsignal_jni.so \
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsignal_jni.so \
${STAGEDIR}${PREFIX}/lib/
.include <bsd.port.mk>
Index: net-im/zkgroup/Makefile
===================================================================
--- net-im/zkgroup/Makefile
+++ net-im/zkgroup/Makefile
@@ -134,7 +134,7 @@
PLIST_FILES= lib/lib${PORTNAME}.so
do-install:
- ${INSTALL_LIB} ${WRKDIR}/target/release/lib${PORTNAME}.so \
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/lib${PORTNAME}.so \
${STAGEDIR}${PREFIX}/lib/
.include <bsd.port.mk>
Index: net/quiche/Makefile
===================================================================
--- net/quiche/Makefile
+++ net/quiche/Makefile
@@ -148,10 +148,10 @@
# install quiche apps and libquiche
do-install:
${INSTALL_DATA} ${WRKSRC}/include/quiche.h ${STAGEDIR}${PREFIX}/include
- ${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libquiche.so ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libquiche.a ${STAGEDIR}${PREFIX}/lib
- ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/quiche-server ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/quiche-client ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.so ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libquiche.a ${STAGEDIR}${PREFIX}/lib
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche-server ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/quiche-client ${STAGEDIR}${PREFIX}/bin
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Index: security/arti/Makefile
===================================================================
--- security/arti/Makefile
+++ security/arti/Makefile
@@ -288,7 +288,7 @@
PLIST_FILES= bin/arti
do-install:
- ${INSTALL_SCRIPT} ${WRKDIR}/target/release/arti ${STAGEDIR}${PREFIX}/bin/arti
+ ${INSTALL_SCRIPT} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/arti ${STAGEDIR}${PREFIX}/bin/arti
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/arti
Index: security/authenticator/files/patch-build-aux_cargo.sh
===================================================================
--- /dev/null
+++ security/authenticator/files/patch-build-aux_cargo.sh
@@ -0,0 +1,15 @@
+--- build-aux/cargo.sh.orig 2021-09-08 15:33:49 UTC
++++ build-aux/cargo.sh
+@@ -12,10 +12,10 @@ if [ "$BUILDTYPE" = "release" ]; then
+ echo "RELEASE MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml --release &&
+- cp "$CARGO_TARGET_DIR"/release/"$APP_BIN" "$OUTPUT"
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/release/"$APP_BIN" "$OUTPUT"
+ else
+ echo "DEBUG MODE"
+ cargo build --manifest-path \
+ "$MESON_SOURCE_ROOT"/Cargo.toml &&
+- cp "$CARGO_TARGET_DIR"/debug/"$APP_BIN" "$OUTPUT"
++ cp "$CARGO_TARGET_DIR"/$CARGO_BUILD_TARGET/debug/"$APP_BIN" "$OUTPUT"
+ fi
Index: security/sequoia/Makefile
===================================================================
--- security/sequoia/Makefile
+++ security/sequoia/Makefile
@@ -309,17 +309,16 @@
${STAGEDIR}${PREFIX}/etc/bash_completion.d \
${STAGEDIR}${PREFIX}/share/fish/completions \
${STAGEDIR}${PREFIX}/share/zsh/site-functions
-.for f in ffi ffi_macros openpgp_ffi
- ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so
- ${INSTALL_LIB} ${CARGO_TARGET_DIR}/release/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS}
+.for f in ffi openpgp_ffi
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/libsequoia_${f}.so ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so.${SOVERS}
${LN} -sf libsequoia_${f}.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_${f}.so
.endfor
+ ${INSTALL_LIB} ${CARGO_TARGET_DIR}/*/libsequoia_ffi_macros.so ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so.${SOVERS}
+ ${LN} -sf libsequoia_ffi_macros.so.${SOVERS} ${STAGEDIR}${PREFIX}/lib/libsequoia_ffi_macros.so
.for f in sq sqop sqv
- ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/${f}
- ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/${f} ${STAGEDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${f} ${STAGEDIR}${PREFIX}/bin
.endfor
- ${STRIP_CMD} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store
- ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/release/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/sequoia-public-key-store ${STAGEDIR}${PREFIX}/lib/sequoia/sequoia-public-key-store
(cd ${WRKSRC}/ffi/include && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include)
(cd ${WRKSRC}/openpgp-ffi/include/sequoia && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/sequoia)
Index: security/solana/Makefile
===================================================================
--- security/solana/Makefile
+++ security/solana/Makefile
@@ -588,7 +588,7 @@
BINARY_ALIAS= llvm-config=${PREFIX}/bin/llvm-config${LLVM_VERSION}
do-install:
- for f in ${WRKDIR}/target/release/${PORTNAME}*; do \
+ for f in ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/${PORTNAME}*; do \
if [ -f $$f -a -x $$f ]; then \
${INSTALL_PROGRAM} $$f ${STAGEDIR}${PREFIX}/bin; \
fi \
Index: www/deno/Makefile
===================================================================
--- www/deno/Makefile
+++ www/deno/Makefile
@@ -462,6 +462,6 @@
${WRKSRC}/cargo-crates/rusty_v8-${RUSTY_VERS}/buildtools/third_party/libc++/BUILD.gn
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/target/release/deno ${STAGEDIR}${LOCALBASE}/bin
+ ${INSTALL_PROGRAM} ${CARGO_TARGET_DIR}/${CARGO_BUILD_TARGET}/*/deno ${STAGEDIR}${LOCALBASE}/bin
.include <bsd.port.mk>

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 8:10 AM (10 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15612480
Default Alt Text
D31872.id95218.diff (56 KB)

Event Timeline