Author: ngie
Date: Mon Feb 2 09:23:18 2015
New Revision: 278066
URL: https://svnweb.freebsd.org/changeset/base/278066
Log:
MFC r277666,r277685:
r277666:
Only build share/dtrace if MK_CDDL != no
Sponsored by: EMC / Isilon Storage Division
r277685:
Fill in some dtrace entries when MK_CDDL == no
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/share/Makefile
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/share/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/share/Makefile
==============================================================================
--- stable/9/share/Makefile Mon Feb 2 08:53:45 2015 (r278065)
+++ stable/9/share/Makefile Mon Feb 2 09:23:18 2015 (r278066)
@@ -8,7 +8,7 @@
SUBDIR= ${_colldef} \
${_dict} \
${_doc} \
- dtrace \
+ ${_dtrace} \
${_examples} \
${_i18n} \
keys \
@@ -35,6 +35,10 @@ SUBDIR= ${_colldef} \
_snmp= snmp
.endif
+.if ${MK_CDDL} != "no"
+_dtrace= dtrace
+.endif
+
.if ${MK_DICT} != "no"
_dict= dict
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 08:53:45
2015 (r278065)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Mon Feb 2 09:23:18
2015 (r278066)
@@ -587,9 +587,24 @@ OLD_FILES+=usr/lib32/libuutil.so
OLD_LIBS+=usr/lib32/libuutil.so.2
OLD_FILES+=usr/lib32/libuutil_p.a
.endif
+OLD_LIBS+=lib/libdtrace.so.2
OLD_FILES+=usr/sbin/dtrace
OLD_FILES+=usr/sbin/lockstat
OLD_FILES+=usr/share/man/man1/dtrace.1.gz
+OLD_FILES+=usr/share/dtrace/disklatency
+OLD_FILES+=usr/share/dtrace/disklatencycmd
+OLD_FILES+=usr/share/dtrace/hotopen
+OLD_FILES+=usr/share/dtrace/nfsclienttime
+OLD_FILES+=usr/share/dtrace/toolkit/execsnoop
+OLD_FILES+=usr/share/dtrace/toolkit/hotkernel
+OLD_FILES+=usr/share/dtrace/toolkit/hotuser
+OLD_FILES+=usr/share/dtrace/toolkit/opensnoop
+OLD_FILES+=usr/share/dtrace/toolkit/procsystime
+OLD_FILES+=usr/share/man/man1/dtrace.1.gz
+OLD_DIRS+=usr/lib/dtrace
+OLD_DIRS+=usr/lib32/dtrace
+OLD_DIRS+=usr/share/dtrace/toolkit
+OLD_DIRS+=usr/share/dtrace
.endif
.if ${MK_ZFS} == no
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
