PERFORCE change 109193 for review

[John Birrell]

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

Change 109193 by jb at jb_freebsd8 on 2006/11/04 01:56:03

	Merge the DTrace support back in.

Affected files ...

.. //depot/projects/dtrace/src/Makefile.inc1#23 edit

Differences ...

==== //depot/projects/dtrace/src/Makefile.inc1#23 (text+ko) ====

@@ -10,6 +10,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
 
@@ -38,6 +39,11 @@
 # We must do etc last for install/distribute to work.
 #
 SUBDIR=	share/info include lib libexec bin
+.if ${MK_CDDL} != "no"
+SUBDIR+=cddl
+.else
+NO_CTF=1
+.endif
 .if ${MK_GAMES} != "no"
 SUBDIR+=games
 .endif
@@ -96,6 +102,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/:S/sun4v/sparc64/}
@@ -195,6 +206,7 @@
 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 \
@@ -202,14 +214,15 @@
 		BOOTSTRAPPING=${OSRELDATE} \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DWITHOUT_NLS -DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS
+		-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} \
@@ -219,8 +232,12 @@
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
+		VERSION="${VERSION}" \
 		INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${TMPPATH}
+.if ${MK_CDDL} == "no" || defined(NO_CTF)
+WMAKEENV+=	NO_CTF=1
+.endif
 WMAKE=		${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
 
 .if ${TARGET_ARCH} == "amd64"
@@ -879,8 +896,13 @@
 _pwd_mkdb=	usr.sbin/pwd_mkdb
 .endif
 
+.if ${MK_CDDL} != "no"
+_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
+.endif
+
 bootstrap-tools:
 .for _tool in \
+    ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_groff} \
@@ -1015,7 +1037,7 @@
 _prebuild_libs=	${_kerberos5_lib_libasn1} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		lib/libbz2 lib/libcom_err lib/libcrypt lib/libexpat \
-		${_lib_libgssapi} ${_lib_libipx} \
+		${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/libncurses lib/libopie lib/libpam \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
@@ -1027,6 +1049,10 @@
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 
+.if ${MK_CDDL} != "no"
+_lib_cddl	= cddl/lib
+.endif
+
 .if ${MK_CRYPT} != "no"
 .if ${MK_OPENSSL} != "no"
 _secure_lib_libcrypto= secure/lib/libcrypto