Date: Wed, 12 Jul 2006 02:47:40 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 101322 for review Message-ID: <200607120247.k6C2lev9045897@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=101322 Change 101322 by jb@jb_freebsd2 on 2006/07/12 02:47:01 Convert from using NO_CDDL to use the new build knob MK_CDDL. Affected files ... .. //depot/projects/dtrace/src/Makefile.inc1#12 edit .. //depot/projects/dtrace/src/cddl/Makefile#6 edit .. //depot/projects/dtrace/src/sys/modules/Makefile#12 edit Differences ... ==== //depot/projects/dtrace/src/Makefile.inc1#12 (text+ko) ==== @@ -38,10 +38,10 @@ # We must do etc last for install/distribute to work. # SUBDIR= share/info include lib libexec bin -.if defined(NO_CDDL) +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.else NO_CTF=1 -.else -SUBDIR+=cddl .endif .if ${MK_GAMES} != "no" SUBDIR+=games @@ -211,7 +211,7 @@ VERSION="${VERSION}" \ INSTALL="sh ${.CURDIR}/tools/install.sh" \ PATH=${TMPPATH} -.if defined(NO_CDDL) || defined(NO_CTF) +.if ${MK_CDDL} == "no" || defined(NO_CTF) WMAKEENV+= NO_CTF=1 .endif WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP} @@ -862,7 +862,7 @@ _pwd_mkdb= usr.sbin/pwd_mkdb .endif -.if !defined(NO_CDDL) && !defined(NO_DTRACE) +.if ${MK_CDDL} != "no" _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf gnu/lib/libdwarf cddl/lib/libelf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge .endif @@ -1053,7 +1053,7 @@ _prebuild_libs+= lib/libypclnt .endif -.if !defined(NO_CDDL) && !defined(NO_DTRACE) +.if ${MK_CDDL} != "no" _prebuild_libs+= cddl/lib .endif ==== //depot/projects/dtrace/src/cddl/Makefile#6 (text+ko) ==== @@ -1,8 +1,10 @@ # $FreeBSD$ +.include <bsd.own.mk> + SUBDIR= -.if !defined(NO_CDDL) +.if ${MK_CDDL} != "no" SUBDIR+= lib usr.bin usr.sbin .endif ==== //depot/projects/dtrace/src/sys/modules/Makefile#12 (text+ko) ==== @@ -322,7 +322,7 @@ _pflog= pflog .endif -.if !defined(NO_CDDL) +.if ${MK_CDDL} != "no" _cyclic= cyclic _dtrace= dtrace .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607120247.k6C2lev9045897>