diff options
| author | linimon <linimon@FreeBSD.org> | 2010-06-30 22:48:57 +0800 |
|---|---|---|
| committer | linimon <linimon@FreeBSD.org> | 2010-06-30 22:48:57 +0800 |
| commit | 641e956aa60413728fe81e97d03f34ed68017931 (patch) | |
| tree | 1e635e521942a052aa0230b3207ec162bca3b3e5 /Tools/portbuild | |
| parent | 5b1b244869322966da232011a9ccfd92e45253d1 (diff) | |
| download | freebsd-ports-gnome-641e956aa60413728fe81e97d03f34ed68017931.tar.gz freebsd-ports-gnome-641e956aa60413728fe81e97d03f34ed68017931.tar.zst freebsd-ports-gnome-641e956aa60413728fe81e97d03f34ed68017931.zip | |
Fix up usage of buildenv.client to deal with overenthusiastic
refactoring. Pick up new CLIENT_MALLOC_OPTIONS parameter. Clean
up comments.
Feature safe: yes
Diffstat (limited to 'Tools/portbuild')
| -rwxr-xr-x | Tools/portbuild/scripts/portbuild | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/portbuild/scripts/portbuild b/Tools/portbuild/scripts/portbuild index c5100a832c7e..692bf234e3f7 100755 --- a/Tools/portbuild/scripts/portbuild +++ b/Tools/portbuild/scripts/portbuild @@ -4,6 +4,8 @@ # client-side script to do all the work surrounding an individual package # build, and then the package build itself +# note: unredirected 'echo' output goes to the journal file + # usage: $0 ARCH BRANCH BUILDID CHROOT [-noclean] [-norestr] [-noplistcheck] [-distfiles] [-fetch-original] [-trybroken] PKGNAME.tgz DIRNAME [DEPENDENCY.tgz ...] pb=/var/portbuild @@ -115,7 +117,7 @@ BD=$4 RD=$5 builddir=${pb}/${arch}/${branch}/builds/${buildid} -buildenv.client ${pb} ${arch} +buildenv.client ${pb} ${arch} ${branch} ${builddir} # Want to use the /etc/make.conf in the chroot unset __MAKE_CONF @@ -156,6 +158,8 @@ export HTTP_TIMEOUT=${CLIENT_HTTP_TIMEOUT} export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${LOCALBASE}/sbin:${LOCALBASE}/bin +export MALLOC_OPTIONS=${CLIENT_MALLOC_OPTIONS} + echo "building ${pkgname} in ${chroot}" bindist=${buildroot}/${branch}/${buildid}/tarballs/bindist.tar @@ -185,8 +189,6 @@ if [ "${use_jail}" = "1" ]; then ip3=$((($ipbase - ($ip1*256*256) - ($ip2*256)))) fi -# Set up desired uname version - trap "bailout ${chroot} ${clean} ${error} ${pkgname}" 1 2 3 9 10 11 15 rm -rf ${chroot}/tmp/* |