svn commit: r486724 - in branches/2018Q4: graphics/ilmbase sysutils/e2fsprogs

[Matthias Andree]

Author: mandree
Date: Wed Dec  5 23:20:48 2018
New Revision: 486724
URL: https://svnweb.freebsd.org/changeset/ports/486724

Log:
  MFH: r486634
  
  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)
  
  Approved by:	ports-secteam (miwi)

Modified:
  branches/2018Q4/graphics/ilmbase/Makefile
  branches/2018Q4/sysutils/e2fsprogs/Makefile
Directory Properties:
  branches/2018Q4/   (props changed)

Modified: branches/2018Q4/graphics/ilmbase/Makefile
==============================================================================
--- branches/2018Q4/graphics/ilmbase/Makefile	Wed Dec  5 22:37:07 2018	(r486723)
+++ branches/2018Q4/graphics/ilmbase/Makefile	Wed Dec  5 23:20:48 2018	(r486724)
@@ -11,14 +11,17 @@ COMMENT=	ILM Base libraries a.k.a. Half, IlmThread, Im
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	bash:shells/bash
+# there are some systems that have a static /bin/bash, so
+# in order to make BUILD_DEPENDS effective, use the same absolute
+# path we will pass down through CONFIGURE_SHELL below.
+BUILD_DEPENDS=	${BASH_CMD}:shells/bash
 
 USES=		compiler:c++14-lang pkgconfig libtool
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 # The configure script uses bash arrays
-CONFIGURE_SHELL=	${LOCALBASE}/bin/bash
+CONFIGURE_SHELL=${BASH_CMD}
 CONFIGURE_ARGS=	--disable-static
 TEST_TARGET=	check
 
@@ -26,6 +29,8 @@ PORTDOCS=	AUTHORS ChangeLog README.md
 OPTIONS_DEFINE=		DOCS LARGE_STACK
 LARGE_STACK_DESC=	Enable sys-dependent large stack optimizations
 LARGE_STACK_CONFIGURE_ENABLE=	large-stack
+
+BASH_CMD=	${LOCALBASE}/bin/bash
 
 OPTIONS_SUB=	yes
 

Modified: branches/2018Q4/sysutils/e2fsprogs/Makefile
==============================================================================
--- branches/2018Q4/sysutils/e2fsprogs/Makefile	Wed Dec  5 22:37:07 2018	(r486723)
+++ branches/2018Q4/sysutils/e2fsprogs/Makefile	Wed Dec  5 23:20:48 2018	(r486724)
@@ -66,7 +66,8 @@ BASHTESTS_DESC=	Enable tests that require the GNU bash
 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}