From nobody Thu Jun 6 07:50:58 2024 X-Original-To: dev-commits-ports-all@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 4VvxN31hYWz5LfHj; Thu, 06 Jun 2024 07:50:59 +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 4VvxN25kmyz4HYS; Thu, 6 Jun 2024 07:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717660258; 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=fp0x/8aXDl/LDCdM7hCGadQhZetLbI9LDWnDDyNWZ3U=; b=F+2Ejxr2JMcoNp09ESEFbrx3/RwD8g7ZlVrWQvNVJf1wL+jJaPMpOMOO95ekQCa6Yh2cP9 p64F62IECcIoYhpwbEO/I7JMZvdvOCm+SK8nPUzJlFNbSXu75ssBnAi0mWISXYPPBMFsAv pvLF+mp7MO+HIUL4dVBhSv6ib94C9yddN825CUP9motTsHc27DjoXHrZcFnPRxlKQeH9Ll ZsXLVetUdsXigcvhlvj2fY/cSOWUyEQqtACVJ3UeDdNrVyme79IWzR7ULBoOKsyiqBM22q BfYkjqW2MD2YeRQn4pTyEl1/xMDYJAdSKniyDJyhhwPeVStJJTu5lCk6HMFoXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717660258; a=rsa-sha256; cv=none; b=UsbvKkwwZhZERBWvqmGIga266Hddg5K1TESNUqyLxSoVyR2D33VIHFs22M9IWs3fBVAQbv 5FiRlsJMXUCV9z0KI2HAWoV4CKy9yo2Cq43XxmoSZCCDp2lr4ZEWlc1kSauUL/HTOO24vD 6RvjLAjxKDewT1wVbsugrR4h6MkRChtlCVuM3BCII93VFtLwYferAzxRf67s9LyKLV2w2A psBN/ofq4TwjGnkS4b5VllotFRV9O6HIdYw4exDbIocueLnhmjf40QCKqnza85mEFi08o1 h7pvIrjQsPLQ0nBBH+viLiIIJkjKTjYVmh1MBPvH6U8PJ6G2vqsplYNydscJaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717660258; 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=fp0x/8aXDl/LDCdM7hCGadQhZetLbI9LDWnDDyNWZ3U=; b=i0566NszzP1vKM9YvFm+OTbJTxf4Iv349/XE0FZc2Ss7lTl66BYEvKP+Lf7d9KvxyWwHe/ zBgPhbkqfxOJk4dHRqF2/WZHDZTCTQy3p09elSp60sE6PnCknobPmwaRfJ+jWj82K4u+W/ k2Lfrh8EQVGmJEcDixzuvge9vZZUZcGJvQJKbnNknYDqXghvDLO9/ldY5hhQyooYdIdwkb NTySEUyxoh0fMK5im/NUPeT42Ls+Ym5WFVNgz07f3EErxwHY5kGNqhyVXuGYMNyY7XpguZ e3aC2dO0/ouUlH7fjdpymgLup7Ix6fN88vaifRzDpWqF3F/Sz6BCyrMVKzK/Yw== 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 4VvxN24HQBzdTD; Thu, 6 Jun 2024 07:50:58 +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 4567owoB010071; Thu, 6 Jun 2024 07:50:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4567owRI010068; Thu, 6 Jun 2024 07:50:58 GMT (envelope-from git) Date: Thu, 6 Jun 2024 07:50:58 GMT Message-Id: <202406060750.4567owRI010068@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: af47301dd574 - main - Mk/Uses/cargo.mk: Generate Cargo.lock in the right place List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af47301dd57499c05ad627d3a81048e192f14f81 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=af47301dd57499c05ad627d3a81048e192f14f81 commit af47301dd57499c05ad627d3a81048e192f14f81 Author: Po-Chuan Hsieh AuthorDate: 2024-06-06 07:42:39 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-06-06 07:48:24 +0000 Mk/Uses/cargo.mk: Generate Cargo.lock in the right place Sometimes we use non-default CARGO_CARGOTOML/CARGO_CARGOLOCK, that means the Cargo.{toml,lock} are not under WRKSRC. Therefore, we change it from WRKSRC to CARGO_CARGOTOML:H in order to generate Cargo.lock in the right place. PR: 279495 Approved by: mikael --- 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 b6f9af00f11b..6083ca72564a 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -385,7 +385,7 @@ cargo-crates: cargo-crates-generate-lockfile cargo-crates-generate-lockfile: extract @if [ ! -r "${CARGO_CARGOLOCK}" ]; then \ ${ECHO_MSG} "===> ${CARGO_CARGOLOCK} not found. Trying to generate it..."; \ - cd ${WRKSRC}; ${_CARGO_RUN} generate-lockfile \ + cd ${CARGO_CARGOLOCK:H}; ${_CARGO_RUN} generate-lockfile \ --manifest-path ${CARGO_CARGOTOML} \ --verbose; \ fi