diff options
| author | Mark Linimon <linimon@FreeBSD.org> | 2010-06-30 14:48:57 +0000 |
|---|---|---|
| committer | Mark Linimon <linimon@FreeBSD.org> | 2010-06-30 14:48:57 +0000 |
| commit | bcb18c7e0b84f1f4b3636715fc164cb3412a9989 (patch) | |
| tree | 3a4a40fc47fd00e9b6ca0808c64da89378a9c65b /Tools | |
| parent | 937750f8bc98970bf4b38cdb566fd7bee1d43f77 (diff) | |
| download | ports-bcb18c7e0b84f1f4b3636715fc164cb3412a9989.tar.gz ports-bcb18c7e0b84f1f4b3636715fc164cb3412a9989.zip | |
Notes
Diffstat (limited to 'Tools')
| -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/* |