From owner-svn-ports-all@freebsd.org Fri Jan 5 23:28:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF190EA6B26; Fri, 5 Jan 2018 23:28:17 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 86FC0655D7; Fri, 5 Jan 2018 23:28:17 +0000 (UTC) (envelope-from dumbbell@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w05NSG5p045550; Fri, 5 Jan 2018 23:28:16 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05NSGm3045549; Fri, 5 Jan 2018 23:28:16 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201801052328.w05NSGm3045549@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to dumbbell@FreeBSD.org using -f From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= Date: Fri, 5 Jan 2018 23:28:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458178 - head/lang/rust X-SVN-Group: ports-head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: head/lang/rust X-SVN-Commit-Revision: 458178 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jan 2018 23:28:17 -0000 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 \