From owner-svn-src-user@FreeBSD.ORG Mon Nov 18 14:33:45 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 091D89EC; Mon, 18 Nov 2013 14:33:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED4DE2EA9; Mon, 18 Nov 2013 14:33:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAIEXiHb030732; Mon, 18 Nov 2013 14:33:44 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAIEXiEx030730; Mon, 18 Nov 2013 14:33:44 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201311181433.rAIEXiEx030730@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 18 Nov 2013 14:33:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258304 - user/nwhitehorn/condorports X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 14:33:45 -0000 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