svn commit: r563191 - head/lang/rust
Mikael Urankar
mikael at FreeBSD.org
Fri Jan 29 10:49:02 UTC 2021
Author: mikael
Date: Fri Jan 29 10:49:01 2021
New Revision: 563191
URL: https://svnweb.freebsd.org/changeset/ports/563191
Log:
lang/rust: reroll the aarch64 bootstrap.
This new bootstrap is based on rust 1.49.0 built with a 12.1 sysroot.
PR: 251254
Reported by: dch, mmel
Tested by: dch, mikael
Modified:
head/lang/rust/Makefile
head/lang/rust/distinfo
Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile Fri Jan 29 10:28:56 2021 (r563190)
+++ head/lang/rust/Makefile Fri Jan 29 10:49:01 2021 (r563191)
@@ -32,7 +32,8 @@ ONLY_FOR_ARCHS_REASON?= requires prebuilt bootstrap co
BUILD_DEPENDS= cmake:devel/cmake \
libgit2>=1.0.0:devel/libgit2 \
- ninja:devel/ninja
+ ninja:devel/ninja \
+ bash>0:shells/bash
LIB_DEPENDS= libcurl.so:ftp/curl \
libgit2.so:devel/libgit2 \
libssh2.so:security/libssh2
@@ -186,21 +187,51 @@ do-configure:
do-build:
@cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py build --jobs=${MAKE_JOBS_NUMBER}
+ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py dist --jobs=${MAKE_JOBS_NUMBER} \
+ library/std src/librustc cargo clippy rustfmt src
+ ${RM} -rf ${WRKSRC}/build/tmp/dist
+COMPONENTS= rustc-${PORTVERSION}-${_RUST_TARGET} \
+ rust-std-${PORTVERSION}-${_RUST_TARGET} \
+ cargo-${PORTVERSION}-${_RUST_TARGET} \
+ clippy-${PORTVERSION}-${_RUST_TARGET} \
+ rustfmt-${PORTVERSION}-${_RUST_TARGET}
+
+.if ${PORT_OPTIONS:MSOURCES}
+COMPONENTS+= rust-src-${PORTVERSION}
+.endif
+
+.if ${PORT_OPTIONS:MWASM}
+COMPONENTS+= rust-std-${PORTVERSION}-wasm32-unknown-unknown
+.endif
+
do-install:
- @cd ${WRKSRC} && \
- ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} x.py install --jobs=${MAKE_JOBS_NUMBER}
+ @${RM} -r ${WRKSRC}/_extractdist
+.for _c in ${COMPONENTS}
+ ${MKDIR} ${WRKSRC}/_extractdist
+ cd ${WRKSRC}/_extractdist && ${TAR} xf \
+ ${WRKSRC}/build/dist/${_c}.tar.xz
+ ${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
+ ${WRKSRC}/_extractdist/${_c}/install.sh
+ cd ${WRKSRC}/_extractdist/${_c} && \
+ ${LOCALBASE}/bin/bash ./install.sh \
+ --prefix="${STAGEDIR}${PREFIX}" \
+ --mandir="${STAGEDIR}${PREFIX}/share/man"
+ @${RM} -r ${WRKSRC}/_extractdist
+.endfor
+
# We autogenerate the plist file. We do that, instead of the
# regular pkg-plist, because several libraries have a computed
# filename based on the absolute path of the source files. As it
# is user-specific, we cannot know their filename in advance.
+post-install:
+ # cleanup
@${RM} -r ${STAGEDIR}${DOCSDIR}/*.old \
- ${STAGEDIR}${DOCSDIR}/html/.lock \
- ${STAGEDIR}${DOCSDIR}/html/.stamp \
${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
- ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-* \
- ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
+ ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh \
+ ${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
+ ${STAGEDIR}${PREFIX}/lib/rustlib/components \
+ ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-*
@${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -exec ${FILE} -i {} + | \
${AWK} -F: '/executable|sharedlib/ { print $$1 }' | ${XARGS} ${STRIP_CMD}
@${FIND} ${STAGEDIR}${PREFIX} -not -type d | \
Modified: head/lang/rust/distinfo
==============================================================================
--- head/lang/rust/distinfo Fri Jan 29 10:28:56 2021 (r563190)
+++ head/lang/rust/distinfo Fri Jan 29 10:49:01 2021 (r563191)
@@ -1,12 +1,12 @@
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) = 1a2d975dc14f30044cdef9045af7fbe47fdb4652b5f1da55afebda59857e56b4
-SIZE (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 39078180
-SHA256 (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 3c4af0093a028c8273e4bcd0c45444a42bfa1627de96ee925795573898dad1c9
-SIZE (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 16735248
-SHA256 (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 180b78e030d105818b6989f71491a86edcd69bf7554e1500a0a01d9dc94d6f87
-SIZE (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 3276872
+SHA256 (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 0f46a12e34343b2b79062a5378ed9b1586d0668662faad9fcab17158d221a488
+SIZE (rust/2020-11-19/rustc-1.48.0-aarch64-unknown-freebsd.tar.xz) = 35695192
+SHA256 (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 5c14b9eb10b0733d5206fc2c6d5d20f100c3b6909adc8f83ffa2ce943a50194f
+SIZE (rust/2020-11-19/rust-std-1.48.0-aarch64-unknown-freebsd.tar.xz) = 16890332
+SHA256 (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = d5ca68a96002eb60a0598a0c22a9e7c26631c6b38650f42eb6d565a91e0f5d27
+SIZE (rust/2020-11-19/cargo-1.48.0-aarch64-unknown-freebsd.tar.xz) = 4145184
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
More information about the svn-ports-all
mailing list