diff options
Diffstat (limited to '')
| -rw-r--r-- | Mk/Uses/cargo.mk | 4 | ||||
| -rw-r--r-- | Mk/Uses/nodejs.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/vala.mk | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk index bfa6442c29f8..92a0f4b45c88 100644 --- a/Mk/Uses/cargo.mk +++ b/Mk/Uses/cargo.mk @@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}= ${WRKDIR}/${_wrksrc} CARGO_BUILDDEP?= yes . if ${CARGO_BUILDDEP:tl} == "yes" -BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.88.0:lang/${RUST_DEFAULT} +BUILD_DEPENDS+= ${RUST_DEFAULT}>=1.89.0:lang/${RUST_DEFAULT} . elif ${CARGO_BUILDDEP:tl} == "any-version" BUILD_DEPENDS+= ${RUST_DEFAULT}>=0:lang/${RUST_DEFAULT} . endif @@ -128,7 +128,7 @@ CARGO_ENV+= \ CARGO_TARGET_DIR=${CARGO_TARGET_DIR} \ RUSTC=${RUSTC} \ RUSTDOC=${RUSTDOC} \ - RUSTFLAGS="${RUSTFLAGS} ${LDFLAGS:C/.+/-C link-args=&/}" + RUSTFLAGS="${RUSTFLAGS} -C ar=${AR} -C linker=${CC} ${LDFLAGS:C/.+/-C link-args=&/}" . if ${ARCH} != powerpc64le CARGO_ENV+= RUST_BACKTRACE=1 diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk index e8987827fe2e..c1666835554a 100644 --- a/Mk/Uses/nodejs.mk +++ b/Mk/Uses/nodejs.mk @@ -7,7 +7,7 @@ # - build use node as build-time dependency # - run use node as runtime dependency # - env set the environment (NODEJS_VERSION and NODEJS_SUFFIX) -# - version available version: lts, current, 18, 20, 22, 24 +# - version available version: lts, current, 20, 22, 24 # # Note: # - The supported versions follow upstream release schedule @@ -22,13 +22,13 @@ .if !defined(_INCLUDE_USES_NODEJS_MK) _INCLUDE_USES_NODEJS_MK= yes -_VALID_NODEJS_VERSIONS= 18 20 22 24 current lts +_VALID_NODEJS_VERSIONS= 20 22 24 current lts . if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}} IGNORE= Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS} . endif -. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N24) +. if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N24) IGNORE= USES=nodejs has invalid arguments ${nodejs_ARGS} . endif diff --git a/Mk/Uses/vala.mk b/Mk/Uses/vala.mk index a12834d81fb7..53aef616e9cb 100644 --- a/Mk/Uses/vala.mk +++ b/Mk/Uses/vala.mk @@ -1,9 +1,12 @@ # Handle dependency on lang/vala # # Valid args: -# - lib: add a lib depends -# - build: add a build depends -# - no_depend: only used for lang/vala itself +# - lib: add a lib depends +# - build: add a build depends +# - test: add a test depends +# - no_depend: only used for lang/vala itself +# +# MAINTAINER: desktop@FreeBSD.org .if ! defined(_INCLUDE_USES_VALA_MK) _INCLUDE_USES_VALA_MK= yes @@ -21,6 +24,9 @@ LIB_DEPENDS+= ${_VALA_LIBRARY}:${_VALA_PORT} . if ! empty(vala_ARGS:Mbuild) BUILD_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT} . endif +. if ! empty(vala_ARGS:Mtest) +TEST_DEPENDS+= ${_VALA_BINARY}:${_VALA_PORT} +. endif . endif .endif |