From owner-p4-projects@FreeBSD.ORG Mon Oct 11 23:39:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9058716A4D1; Mon, 11 Oct 2004 23:39:34 +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 55DAE16A4CE for ; Mon, 11 Oct 2004 23:39:34 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A8DF43D41 for ; Mon, 11 Oct 2004 23:39:34 +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 i9BNdY4P038392 for ; Mon, 11 Oct 2004 23:39:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9BNdX0W038389 for perforce@freebsd.org; Mon, 11 Oct 2004 23:39:33 GMT (envelope-from peter@freebsd.org) Date: Mon, 11 Oct 2004 23:39:33 GMT Message-Id: <200410112339.i9BNdX0W038389@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 63029 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: Mon, 11 Oct 2004 23:39:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=63029 Change 63029 by peter@peter_melody on 2004/10/11 23:38:35 HACK HACK HACK! (WIP) Affected files ... .. //depot/projects/hammer/Makefile#24 edit .. //depot/projects/hammer/Makefile.inc1#63 edit Differences ... ==== //depot/projects/hammer/Makefile#24 (text+ko) ==== @@ -69,7 +69,8 @@ kernel-toolchain libraries lint maninstall \ obj objlink regress rerelease tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ - _build-tools _cross-tools _includes _libraries _depend + _build-tools _cross-tools _includes _libraries _depend \ + _build32 _install32 BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} ==== //depot/projects/hammer/Makefile.inc1#63 (text+ko) ==== @@ -129,7 +129,7 @@ OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/${MACHINE_ARCH} -I386TMP= ${OBJTREE}${.CURDIR}/i386 +LIB32TMP= ${OBJTREE}${.CURDIR}/lib32 # /usr/games added for fortune which depend on strfile BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games @@ -202,20 +202,27 @@ PATH=${TMPPATH} WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} -# i386 world -I386CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \ - MACHINE_ARCH=${TARGET_ARCH} \ - MACHINE=${TARGET} \ - CPUTYPE=${TARGET_CPUTYPE} \ - GROFF_BIN_PATH=${WORLDTMP}/legacy/usr/bin \ - GROFF_FONT_PATH=${WORLDTMP}/legacy/usr/share/groff_font \ - GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac +# 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 +LIB32MAKEENV= MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \ + _SHLIBDIRPREFIX=${LIB32TMP} \ + INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${TMPPATH} \ + CC="cc ${CCARGS}" \ + CXX="c++ ${CXXARGS}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 -I386MAKEENV= ${I386CROSSENV} \ - _SHLIBDIRPREFIX=${I386TMP} \ - INSTALL="sh ${.CURDIR}/tools/install.sh" \ - PATH=${TMPPATH} -I386MAKE= ${I386MAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${I386TMP} +LIB32MAKE= ${LIB32MAKEENV} ${MAKE} -f Makefile.inc1 \ + CC="cc ${CCARGS}" \ + CXX="c++ ${CXXARGS}" \ + LD="ld -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \ + AS="as --32" \ + LIBDIR=/usr/lib32 \ + SHLIBDIR=/usr/lib32 # install stage .if empty(.MAKEFLAGS:M-n) @@ -355,6 +362,29 @@ @echo "--------------------------------------------------------------" ${_+_}cd ${.CURDIR}; ${WMAKE} par-all +_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 \ + 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 + ln -sf ${.CURDIR}/sys ${WORLDTMP} + cd ${.CURDIR}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} hierarchy + 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}; MACHINE_ARCH=i386 ${LIB32MAKE} DESTDIR=${LIB32TMP} -DNO_BIND -DNOMAN -DNODOC -DNOINFO libraries + + +_install32: + WMAKE_TGTS= .if !defined(SUBDIR_OVERRIDE)