From owner-p4-projects@FreeBSD.ORG Wed Oct 13 23:20:28 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 35ACF16A4D2; Wed, 13 Oct 2004 23:20:28 +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 EC84916A4CE for ; Wed, 13 Oct 2004 23:20:27 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D167043D3F for ; Wed, 13 Oct 2004 23:20:27 +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 i9DNKRLr047265 for ; Wed, 13 Oct 2004 23:20:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9DNKRQj047262 for perforce@freebsd.org; Wed, 13 Oct 2004 23:20:27 GMT (envelope-from peter@freebsd.org) Date: Wed, 13 Oct 2004 23:20:27 GMT Message-Id: <200410132320.i9DNKRQj047262@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 63180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Oct 2004 23:20:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=63180 Change 63180 by peter@peter_melody on 2004/10/13 23:19:57 prepare for acid test Affected files ... .. //depot/projects/hammer/Makefile.inc1#66 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#66 (text+ko) ==== @@ -216,7 +216,7 @@ LIBDIR=/usr/lib32 \ SHLIBDIR=/usr/lib32 -LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -f Makefile.inc1 \ +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -DNO_BIND -DNOMAN -DNODOC -DNOINFO \ CC="cc ${CCARGS}" \ CXX="c++ ${CXXARGS}" \ LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ @@ -361,35 +361,40 @@ @echo ">>> stage 4.4: building everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all - +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) _build32: @echo @echo "--------------------------------------------------------------" @echo ">>> stage 5.1: building 32 bit libraries" @echo "--------------------------------------------------------------" .for _dir in \ - lib lib32 usr/bin usr/include usr/lib32 usr/lib/compat/aout usr/libdata/ldscripts \ + lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \ usr/libexec usr/sbin usr/share/misc \ usr/share/snmp/defs usr/share/snmp/mibs mkdir -p ${LIB32TMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ - -p ${WORLDTMP}/usr/include >/dev/null + -p ${LIB32TMP}/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}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} hierarchy + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} obj + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} includes 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}; MACHINE_ARCH=i386 ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries +.for _t in obj depend all 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: + mkdir -p ${DESTDIR}/usr/lib32 + cd ${.CURDIR}/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/gnu/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/secure/lib; MACHINE_ARCH=i386 ${LIB32MAKE} install + cd ${.CURDIR}/libexec/rtld-elf; MACHINE_ARCH=i386 PROG=ld-elf32.so.1 ${LIB32MAKE} install +.endif WMAKE_TGTS= @@ -401,6 +406,9 @@ WMAKE_TGTS+= _cross-tools .endif WMAKE_TGTS+= _includes _libraries _depend everything +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) +WMAKE_TGTS+= _build32 +.endif buildworld: ${WMAKE_TGTS} .ORDER: ${WMAKE_TGTS} @@ -531,6 +539,9 @@ @echo ">>> Installing everything" @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 install +.if ${MACHINE_ARCH} == amd64 && defined(WANT_LIB32) + ${_+_}cd ${.CURDIR}; ${MAKE} -f Makefile.inc1 _install32 +.endif redistribute: @echo "--------------------------------------------------------------"