From nobody Wed Jun 16 17:57:49 2021 X-Original-To: ports-bugs@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 3E4105D6833 for ; Wed, 16 Jun 2021 17:57:49 +0000 (UTC) (envelope-from bugzilla-noreply@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 4G4tFT19J2z4rg7 for ; Wed, 16 Jun 2021 17:57:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 0D96F2004B for ; Wed, 16 Jun 2021 17:57:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 15GHvnEH007582 for ; Wed, 16 Jun 2021 17:57:49 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 15GHvmBI007581 for ports-bugs@FreeBSD.org; Wed, 16 Jun 2021 17:57:49 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 256581] CARGO_GIT_SUBDIR doesn't work with unpacked [dependencies.] Date: Wed, 16 Jun 2021 17:57:49 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Ports Framework X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-patch X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: tobik@freebsd.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: rust@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: attachments.created Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Ports bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-ports-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports-bugs@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256581 --- Comment #1 from Tobias Kortkamp --- Created attachment 225862 --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=3D225862&action= =3Dedit cargo-git-update.diff Ok, to get away from the sed hackery we need to let cargo do the replacement with [patch] sections. This can maybe work like this: 1. Patch cargo to add an option to not force fetch Git sources when using cargo update (we abuse cargo update to trivially bump crate versions to avoid patching Cargo.lock ourselves; would be a shame to loose it); hack for that attached (against rust-1.52.0 branch in cargo=20 upstream). 2. Put appropriate [patch] sections into ${WRKDIR}/.cargo/config so that cargo can do the replacement itself. That currently requires the -Zpatch-in-config unstable feature [1]. For dns/dog (much less complicated for experimentation than games/veloren) the [patch] section would look like: GH_TUPLE=3D llogiq:mutagen:c7abc956a10e8a3e2cc71f21279ea0a42f7b7c10:m= utagen CARGO_GIT_SUBDIR=3D mutagen:mutagen:mutagen=20=20=20=20=20=20=20 =3D> [patch.'https://github.com/llogiq/mutagen'] mutagen =3D { path =3D "${WRKSRC_mutagen}/mutagen" } [1] https://github.com/rust-lang/cargo/issues/9269 --=20 You are receiving this mail because: You are on the CC list for the bug.=