PERFORCE change 127841 for review

[John Birrell]

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

Change 127841 by jb at jb_freebsd1 on 2007/10/20 20:44:13

	Hook the DTrace build infrastructure in.

Affected files ...

.. //depot/projects/dtrace6/src/Makefile.inc1#2 edit

Differences ...

==== //depot/projects/dtrace6/src/Makefile.inc1#2 (text+ko) ====

@@ -21,6 +21,7 @@
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
 #	-DNO_PORTSUPDATE do not update ports in ${MAKE} update
 #	-DNO_DOCUPDATE do not update doc 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
 
@@ -49,6 +50,11 @@
 .if !defined(NO_GAMES)
 SUBDIR+=games
 .endif
+.if !define(NO_CDDL)
+SUBDIR+=cddl
+.else
+NO_CTF=1
+.endif
 SUBDIR+=gnu
 .if !defined(NO_KERBEROS) && !defined(NO_CRYPT) && !defined(NO_OPENSSL)
 SUBDIR+=kerberos5
@@ -104,6 +110,11 @@
 .endif
 .endif
 
+.if !defined(VERSION)
+VERSION!=	uname -srp
+VERSION+=	${OSRELDATE}
+.endif
+
 # Guess machine architecture from machine type, and vice versa.
 .if !defined(TARGET_ARCH) && defined(TARGET)
 TARGET_ARCH=	${TARGET:S/pc98/i386/}
@@ -203,20 +214,22 @@
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
 		WORLDTMP=${WORLDTMP} \
+		VERSION="${VERSION}" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		DESTDIR= \
 		BOOTSTRAPPING=${OSRELDATE} \
 		-DNO_HTML -DNO_INFO -DNO_LINT -DNO_MAN -DNO_NLS -DNO_PIC \
-		-DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS
+		-DNO_PROFILE -DNO_SHARED -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		${BMAKEENV} ${MAKE} -f Makefile.inc1 \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		DESTDIR= \
-		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS
+		BOOTSTRAPPING=${OSRELDATE} -DNO_LINT -DNO_CPU_CFLAGS \
+		-DNO_WARNS -DNO_CTF
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -226,8 +239,12 @@
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
+		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
+.if define(NO_CDDL)
+WMAKEENV+=	NO_CTF=1
+.endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64"
@@ -247,6 +264,7 @@
 # Yes, the flags are redundant.
 LIB32WMAKEENV=	MAKEOBJDIRPREFIX=${OBJTREE}/lib32 \
 		_SHLIBDIRPREFIX=${LIB32TMP} \
+		VERSION="${VERSION}" \
 		MACHINE=i386 \
 		MACHINE_ARCH=i386 \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -433,6 +451,9 @@
 .for _t in obj includes
 	cd ${.CURDIR}/include; ${LIB32WMAKE} ${_t}
 	cd ${.CURDIR}/lib; ${LIB32WMAKE} ${_t}
+.if !define(NO_CDDL)
+	cd ${.CURDIR}/cddl/lib; ${LIB32WMAKE} ${_t}
+.endif
 	cd ${.CURDIR}/gnu/lib; ${LIB32WMAKE} ${_t}
 .if !defined(NO_CRYPT)
 	cd ${.CURDIR}/secure/lib; ${LIB32WMAKE} ${_t}
@@ -844,8 +865,14 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
+.if !define(NO_CDDL)
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
+    lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+.endif
+
 bootstrap-tools:
 .for _tool in \
+    ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
@@ -998,7 +1025,9 @@
 _generic_libs+=	kerberos5/lib
 .endif
 
-_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
+_prebuild_libs+= lib/libbz2 lib/libcom_err lib/libcrypt lib/libelf \
+		lib/libexpat \
+		${_lib_cddl} \
 		lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libnetgraph lib/libopie lib/libpam \
@@ -1010,6 +1039,10 @@
 
 _generic_libs+=	lib
 
+.if !define(NO_CDDL)
+_cddl_lib= cddl/lib
+.endif
+
 .if !defined(NO_CRYPT)
 .if !defined(NO_OPENSSL)
 _prebuild_libs+=	secure/lib/libcrypto secure/lib/libssl