From nobody Tue Sep 07 11:45:53 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 57EDD17C5735 for ; Tue, 7 Sep 2021 11:45:54 +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 4H3k412ccFz4gjT for ; Tue, 7 Sep 2021 11:45:53 +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 BA3E011ECE for ; Tue, 7 Sep 2021 11:45:52 +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 187BjqRx024055 for ; Tue, 7 Sep 2021 11:45:52 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 187BjqT7024054 for ports-bugs@FreeBSD.org; Tue, 7 Sep 2021 11:45:52 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: Tue, 07 Sep 2021 11:45:53 +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: 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 #2 from Tobias Kortkamp --- patch-in-config has been stabilized in Rust 1.56 (2021-10-21). To get slightly more concrete it might look like this: diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 3d065a45ed3b..46a2ffd40d93 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -107,8 +107,8 @@ STRIP_CMD=3D ${LOCALBASE}/bin/strip # unsupported e_ty= pe with base strip # Helper to shorten cargo calls. CARGO_CARGO_RUN=3D \ - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO_ENV} \ - ${CARGO_CARGO_BIN} + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CARGO_ENV} RUSTC_BOOTSTRAP= =3D1 CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE=3D1 \ + ${CARGO_CARGO_BIN} -Zpatch-in-config # User arguments for cargo targets. CARGO_BUILD_ARGS?=3D @@ -296,6 +296,8 @@ cargo-configure: @${ECHO_CMD} "directory =3D '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config @${ECHO_CMD} "[source.crates-io]" >> ${WRKDIR}/.cargo/config @${ECHO_CMD} "replace-with =3D 'cargo'" >> ${WRKDIR}/.cargo/config + @${ECHO_CMD} "[patch.'https://github.com/llogiq/mutagen']" >> ${WRKDIR}/.cargo/config + @${ECHO_CMD} "mutagen =3D { path =3D '${WRKSRC_mutagen}/mutagen' }"= >> ${WRKDIR}/.cargo/config @if ! ${GREP} -qF '[profile.release]' ${CARGO_CARGOTOML}; then \ ${ECHO_CMD} "" >> ${CARGO_CARGOTOML}; \ ${ECHO_CMD} "[profile.release]" >> ${CARGO_CARGOTOML}; \ diff --git a/dns/dog/Makefile b/dns/dog/Makefile index e7b9aa7039de..2cb66d1895fa 100644 --- a/dns/dog/Makefile +++ b/dns/dog/Makefile @@ -90,8 +90,15 @@ CARGO_CRATES=3D addr2line-0.14.0 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ winreg-0.6.2 -CARGO_USE_GITHUB=3D yes -CARGO_GIT_SUBDIR=3D mutagen:mutagen:mutagen +# [[package]] +# name =3D "mutagen" +# source =3D "git+https://github.com/llogiq/mutagen#c7abc956a10e8a3e2cc71f21279ea0a42f7b= 7c10" +# +# make cargo-crates to turn entries like the above into +# +# CARGO_CRATES+=3D=20=20=20=20=20=20 git+https://github.com/llogiq/mutagen\#c7abc956a10e8a3e2cc71f21279ea0a42f7b= 7c10 +# +# which cargo.mk can then consume to create the appropriate [patch] sectio= ns and GH_TUPLE. PORTDOCS=3D README.md --=20 You are receiving this mail because: You are on the CC list for the bug.=