From owner-p4-projects@FreeBSD.ORG  Wed Oct 13 22:21:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0331916A4D1; Wed, 13 Oct 2004 22:21:16 +0000 (GMT)
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 D2FFA16A4CE
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 22:21:15 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C3E2D43D45
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 22:21:15 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9DMLF9v044868
	for <perforce@freebsd.org>; Wed, 13 Oct 2004 22:21:15 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DMLFFu044865
	for perforce@freebsd.org; Wed, 13 Oct 2004 22:21:15 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 13 Oct 2004 22:21:15 GMT
Message-Id: <200410132221.i9DMLFFu044865@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>
Subject: PERFORCE change 63178 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 13 Oct 2004 22:21:16 -0000

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

Change 63178 by peter@peter_melody on 2004/10/13 22:20:37

	checkpoint.  Note. do not forget obj.

Affected files ...

.. //depot/projects/hammer/Makefile.inc1#65 edit

Differences ...

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

@@ -204,7 +204,7 @@
 
 # 32 bit world
 CCARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
-CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32BIT}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
+CXXARGS=-m32 -march=athlon-xp -msse2 -mfancy-math-387 -I${LIB32TMP}/usr/include/c++/3.4 -I${LIB32TMP}/usr/include -L${LIB32TMP}/usr/lib32 -B${LIB32TMP}/usr/lib32
 LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -377,10 +377,16 @@
 	    -p ${WORLDTMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
 	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy
+	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} obj
 	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} includes
-	cd ${.CURDIR}/lib/libncurses; ${MAKE} build-tools
-	cd ${.CURDIR}/lib/libmagic; ${MAKE} build-tools
+	cd ${.CURDIR}/lib/libncurses; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
+	cd ${.CURDIR}/lib/libmagic; MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
 	cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries 
+.for _t in obj depend all install
+	cd ${.CURDIR}/libexec/rtld-elf; \
+	PROG=ld-elf32.so.1 MAKEOBJDIRPREFIX=${OBJTREE}/lib32 MACHINE_ARCH=i386 LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 \
+	    ${MAKE} -DNOMAN -DNODOC -DNOINFO CC="cc ${CCARGS} -DCOMPAT_32BIT" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t}
+.endfor
 	
 
 _install32: