Date: Sat, 26 Nov 2011 06:50:11 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r227989 - projects/portbuild/scripts Message-ID: <201111260650.pAQ6oB9J078108@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Sat Nov 26 06:50:11 2011 New Revision: 227989 URL: http://svn.freebsd.org/changeset/base/227989 Log: Removed one too many lines, resulting in pointyhat itself's /etc/make.conf polluting INDEX. No. Modified: projects/portbuild/scripts/buildenv Modified: projects/portbuild/scripts/buildenv ============================================================================== --- projects/portbuild/scripts/buildenv Sat Nov 26 05:47:21 2011 (r227988) +++ projects/portbuild/scripts/buildenv Sat Nov 26 06:50:11 2011 (r227989) @@ -132,8 +132,19 @@ buildenv () { export INDEXFILE=INDEX-${branchbase} fi - # probably only used in mkbindist XXX MCL probably not even there - # XXX MCL 20111117 export __MAKE_CONF=${pbd}/${arch}/make.conf + # set make.conf. Consumed by both 'make index' and 'makeworld'. + # First, must explicitly _unset_ pointyhat's native one. + export __MAKE_CONF=/dev/null + # allow for per-build make.conf + if [ -f ${builddir}/make.conf.server ]; then + export __MAKE_CONF=${builddir}/make.conf.server + else + # allow for per-arch make.conf + # XXX MCL NOTYET the ones that are there are set up for pxeworld. WRONG! +# if [ -f ${builddir}/make.conf ]; then +# export __MAKE_CONF=${pbd}/${arch}/make.conf +# fi + fi } #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111260650.pAQ6oB9J078108>