PERFORCE change 130903 for review
John Birrell
jb at FreeBSD.org
Fri Dec 14 15:03:46 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130903
Change 130903 by jb at jb_freebsd1 on 2007/12/14 23:03:39
Add the DTrace buildworld hooks.
This will need a BOOTSTRAPPING thing around the _dtrace_tools
if and when it goes into RELENG_7.
Affected files ...
.. //depot/projects/dtrace7/src/Makefile.inc1#2 edit
Differences ...
==== //depot/projects/dtrace7/src/Makefile.inc1#2 (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
@@ -42,6 +43,8 @@
.endif
.if ${MK_CDDL} != "no"
SUBDIR+=cddl
+.else
+NO_CTF=1
.endif
SUBDIR+=gnu include
.if ${MK_KERBEROS} != "no"
@@ -102,6 +105,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/}
@@ -208,14 +216,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} \
@@ -227,6 +236,9 @@
_SHLIBDIRPREFIX=${WORLDTMP} \
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"
@@ -873,8 +885,14 @@
_pwd_mkdb= usr.sbin/pwd_mkdb
.endif
+.if ${MK_CDDL} != "no"
+_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} \
More information about the p4-projects
mailing list