diff options
| author | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-01 08:43:43 +0000 |
|---|---|---|
| committer | Tobias Kortkamp <tobik@FreeBSD.org> | 2019-12-01 08:43:43 +0000 |
| commit | a775a5b8ecde19b6aa0b44c026a2498478ad4ba8 (patch) | |
| tree | 965e023740a2a795ceeee6b2ade79da5ae5ce518 /Mk/Uses/cargo.mk | |
| parent | Refer to release tag by commitid to fix build (diff) | |
Mk/Uses/cargo.mk: Do not override do-configure
Cargo vendoring can be useful even for ports that use other build
systems like Meson to call Cargo for the actual build. Often they
use the framework's default do-configure which USES=cargo should
not overwrite.
Remove hacks from games/jaggedalliance2 and x11/squeekboard.
Reviewed by: jbeich
Differential Revision: https://reviews.freebsd.org/D22619
Notes
Notes:
svn path=/head/; revision=518760
Diffstat (limited to 'Mk/Uses/cargo.mk')
| -rw-r--r-- | Mk/Uses/cargo.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index 206440f93600..6aadf51888f4 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -241,10 +241,12 @@ cargo-patch-git: ${SED} -i.dist -E ${_CARGO_GIT_PATCH_CARGOTOML} {} + .endif -.if !target(do-configure) && ${CARGO_CONFIGURE:tl} == "yes" +.if ${CARGO_CONFIGURE:tl} == "yes" +_USES_configure+= 250:cargo-configure + # configure hook. Place a config file for overriding crates-io index # by local source directory. -do-configure: +cargo-configure: @${MKDIR} ${WRKDIR}/.cargo @${ECHO_CMD} "[source.cargo]" > ${WRKDIR}/.cargo/config @${ECHO_CMD} "directory = '${CARGO_VENDOR_DIR}'" >> ${WRKDIR}/.cargo/config |