From owner-svn-ports-head@freebsd.org Tue Dec 4 22:36:35 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37D7E1323F07; Tue, 4 Dec 2018 22:36:35 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D2AF3764B5; Tue, 4 Dec 2018 22:36:34 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B51F93BED; Tue, 4 Dec 2018 22:36:34 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB4MaYWd009281; Tue, 4 Dec 2018 22:36:34 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB4MaYS7009279; Tue, 4 Dec 2018 22:36:34 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201812042236.wB4MaYS7009279@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Tue, 4 Dec 2018 22:36:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486634 - in head: graphics/ilmbase sysutils/e2fsprogs X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head: graphics/ilmbase sysutils/e2fsprogs X-SVN-Commit-Revision: 486634 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D2AF3764B5 X-Spamd-Result: default: False [0.06 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.45)[-0.447,0]; NEURAL_SPAM_SHORT(0.54)[0.536,0]; NEURAL_HAM_LONG(-0.03)[-0.031,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Dec 2018 22:36:35 -0000 Author: mandree Date: Tue Dec 4 22:36:34 2018 New Revision: 486634 URL: https://svnweb.freebsd.org/changeset/ports/486634 Log: 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 Modified: head/graphics/ilmbase/Makefile head/sysutils/e2fsprogs/Makefile Modified: head/graphics/ilmbase/Makefile ============================================================================== --- head/graphics/ilmbase/Makefile Tue Dec 4 20:10:05 2018 (r486633) +++ head/graphics/ilmbase/Makefile Tue Dec 4 22:36:34 2018 (r486634) @@ -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: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Tue Dec 4 20:10:05 2018 (r486633) +++ head/sysutils/e2fsprogs/Makefile Tue Dec 4 22:36:34 2018 (r486634) @@ -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}