PERFORCE change 64398 for review

[Peter Wemm]

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

Change 64398 by peter at peter_daintree on 2004/11/06 01:55:36

	More tidying up

Affected files ...

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

Differences ...

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

@@ -129,7 +129,6 @@
 OBJTREE=	${MAKEOBJDIRPREFIX}/${TARGET}
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/${MACHINE_ARCH}
-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,7 +201,10 @@
 		PATH=${TMPPATH}
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
+.if ${MACHINE_ARCH} == amd64
 # 32 bit world
+LIB32TMP=	${OBJTREE}${.CURDIR}/lib32
+
 LIB32PREFLAGS=	-m32 -march=athlon-xp -msse2 -mfancy-math-387 -DCOMPAT_32BIT
 LIB32POSTFLAGS=	-I${LIB32TMP}/usr/include \
 		-L${LIB32TMP}/usr/lib32 \
@@ -214,8 +216,10 @@
 LIB32OBJC=	${LIB32PREFLAGS} -I${LIB32TMP}/usr/include/objc \
 		${LIB32POSTFLAGS}
 
+# Yes, the flags are redundant.
 LIB32MAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		MACHINE_ARCH=i386 \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH} \
 		CC="cc ${LIB32CC}" \
@@ -227,7 +231,7 @@
 		SHLIBDIR=/usr/lib32
 
 LIB32MAKE=	${LIB32MAKEENV} ${MAKE} -DNO_CPU_CFLAGS -DCOMPAT_32BIT \
-		-DNO_BIND -DNOMAN -DNODOC -DNOINFO \
+		-DNO_BIND -DNOMAN -DNODOC -DNOINFO -DNOHTML \
 		CC="cc ${LIB32CC}" \
 		CXX="c++ ${LIB32CXX}" \
 		OBJC="cc ${LIB32OBJC}" \
@@ -235,6 +239,7 @@
 		AS="as --32" \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32
+.endif
 
 # install stage
 .if empty(.MAKEFLAGS:M-n)
@@ -377,7 +382,7 @@
 build32:
 	@echo
 	@echo "--------------------------------------------------------------"
-	@echo ">>> stage 5.1: building 32 bit libraries"
+	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
     lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
@@ -388,24 +393,29 @@
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-	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} -f Makefile.inc1 DESTDIR=${LIB32TMP} libraries 
+.for _t in obj includes
+	cd ${.CURDIR}; \
+	    ${LIB32MAKE} -f Makefile.inc1 DESTDIR=${LIB32TMP} ${_t}
+.endfor
+.for _dir in lib/libncurses lib/libmagic
+	cd ${.CURDIR}/${_t}; \
+	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} build-tools
+.endfor
+	cd ${.CURDIR}; \
+	    ${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}" DESTDIR=${LIB32TMP} LIBDIR=/usr/lib32 SHLIBDIR=/usr/lib32 ${_t}
+	    PROG=ld-elf32.so.1 ${LIB32MAKE} DESTDIR=${LIB32TMP} ${_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
+	mkdir -p ${DESTDIR}/usr/lib32	# XXX add to mtree
+	cd ${.CURDIR}/lib; ${LIB32MAKE} install
+	cd ${.CURDIR}/gnu/lib; ${LIB32MAKE} install
+.if !defined(NOCRYPT)
+	cd ${.CURDIR}/secure/lib; ${LIB32MAKE} install
+.endif
+	cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32MAKE} install
 .endif