Date: Wed, 23 Nov 2011 03:17:59 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r227860 - projects/portbuild/scripts Message-ID: <201111230317.pAN3HxST022611@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Wed Nov 23 03:17:59 2011 New Revision: 227860 URL: http://svn.freebsd.org/changeset/base/227860 Log: Allow for a per-build make.conf called make.conf.server. Unlike make.conf.client, it is a complete make.conf file (since it does not need to be specific per-host). Modified: projects/portbuild/scripts/makeworld Modified: projects/portbuild/scripts/makeworld ============================================================================== --- projects/portbuild/scripts/makeworld Wed Nov 23 03:16:29 2011 (r227859) +++ projects/portbuild/scripts/makeworld Wed Nov 23 03:17:59 2011 (r227860) @@ -51,13 +51,18 @@ while [ $# -gt 0 ]; do shift done -# XXX MCL I don't know what this is supposed to do. +# XXX MCL I don't know what -client is supposed to do. if [ "$client" = "1" ]; then SRC_BASE=${pbd}/${arch}/src-client shift 1 else SRC_BASE=${builddir}/src - export __MAKE_CONF=/dev/null + # XXX MCL 20110912 allow for per-build make.conf + if [ -f ${builddir}/make.conf.server ]; then + export __MAKE_CONF=${builddir}/make.conf.server + else + export __MAKE_CONF=/dev/null + fi fi cd ${SRC_BASE}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111230317.pAN3HxST022611>