Date: Wed, 14 Dec 2011 04:12:13 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r228490 - projects/portbuild/scripts Message-ID: <201112140412.pBE4CD4W081280@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: linimon (doc,ports committer) Date: Wed Dec 14 04:12:13 2011 New Revision: 228490 URL: http://svn.freebsd.org/changeset/base/228490 Log: Pass arch as parameter to buildenv.common and buildenv.client to try to unbreak things. Modified: projects/portbuild/scripts/buildenv Modified: projects/portbuild/scripts/buildenv ============================================================================== --- projects/portbuild/scripts/buildenv Wed Dec 14 04:11:11 2011 (r228489) +++ projects/portbuild/scripts/buildenv Wed Dec 14 04:12:13 2011 (r228490) @@ -118,7 +118,7 @@ buildenv () { fi done - buildenv.common + buildenv.common ${arch} # override things destined for bsd.port.mk export DISTDIR=${builddir}/distfiles @@ -151,13 +151,16 @@ buildenv () { # establish commonly-used environment variables (client-side) # buildenv.client() { + arch=$1 + src_base=$2 + # derive OSREL, OSVERSION, and BRANCH - export_src_metadata $1 + export_src_metadata ${src_base} # manually override results of uname(1) - export UNAME_m=${ARCH} + export UNAME_m=${arch} export UNAME_n=freebsd.org - export UNAME_p=${ARCH} + export UNAME_p=${arch} export UNAME_r=${OSREL}-${BRANCH} export UNAME_s=FreeBSD export UNAME_v="FreeBSD ${OSREL}-${BRANCH} #0: $(date) portmgr@freebsd.org:/usr/src/sys/magic/kernel/path" @@ -167,6 +170,8 @@ buildenv.client() { # establish commonly-used environment variables (common to clients and server) # buildenv.common() { + arch=$1 + export ARCH=${arch} export MACHINE_ARCH=${arch}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112140412.pBE4CD4W081280>