Date: Fri, 5 Jan 2018 23:28:16 +0000 (UTC) From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458178 - head/lang/rust Message-ID: <201801052328.w05NSGm3045549@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dumbbell Date: Fri Jan 5 23:28:16 2018 New Revision: 458178 URL: https://svnweb.freebsd.org/changeset/ports/458178 Log: lang/rust: Always replace bootstrap versions in `stage0.txt` This simplifies the `Makefile`. The condition was fragile anyway because it was based solely on the Makefile and not the actual content of `stage0.txt`. Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Jan 5 23:20:50 2018 (r458177) +++ head/lang/rust/Makefile Fri Jan 5 23:28:16 2018 (r458178) @@ -160,24 +160,15 @@ post-patch: # If we override the versions and date of the bootstraps (for instance # on aarch64 where we provide our own bootstraps), we need to update # places where they are recorded. - @if test "${BOOTSTRAPS_DATE_${ARCH}}" && \ - test "${BOOTSTRAPS_DATE_${ARCH}}" != "${BOOTSTRAPS_DATE}"; then \ - ${REINPLACE_CMD} -e \ + @${REINPLACE_CMD} -e \ 's|^date:.*|date: ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi - @if test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" && \ - test "${RUST_BOOTSTRAP_VERSION_${ARCH}}" != "${RUST_BOOTSTRAP_VERSION}"; then \ - ${REINPLACE_CMD} -e \ + ${WRKSRC}/src/stage0.txt + @${REINPLACE_CMD} -e \ 's|^rustc:.*|rustc: ${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi - @if test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" && \ - test "${CARGO_BOOTSTRAP_VERSION_${ARCH}}" != "${CARGO_BOOTSTRAP_VERSION}"; then \ - ${REINPLACE_CMD} -e \ + ${WRKSRC}/src/stage0.txt + @${REINPLACE_CMD} -e \ 's|^cargo:.*|cargo: ${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}|' \ - ${WRKSRC}/src/stage0.txt; \ - fi + ${WRKSRC}/src/stage0.txt # After patching crates, we need to update their corresponding # `.cargo-checksum.json` to reflect the new checksums verified by Cargo. @for dir in "${WRKSRC}/src/vendor/libc" "${WRKSRC}/src/vendor/openssl" "${WRKSRC}/src/vendor/openssl-sys"; do \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801052328.w05NSGm3045549>