d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove NO_CTF, exccept as an undocumented compatibility

Browse Source 
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.
This commit is contained in:
Warner Losh 2014-04-25 19:25:00 +00:00
parent 74855db616
commit 96267df325
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.inc1
View File

@ -15,7 +15,7 @@
# -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_PORTSUPDATE do not update ports in ${MAKE} update
# -DNO_ROOT install without using root privilege # -DNO_ROOT install without using root privilege
# -DNO_DOCUPDATE do not update doc 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 # -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_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_LIB_DIRS="list of dirs" to add additional dirs to libraries target
# LOCAL_MTREE="list of mtree files" to process to allow local directories # LOCAL_MTREE="list of mtree files" to process to allow local directories
@ -248,7 +248,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \ MK_HTML=no MK_INFO=no NO_LINT=yes MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \ -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 # build-tools stage
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
@ -258,7 +258,7 @@ TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
BOOTSTRAPPING=${OSRELDATE} \ BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \ SSP_CFLAGS= \
-DNO_LINT \ -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 # cross-tools stage
XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@ -277,7 +277,7 @@ KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
SSP_CFLAGS= \ SSP_CFLAGS= \
MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \ MK_HTML=no MK_INFO=no -DNO_LINT MK_MAN=no \
-DNO_PIC -DNO_PROFILE -DNO_SHARED \ -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 # world stage
WMAKEENV= ${CROSSENV} \ WMAKEENV= ${CROSSENV} \
@ -294,7 +294,7 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METALOG} -DNO_ROOT
.endif .endif
.if ${MK_CDDL} == "no" .if ${MK_CDDL} == "no"
WMAKEENV+= NO_CTF=1 WMAKEENV+= MK_CTF=no
.endif .endif
.if defined(CROSS_TOOLCHAIN_PREFIX) .if defined(CROSS_TOOLCHAIN_PREFIX)
@ -400,7 +400,7 @@ LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
-DCOMPAT_32BIT \ -DCOMPAT_32BIT \
-DLIBRARIES_ONLY \ -DLIBRARIES_ONLY \
-DNO_CPU_CFLAGS \ -DNO_CPU_CFLAGS \
-DNO_CTF \ MK_CTF=no \
-DNO_LINT \ -DNO_LINT \
MK_TESTS=no MK_TESTS=no
@ -609,7 +609,7 @@ build32:
WORLDTMP=${WORLDTMP} \ WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \ MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \ 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 -DEARLY_BUILD build-tools
.endfor .endfor
cd ${.CURDIR}; \ cd ${.CURDIR}; \

7
tools/regression/filemon/Makefile
View File

@ -22,9 +22,8 @@ MAN=
WARNS?= 6 WARNS?= 6
CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${.CURDIR}/../../../sys
# Should be "WITHOUT_CTF=" below, but stupid infastrurture fails: # We don't want to genreate CTF files. Force that here.
# "/usr/share/mk/bsd.own.mk", line 489: WITH_CTF and WITHOUT_CTF can't both be set. MK_CTF=no
WITHOUT_CDDL=
CLEANFILES+= ${BINS} CLEANFILES+= ${BINS}
@ -59,7 +58,7 @@ test01: ${BINS:Mfilemontest*} ${BINS:Msizeof_long*} clean-test
grep -q -v '\.[0-9][0-9][0-9][0-9][0-9][0-9]$$' || printf "Time stamp format OK\n\n" grep -q -v '\.[0-9][0-9][0-9][0-9][0-9][0-9]$$' || printf "Time stamp format OK\n\n"
.endfor .endfor
@cd ${.CURDIR} ; set +e ; for F in filemon_log.* ; do \ @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}'` ; \ NL=`wc -l $$F | awk '{print $$1}'` ; \
if [ "$${NL}" != 97 ]; then echo "$$F BAD, contains $${NL} lines" ; exit 1 ; fi ; done if [ "$${NL}" != 97 ]; then echo "$$F BAD, contains $${NL} lines" ; exit 1 ; fi ; done