From owner-svn-ports-all@freebsd.org Wed Dec 5 23:20:49 2018 Return-Path: Delivered-To: svn-ports-all@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 C068E132A19B; Wed, 5 Dec 2018 23:20:49 +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 673496F8F7; Wed, 5 Dec 2018 23:20:49 +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 2FD691B1FC; Wed, 5 Dec 2018 23:20:49 +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 wB5NKnUw085124; Wed, 5 Dec 2018 23:20:49 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB5NKmvv085122; Wed, 5 Dec 2018 23:20:48 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201812052320.wB5NKmvv085122@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 5 Dec 2018 23:20:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r486724 - in branches/2018Q4: graphics/ilmbase sysutils/e2fsprogs X-SVN-Group: ports-branches X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in branches/2018Q4: graphics/ilmbase sysutils/e2fsprogs X-SVN-Commit-Revision: 486724 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 673496F8F7 X-Spamd-Result: default: False [-0.76 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.42)[-0.423,0]; NEURAL_HAM_SHORT(-0.28)[-0.282,0]; NEURAL_HAM_LONG(-0.05)[-0.054,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Dec 2018 23:20:50 -0000 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}