From owner-p4-projects@FreeBSD.ORG  Tue Jun 26 06:47:05 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 29EE416A4C6; Tue, 26 Jun 2007 06:47:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E024916A49E
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 06:47:04 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 8FF6D13C43E
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 06:47:04 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q6l4ri090466
	for <perforce@freebsd.org>; Tue, 26 Jun 2007 06:47:04 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q6l4ft090455
	for perforce@freebsd.org; Tue, 26 Jun 2007 06:47:04 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 26 Jun 2007 06:47:04 GMT
Message-Id: <200706260647.l5Q6l4ft090455@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 122323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Jun 2007 06:47:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=122323

Change 122323 by gabor@gabor_server on 2007/06/26 06:46:17

	Add DESTDIR_ENV_LIST to allow overriding variables from outside.  Only
	those variables are passed to the chrooted make, which are listed in
	DESTDIR_ENV_LIST.  The reason behind this is to avoid passing something
	accidentally from the host environment.  Let's suppose you have set
	PREFIX=/opt in the host environment.  With a constant variable list,
	the destination environment would inherit this, as well.

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#2 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#2 (text+ko) ====

@@ -11,6 +11,20 @@
 
 DESTDIR_Include_MAINTAINER=		portmgr@FreeBSD.org
 
+# Place variable names into DESTDIR_ENV_LIST, which you want to override in
+# the DESTDIR environment from outside.  E.g.:
+#
+# make DESTDIR=/foo/bar PREFIX=/opt DESTDIR_ENV_LIST=PREFIX
+#
+
+DESTDIR_ENV_LIST?=
+
+DESTDIR_ENV=	DESTDIR= CHROOTED=YES
+
+.for _var in ${DESTDIR_ENV_LIST}
+DESTDIR_ENV+=	${_var}="${${_var}}"
+.endfor
+
 .for _target in ${.TARGETS}
 ${_target}: pre-chroot do-chroot post-chroot
 	@${TRUE}
@@ -39,7 +53,7 @@
 	${MOUNT} -t devfs devfs ${DESTDIR}/dev
 .endif
 	${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
-	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})"
+	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"
 .endif
 
 .if !target(post-chroot)