[Midnightbsd-cvs] src [7150] trunk/Makefile.inc1: change the build order of the kerberos tools for the new release

[laffer1 at midnightbsd.org]

Revision: 7150
          http://svnweb.midnightbsd.org/src/?rev=7150
Author:   laffer1
Date:     2015-07-25 16:20:22 -0400 (Sat, 25 Jul 2015)
Log Message:
-----------
change the build order of the kerberos tools for the new release

Modified Paths:
--------------
    trunk/Makefile.inc1

Modified: trunk/Makefile.inc1
===================================================================
--- trunk/Makefile.inc1	2015-07-25 20:18:42 UTC (rev 7149)
+++ trunk/Makefile.inc1	2015-07-25 20:20:22 UTC (rev 7150)
@@ -12,7 +12,6 @@
 #	-DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc in ${MAKE} update
-#	-DNO_WWWUPDATE do not update www in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -368,7 +367,7 @@
 	rm -f ${OBJTREE}${.CURDIR}/usr.bin/truss/ioctl.c
 .endif
 .for _dir in \
-    lib usr legacy/usr
+    lib usr legacy/usr legacy/usr/bin legacy/usr/sbin
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
@@ -466,13 +465,6 @@
 	    -p ${LIB32TMP}/usr/include >/dev/null
 	mkdir -p ${WORLDTMP}
 	ln -sf ${.CURDIR}/sys ${WORLDTMP}
-.if ${MK_KERBEROS} != "no"
-.for _t in obj depend all
-	cd ${.CURDIR}/kerberos5/tools; \
-	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=kerberos5/tools/ ${_t}
-.endfor
-.endif
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} DIRPRFX=include/ ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} DIRPRFX=lib/ ${_t}
@@ -495,6 +487,7 @@
 .endfor
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
+	    WORLDTMP=${WORLDTMP} \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
 	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
 	    -DEARLY_BUILD build-tools
@@ -985,6 +978,7 @@
 	@echo "ERROR: Source upgrades from versions prior to 0.4 not supported."; \
 	false
 .endif
+	mkdir -p ${MAKEOBJDIRPREFIX}/legacy/usr/bin
 .for _tool in tools/build
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool} && \
@@ -1022,15 +1016,15 @@
 _sed=		usr.bin/sed
 .endif
 
-.if ${BOOTSTRAPPING} < 7002
+.if ${BOOTSTRAPPING} < 7003
 _m4=		usr.bin/m4
 .endif
 
-.if ${BOOTSTRAPPING} < 7002
+.if ${BOOTSTRAPPING} < 7003
 _lex=		usr.bin/lex
 .endif
 
-.if ${BOOTSTRAPPING} < 7002
+.if ${BOOTSTRAPPING} < 7003
 _yacc=		lib/liby \
 		usr.bin/yacc
 .endif
@@ -1112,7 +1106,15 @@
 .endif
 
 .if ${MK_KERBEROS} != "no"
-_kerberos5_tools= kerberos5/tools
+_kerberos5_bootstrap_tools= \
+	kerberos5/tools/make-roken \
+	kerberos5/lib/libroken \
+	kerberos5/lib/libvers \
+	kerberos5/tools/asn1_compile \
+	kerberos5/tools/slc \
+	usr.bin/compile_et
+
+.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
 .endif
 
 .if ${MK_RESCUE} != "no"
@@ -1140,12 +1142,13 @@
 .endfor
 .for _tool in \
     ${_gcc_tools} \
-    ${_kerberos5_tools}
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
-		cd ${.CURDIR}/${_tool}; \
-		${MAKE} DIRPRFX=${_tool}/ obj; \
-		${MAKE} DIRPRFX=${_tool}/ depend; \
-		${MAKE} DIRPRFX=${_tool}/ all
+    ${_kerberos5_bootstrap_tools}
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${WORLDTMP}/legacy install
 .endfor
 
 #