From b017a6d66f64adefb7c828b578f319011d5f5551 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Tue, 4 Dec 2018 22:36:34 +0000 Subject: Align *_DEPENDS and use paths for bash in my ports; fix var name. On systems where bash is in $PATH but not in ${LOCALBASE}/bin/bash, ilmbase would fail to build, and e2fsprogs might fail if the BASHTESTS option was enabled. Make sure that the _DEPENDS and the actual path handed to the configure or test rig match to the letter, to avoid a time-of-check vs. time-of-use discrepancy. In e2fsprogs, the helper variable was also mistyped and would never amend to BUILD_DEPENDS. Fix typo. Check my other ports, but wiggle and xmlto [textproc/] seem unaffected. Reported by: J R Matthews (direct email) MFH: 2018Q4 --- sysutils/e2fsprogs/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sysutils/e2fsprogs') diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile index cd13a1a98871..dc5e7a2969cf 100644 --- a/sysutils/e2fsprogs/Makefile +++ b/sysutils/e2fsprogs/Makefile @@ -66,7 +66,8 @@ BASHTESTS_DESC= Enable tests that require the GNU bash shell FUSEFS_CONFIGURE_ENABLE= fuse2fs BUILD_DEPENDS+= gdd:sysutils/coreutils -BASHTEST_BUILD_DEPENDS= bash:shells/bash +BASHTESTS_BUILD_DEPENDS= ${BASH_CMD}:shells/bash +BASH_CMD= ${LOCALBASE}/bin/bash LIB_DEPENDS+= libblkid.so:misc/e2fsprogs-libblkid LIB_DEPENDS+= libss.so:devel/e2fsprogs-libss @@ -207,7 +208,7 @@ _checkaddargs+=TMPDIR=${WRKDIR}/tmp .endif .if ${PORT_OPTIONS:MBASHTESTS} -_checkaddargs+=--eval SHELL:=${LOCALBASE}/bin/bash +_checkaddargs+=--eval SHELL:=${BASH_CMD} .endif .if ${PORT_OPTIONS:MSLOWTESTS} -- cgit v1.2.3