Author: imp
Date: Fri Apr 25 19:25:00 2014
New Revision: 264924
URL: http://svnweb.freebsd.org/changeset/base/264924
Log:
Remove NO_CTF, exccept as an undocumented compatibility
option. Convert all other uses to MK_CTF=no. Set MK_CTF=no rather than
the indirect WITHOUT_CDDL in filemon regression. It is expected that
NO_CTF will be removed in FreeBSD 12 entirely.
Modified:
head/Makefile.inc1
head/tools/regression/filemon/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Apr 25 19:13:57 2014 (r264923)
+++ head/Makefile.inc1 Fri Apr 25 19:25:00 2014 (r264924)
@@ -15,7 +15,7 @@
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_ROOT install without using root privilege
# -DNO_DOCUPDATE do not update doc in ${MAKE} update
-# -DNO_CTF do not run the DTrace CTF conversion tools on built objects
+# -DWITHOUT_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
# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
# LOCAL_MTREE="list of mtree files" to process to allow local directories
@@ -248,7 +248,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
SSP_CFLAGS= \
MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
+ -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
# build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -258,7 +258,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
-DNO_LINT \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD MK_TESTS=no
+ -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD MK_TESTS=no
# cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -277,7 +277,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOB
SSP_CFLAGS= \
MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \
- -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+ -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no -DEARLY_BUILD
# world stage
WMAKEENV= ${CROSSENV} \
@@ -294,7 +294,7 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL
.endif
.if ${MK_CDDL} == "no"
-WMAKEENV+= NO_CTF=1
+WMAKEENV+= MK_CTF=no
.endif
.if defined(CROSS_TOOLCHAIN_PREFIX)
@@ -400,7 +400,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAG
-DCOMPAT_32BIT \
-DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \
- -DNO_CTF \
+ MK_CTF=no \
-DNO_LINT \
MK_TESTS=no
@@ -609,7 +609,7 @@ build32:
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
- DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
+ DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS MK_CTF=no \
-DEARLY_BUILD build-tools
.endfor
cd ${.CURDIR}; \
Modified: head/tools/regression/filemon/Makefile
==============================================================================
--- head/tools/regression/filemon/Makefile Fri Apr 25 19:13:57 2014
(r264923)
+++ head/tools/regression/filemon/Makefile Fri Apr 25 19:25:00 2014
(r264924)
@@ -22,9 +22,8 @@ MAN=
WARNS?= 6
CFLAGS+= -I${.CURDIR}/../../../sys
-# Should be "WITHOUT_CTF=" below, but stupid infastrurture fails:
-# "/usr/share/mk/bsd.own.mk", line 489: WITH_CTF and WITHOUT_CTF can't both be
set.
-WITHOUT_CDDL=
+# We don't want to genreate CTF files. Force that here.
+MK_CTF=no
CLEANFILES+= ${BINS}
@@ -59,7 +58,7 @@ test01: ${BINS:Mfilemontest*} ${BINS:Msi
grep -q -v '\.[0-9][0-9][0-9][0-9][0-9][0-9]$$' || printf "Time
stamp format OK\n\n"
.endfor
@cd ${.CURDIR} ; set +e ; for F in filemon_log.* ; do \
- tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon
bye-bye" ; \
+ tail -1 $$F | grep -q '# Bye bye' || echo "$$F missing filemon
bye-bye" ; \
NL=`wc -l $$F | awk '{print $$1}'` ; \
if [ "$${NL}" != 97 ]; then echo "$$F BAD, contains $${NL} lines" ;
exit 1 ; fi ; done
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
