Date: Tue, 07 Sep 2021 11:45:53 +0000 From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 256581] CARGO_GIT_SUBDIR doesn't work with unpacked [dependencies.<crate>] Message-ID: <bug-256581-7788-HiUXSVuMRM@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-256581-7788@https.bugs.freebsd.org/bugzilla/> References: <bug-256581-7788@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D256581 --- Comment #2 from Tobias Kortkamp <tobik@freebsd.org> --- 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.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-256581-7788-HiUXSVuMRM>