PERFORCE change 126853 for review
John Birrell
jb at FreeBSD.org
Thu Sep 27 02:25:13 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=126853
Change 126853 by jb at jb_freebsd1 on 2007/09/27 09:24:56
Resolve integration conflicts -- mostly by accepting the version in CVS.
Affected files ...
.. //depot/projects/dtrace/doc/share/images/books/handbook/install/desktop.scr#3 integrate
.. //depot/projects/dtrace/doc/share/images/books/handbook/install/xf86setup.scr#3 integrate
.. //depot/projects/dtrace/src/cddl/Makefile#7 integrate
.. //depot/projects/dtrace/src/cddl/Makefile.inc#5 integrate
.. //depot/projects/dtrace/src/cddl/lib/Makefile#6 integrate
.. //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile.inc#2 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile.inc#2 integrate
.. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#4 integrate
.. //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#8 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 integrate
Differences ...
==== //depot/projects/dtrace/doc/share/images/books/handbook/install/desktop.scr#3 (text+ko) ====
==== //depot/projects/dtrace/doc/share/images/books/handbook/install/xf86setup.scr#3 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/Makefile#7 (text+ko) ====
@@ -1,11 +1,5 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
-.include <bsd.own.mk>
-
-SUBDIR=
-
-.if ${MK_CDDL} != "no"
-SUBDIR+= lib usr.bin usr.sbin
-.endif
+SUBDIR= lib sbin usr.bin usr.sbin
.include <bsd.subdir.mk>
==== //depot/projects/dtrace/src/cddl/Makefile.inc#5 (text+ko) ====
@@ -1,11 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
-OPENSOLARIS_USR_DISTDIR=${.CURDIR}/../../../contrib/opensolaris
-OPENSOLARIS_SYS_DISTDIR=${.CURDIR}/../../../sys/contrib/opensolaris
-
-CFLAGS+= -I${.CURDIR}/../../../sys
-CFLAGS+= -D_SOLARIS_C_SOURCE
-
-IGNORE_PRAGMA= 1
-
-WARNS?= 6
+CFLAGS+= -D_SOLARIS_C_SOURCE
==== //depot/projects/dtrace/src/cddl/lib/Makefile#6 (text+ko) ====
@@ -1,5 +1,17 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= libavl \
+ libnvpair \
+ libumem \
+ libuutil \
+ ${_libzfs} \
+ ${_libzpool}
-SUBDIR= libctf libdtrace libproc
+.if ${MK_ZFS} != "no"
+_libzfs= libzfs
+_libzpool= libzpool
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/dtrace/src/cddl/lib/libavl/Makefile#2 (text+ko) ====
@@ -1,19 +1,10 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
-.include "../../Makefile.inc"
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
-LIB= avl
-SHLIB_MAJOR= 1
+LIB= avl
+SRCS= avl.c
+CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-SRCS= avl.c
-
-WARNS?= 0
-
-.PATH: ${OPENSOLARIS_SYS_DISTDIR}/common/avl
-
-CFLAGS+= -I${.CURDIR}/../../../contrib \
- -I${.CURDIR}/../../../sys/contrib \
- -I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-
.include <bsd.lib.mk>
-
==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#3 (text+ko) ====
@@ -1,5 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_ztest}
-SUBDIR= ctfconvert ctfdump ctfmerge sgsmsg
+.if ${MK_ZFS} != "no"
+_ztest= ztest
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#2 (text+ko) ====
@@ -1,5 +1,11 @@
-# $FreeBSD$
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_zdb}
-SUBDIR= dtrace
+.if ${MK_ZFS} != "no"
+_zdb= zdb
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile.inc#2 (text+ko) ====
==== //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.c#4 (text+ko) ====
==== //depot/projects/dtrace/src/contrib/pf/pflogd/pidfile.h#4 (text+ko) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/common/avl/avl.c#8 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#4 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#5 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/note.h#3 (text) ====
==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 (text) ====
More information about the p4-projects
mailing list