From nobody Sun Jan 07 15:15:48 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T7LP10sXnz57CGp; Sun, 7 Jan 2024 15:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T7LP10GtRz3xvD; Sun, 7 Jan 2024 15:15:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704640549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AEGq0GUzaDIxGK88uyliu8EUnV6IZShBvaKJNLPhEA=; b=j5SoNnZfaRFVDwvOsMofc4syUuopvtzjkszMpqtni08IJz2fxCo/Y8vo0EbZr+zvZWLMtl L4m6hRFWqdNMrkgQAiVhDW+Z94XKdsTRrLRd6WurLSgQdZqjsboFIUyqDhe78p07g6hrIE deXA+KKYitEW/E+eCdofiXNYJWAkYh7G+j1zREG0kMEgWgVzAXH3kg+9M/YvMQn8M/63j8 F7M4ekapwi8Geh7CRSw5uBGVyuTs6QmcTIZvYK5fDSh4er4T9U14vPxZ9+o4o2GQw5FnNn kxFdLa+Vvcq532JiCsiQ1a8YDa83NxqtqCan1QTP9q/qvPIIZUrNJQTspjN9MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704640549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AEGq0GUzaDIxGK88uyliu8EUnV6IZShBvaKJNLPhEA=; b=UGLJ6HPCHBHxDie3IHR0vdbV+DsEKEzMT3g67dFb0fKbM44F4aEIufgoHpmqKvpgY3dpRB BVJg40I+YNQ719oZm7SPJVH1gRxyoQYlZD/an510Yuzmr5xHAeHclc9lrJoJxyJ6pssSkY 7oBM2LUPdK3drAZGU0xnwpA4vpWtuQBMGPGttemiS4isrIi61YpfdhmWcR/A9XdQOrAFh4 G53iuUoSxNKnpGb0OxV78J0hO9NQm/dK5mPvSV+9C5vG9hJy5Ju1rcJN7Fdkyzyd/MIrOZ BX22MBETqn+L6qxYbtdz+slVfjRga7i85U4To70S6ltZpkHOCOvfBWWRR55TNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704640549; a=rsa-sha256; cv=none; b=VqNZSPWPKnhGaPBmjx0biHcRqheJVDAEP++A2PRE1freIw0ZYmwyIZpcwuSn1KD53ZkYU6 X1mikWFJ0T2Mxpwo/a3oDzXnwrjd8pxjFgV+OdbUALL4izt3nJ5gCK84pXZNfS5g6O7+MU BxitujqFBALUQqrUALMzGtujC0dNN7j2hA3tNBEfepJ0pwdbyq5wThXQ3sHmZ+2xeyTPD1 vfyawl+ezNTP18ksr1HGG7aQnUTPxSHG+X6TUIF7cKAu6QdFeyYLKioRIQXPDmB31mH3A9 IdUPoQfCfYo7jkn+wAX74jLpodx3wgkofqlGyo6Ny3kv4SgJefMeLnjBfmiB9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T7LP06RzWzTGq; Sun, 7 Jan 2024 15:15:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 407FFmcs061027; Sun, 7 Jan 2024 15:15:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 407FFm42061024; Sun, 7 Jan 2024 15:15:48 GMT (envelope-from git) Date: Sun, 7 Jan 2024 15:15:48 GMT Message-Id: <202401071515.407FFm42061024@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joel Bodenmann Subject: git: c2e360d6257f - main - Mk/Uses/cargo.mk: Fix cargo-extract target List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2e360d6257f5c5ee9812fe996337d2da6150947 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2e360d6257f5c5ee9812fe996337d2da6150947 commit c2e360d6257f5c5ee9812fe996337d2da6150947 Author: Dmitry Wagin AuthorDate: 2023-12-31 17:58:41 +0000 Commit: Joel Bodenmann CommitDate: 2024-01-07 15:14:10 +0000 Mk/Uses/cargo.mk: Fix cargo-extract target Fix an issue where the cargo-extract target fails when a port sets DIST_SUBDIR. PR: 275634 Approved by: tcberner (mentor), rust (tobik) Differential Revision: https://reviews.freebsd.org/D43259 --- Mk/Uses/cargo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index b0c900dda8ca..2365e7620133 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -284,7 +284,7 @@ cargo-extract: . if ${_index} != @git @${MV} ${WRKDIR}/${_crate} ${CARGO_VENDOR_DIR}/${_crate} @${PRINTF} '{"package":"%s","files":{}}' \ - $$(${SHA256} -q ${DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \ + $$(${SHA256} -q ${_DISTDIR}/${CARGO_DIST_SUBDIR}/${_crate}${CARGO_CRATE_EXT}) \ > ${CARGO_VENDOR_DIR}/${_crate}/.cargo-checksum.json @if [ -r ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig ]; then \ ${MV} ${CARGO_VENDOR_DIR}/${_crate}/Cargo.toml.orig \