From 2c4d0a67a85e1d49835fb8171dfe76613a04f40e Mon Sep 17 00:00:00 2001
From: Mark Linimon <linimon@FreeBSD.org>
Date: Wed, 30 Jun 2010 14:51:47 +0000
Subject: Push PACKAGE_BUILDING and MALLOC_OPTIONS up a level.

Feature safe:	yes
---
 Tools/portbuild/scripts/buildscript | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Tools')

diff --git a/Tools/portbuild/scripts/buildscript b/Tools/portbuild/scripts/buildscript
index fb2e0059ac85..47d69c859d3c 100755
--- a/Tools/portbuild/scripts/buildscript
+++ b/Tools/portbuild/scripts/buildscript
@@ -44,6 +44,7 @@ add_pkg() {
 
   echo add_pkg $pkgs
   cd /tmp/depends
+  # XXX TODO more hard-coding
   export PKG_PATH=/tmp/depends
   if [ ! -z "${pkgs}" ]; then
     arch=$(uname -m)
@@ -68,6 +69,7 @@ del_pkg() {
   pkgs=$*
 
   cd /tmp/depends
+  # XXX TODO more hard-coding
   export PKG_PATH=/tmp/depends
   if [ ! -z "${pkgs}" ]; then
     recursion=1
@@ -117,7 +119,6 @@ RD=$7
 
 #export PATH=/ccache/libexec/ccache/:$PATH
 #export CCACHE_PATH=/usr/bin:/usr/local/bin
-export MALLOC_OPTIONS=AJ
 
 # pick up value from environment set up in portbuild script
 L=`echo ${LOCALBASE} | sed 's,^/,,'`
@@ -154,9 +155,6 @@ if [ $phase = 1 ]; then
 
   echo "prefixes: LOCALBASE=${L}"
 
-  # Inform ports they are being run on the cluster
-  export PACKAGE_BUILDING=1
-
   # Stash a copy of /etc/master.passwd and /etc/group to detect whether someone modifies it
   cp /etc/master.passwd /etc/master.passwd-save
   cp /etc/group /etc/group-save
-- 
cgit v1.2.3