svn commit: r258304 - user/nwhitehorn/condorports

[Nathan Whitehorn]

Author: nwhitehorn
Date: Mon Nov 18 14:33:44 2013
New Revision: 258304
URL: http://svnweb.freebsd.org/changeset/base/258304

Log:
  Some parts of ports introspect LOCALBASE to figure out what versions of
  things are in use. Disable this in scripts run on the build master.

Modified:
  user/nwhitehorn/condorports/buildportsdag.sh
  user/nwhitehorn/condorports/stagebuildfiles.sh

Modified: user/nwhitehorn/condorports/buildportsdag.sh
==============================================================================
--- user/nwhitehorn/condorports/buildportsdag.sh	Mon Nov 18 14:32:42 2013	(r258303)
+++ user/nwhitehorn/condorports/buildportsdag.sh	Mon Nov 18 14:33:44 2013	(r258304)
@@ -5,6 +5,7 @@
 : ${ARCH=`uname -p`}
 : ${RELEASE=$ARCH/`uname -r`}
 : ${STAGEDIR=$(pwd)/stage-$ARCH/$PKGSDIR}
+: ${__MAKE_CONF=/dev/null}; export __MAKE_CONF
 
 mkdir -p $STAGEDIR
 
@@ -31,7 +32,7 @@ for category in $(make -C $PORTSDIR -V S
 	echo VARS $job portsdir=\"$PORTSDIR\" >> $dagjobs
 	echo VARS $job stagetarball=\"$TARBALL\" >> $dagjobs
 	echo VARS $job release=\"$RELEASE\" >> $dagjobs
-	deps=$(make -V _DEPEND_DIRS)
+	deps=$(make -V _DEPEND_DIRS LOCALBASE=/var/empty)
 	if [ ! -z "$deps" ]; then
 		echo PARENT $deps CHILD $job >> $dagdeps
 	fi

Modified: user/nwhitehorn/condorports/stagebuildfiles.sh
==============================================================================
--- user/nwhitehorn/condorports/stagebuildfiles.sh	Mon Nov 18 14:32:42 2013	(r258303)
+++ user/nwhitehorn/condorports/stagebuildfiles.sh	Mon Nov 18 14:33:44 2013	(r258304)
@@ -5,6 +5,7 @@
 
 set -e
 export UNAME_p=$3
+export __MAKE_CONF=/dev/null
 DISTHORDE=$5
 
 # Fetch distfiles if unfetched
@@ -26,7 +27,7 @@ DIST_SUBDIR=$DISTHORDE/$(make -V DIST_SU
 ALLFILES=$(for f in `make -V ALLFILES`; do echo $DIST_SUBDIR/$f; done)
 
 # Find packages
-DEPENDS=`make all-depends-list`
+DEPENDS=`make all-depends-list LOCALBASE=/var/empty`
 PKGLIST=$(for x in $DEPENDS; do make -C $x PACKAGES=$2 -V PKGFILE; done)
 
 rm -rf $TARBALL-dir