From owner-svn-ports-all@freebsd.org Fri Jan 5 23:33:43 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 88A55EA70D9; Fri, 5 Jan 2018 23:33:43 +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 516B465ED4; Fri, 5 Jan 2018 23:33:43 +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 w05NXgUV049475; Fri, 5 Jan 2018 23:33:42 GMT (envelope-from dumbbell@FreeBSD.org) Received: (from dumbbell@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w05NXgiJ049474; Fri, 5 Jan 2018 23:33:42 GMT (envelope-from dumbbell@FreeBSD.org) Message-Id: <201801052333.w05NXgiJ049474@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:33:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458179 - head/lang/rust X-SVN-Group: ports-head X-SVN-Commit-Author: dumbbell X-SVN-Commit-Paths: head/lang/rust X-SVN-Commit-Revision: 458179 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:33:43 -0000 Author: dumbbell Date: Fri Jan 5 23:33:42 2018 New Revision: 458179 URL: https://svnweb.freebsd.org/changeset/ports/458179 Log: lang/rust: Skip `.cargo-checksum.json` update when it's missing Currently we need to update `.cargo-checksum.json` in several patched crates. But those crates are missing from the sources if they come from GitHub instead of a proper released source archive. This change makes `post-patch` and `do-configure` recipes fine in both cases. Modified: head/lang/rust/Makefile Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Jan 5 23:28:16 2018 (r458178) +++ head/lang/rust/Makefile Fri Jan 5 23:33:42 2018 (r458179) @@ -172,6 +172,9 @@ post-patch: # 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 \ + if ! test -d "$$dir"; then \ + continue; \ + fi; \ cd "$$dir"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \ @@ -186,6 +189,9 @@ post-patch: # fix is applied. We'll need them in `do-configure` to update the # `.cargo-checksum.json` files. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ + if ! test -d "${WRKSRC}/$$crate"; then \ + continue; \ + fi; \ for file in $$(${FIND} "${WRKSRC}/$$crate" -name "config.rpath"); do \ ${CP} "$$file" "$$file.orig"; \ done; \ @@ -205,6 +211,9 @@ do-configure: # `do-configure`. Like after `extra-path-ino64`, we need to update # `.cargo-checksum.json`. @for crate in ${CRATES_PATCHED_BY_FBSD10_FIX}; do \ + if ! test -d "${WRKSRC}/$$crate"; then \ + continue; \ + fi; \ cd "${WRKSRC}/$$crate"; \ for file in $$(${FIND} * -name "*.orig"); do \ old_checksum=$$(${SHA256} -q "$$file"); \