From owner-p4-projects@FreeBSD.ORG  Fri Jul 22 00:23:30 2005
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 8A90C16A426; Fri, 22 Jul 2005 00:23:29 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 638B516A424
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:23:29 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 712F443DA9
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:23:14 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6M0NEEv033601
	for <perforce@freebsd.org>; Fri, 22 Jul 2005 00:23:14 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6M0NEN6033598
	for perforce@freebsd.org; Fri, 22 Jul 2005 00:23:14 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 22 Jul 2005 00:23:14 GMT
Message-Id: <200507220023.j6M0NEN6033598@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80723 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: Fri, 22 Jul 2005 00:23:30 -0000

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

Change 80723 by peter@peter_melody on 2005/07/22 00:23:04

	build/install gcore32 and ldd32

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#98 edit
.. //depot/projects/hammer/usr.bin/gcore/Makefile#4 edit
.. //depot/projects/hammer/usr.bin/ldd/Makefile#3 edit

Differences ...

==== //depot/projects/hammer/Makefile.inc1#98 (text+ko) ====

@@ -411,6 +411,10 @@
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 	cd ${.CURDIR}/gnu/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/usr.bin/ldd; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/usr.bin/gcore; \
+	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .if !defined(NO_CRYPT)
 	cd ${.CURDIR}/secure/lib; \
 	    ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
@@ -435,6 +439,10 @@
 .for _t in obj depend all
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/usr.bin/ldd; \
+	    PROG=ldd32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
+	cd ${.CURDIR}/usr.bin/gcore; \
+	    PROG=gcore32 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_t}
 .endfor
 
 distribute32 install32:
@@ -449,6 +457,8 @@
 	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} ${.TARGET:S/32$//}
 .endif
 	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32MAKE} ${.TARGET:S/32$//}
+	cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32MAKE} ${.TARGET:S/32$//}
 .endif
 
 

==== //depot/projects/hammer/usr.bin/gcore/Makefile#4 (text+ko) ====

@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD: src/usr.bin/gcore/Makefile,v 1.9 2004/11/27 06:46:48 das Exp $
 
-PROG=	gcore
+PROG?=	gcore
 SRCS=	elfcore.c gcore.c
 
 .include <bsd.prog.mk>

==== //depot/projects/hammer/usr.bin/ldd/Makefile#3 (text+ko) ====

@@ -1,6 +1,6 @@
 # $FreeBSD: src/usr.bin/ldd/Makefile,v 1.13 2004/06/29 21:13:15 dwmalone Exp $
 
-PROG=		ldd
+PROG?=		ldd
 SRCS=		ldd.c
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=		sods.c