Date: Sat, 4 Mar 2017 07:20:09 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Ngie Cooper <ngie@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r314654 - in head/cddl: lib/drti lib/libavl lib/libctf lib/libdtrace lib/libnvpair lib/libumem lib/libuutil lib/libzfs lib/libzfs_core lib/libzpool sbin/zfs sbin/zpool usr.bin/ctfconver... Message-ID: <201703041520.v24FK9ne077279@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201703041130.v24BU4La030976@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[ Charset UTF-8 unsupported, converting... ] > Author: ngie > Date: Sat Mar 4 11:30:04 2017 > New Revision: 314654 > URL: https://svnweb.freebsd.org/changeset/base/314654 > > Log: > cddl: normalize paths using SRCTOP-relative paths or :H when possible > > This simplifies make logic/output > > While here, remove bogus CFLAGS which look for headers in cddl/lib/libumem. > There aren't any source files there (just Makefiles) Please again, dont intermingle other chnages when doing a tree wide sweep. IMHO if you write While here, you probably should do that thing in a seperate commit, unless this is a single thing your touching in a single commit. It is much easier to glue 2 commits togeather than seperate 1 that changes 2 things. It is also still not clear to me that this was adeqautly disccussed as I only saw 2 +'s for staying relative and no one +ing to move forward with this. > > MFC after: 1 month > Sponsored by: Dell EMC Isilon > > Modified: > head/cddl/lib/drti/Makefile > head/cddl/lib/libavl/Makefile > head/cddl/lib/libctf/Makefile > head/cddl/lib/libdtrace/Makefile > head/cddl/lib/libnvpair/Makefile > head/cddl/lib/libumem/Makefile > head/cddl/lib/libuutil/Makefile > head/cddl/lib/libzfs/Makefile > head/cddl/lib/libzfs_core/Makefile > head/cddl/lib/libzpool/Makefile > head/cddl/sbin/zfs/Makefile > head/cddl/sbin/zpool/Makefile > head/cddl/usr.bin/ctfconvert/Makefile > head/cddl/usr.bin/ctfdump/Makefile > head/cddl/usr.bin/ctfmerge/Makefile > head/cddl/usr.bin/zinject/Makefile > head/cddl/usr.bin/zlook/Makefile > head/cddl/usr.bin/zstreamdump/Makefile > head/cddl/usr.bin/ztest/Makefile > head/cddl/usr.sbin/dtrace/Makefile > head/cddl/usr.sbin/lockstat/Makefile > head/cddl/usr.sbin/plockstat/Makefile > head/cddl/usr.sbin/zdb/Makefile > head/cddl/usr.sbin/zhack/Makefile > > Modified: head/cddl/lib/drti/Makefile > ============================================================================== > --- head/cddl/lib/drti/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/drti/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common > > SRCS= drti.c > FILES= ${SRCS:R:S/$/.o/g} > @@ -12,8 +12,8 @@ CLEANFILES= ${FILES} > # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY. > .undef LIBRARIES_ONLY > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > > Modified: head/cddl/lib/libavl/Makefile > ============================================================================== > --- head/cddl/lib/libavl/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libavl/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,11 +1,11 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl > > LIB= avl > SRCS= avl.c > WARNS?= 3 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > > .include <bsd.lib.mk> > > Modified: head/cddl/lib/libctf/Makefile > ============================================================================== > --- head/cddl/lib/libctf/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libctf/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,8 +1,8 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf > > LIB= ctf > SRCS= ctf_create.c \ > @@ -21,8 +21,8 @@ MAN= ctf.5 > WARNS?= 2 > CFLAGS+= -DCTF_OLD_VERSIONS > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/common/ctf \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > > Modified: head/cddl/lib/libdtrace/Makefile > ============================================================================== > --- head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libdtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libgen/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common > > LIB= dtrace > SRCS= dt_aggregate.c \ > @@ -64,9 +64,9 @@ FILESMODE= ${NOBINMODE} > WARNS?= 1 > > CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ > - -I${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} \ > - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > + -I${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} \ > + -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > @@ -76,33 +76,33 @@ CFLAGS+= -I${.OBJDIR} -I${.CURDIR} \ > > .if ${MACHINE_CPUARCH} == "aarch64" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/aarch64 > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/aarch64 > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/aarch64 > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/aarch64 > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/aarch64 > .elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 > +CFLAGS+= -I${SRCTOP}/sys/cddl/dev/dtrace/x86 > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/i386 > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/${MACHINE_ARCH} > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/x86 > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/i386 > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/x86 > .elif ${MACHINE_CPUARCH} == "arm" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/arm > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/arm > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/arm > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/arm > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/arm > .elif ${MACHINE_CPUARCH} == "mips" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/mips > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/mips > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/mips > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/mips > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/mips > .elif ${MACHINE_CPUARCH} == "powerpc" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/powerpc > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/powerpc > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/powerpc > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/powerpc > .elif ${MACHINE_CPUARCH} == "riscv" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/riscv > -.PATH: ${.CURDIR}/../../../sys/cddl/dev/dtrace/riscv > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv > +.PATH: ${SRCTOP}/sys/cddl/dev/dtrace/riscv > .elif ${MACHINE_CPUARCH} == "sparc64" > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libdtrace/sparc > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/sparc > .else > # temporary hack > CFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/intel > > Modified: head/cddl/lib/libnvpair/Makefile > ============================================================================== > --- head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libnvpair/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/nvpair > > LIB= nvpair > > @@ -13,18 +13,18 @@ SRCS= libnvpair.c \ > opensolaris_nvpair_alloc_fixed.c > > WARNS?= 1 > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > # This library uses macros to define fprintf behavior for several object types > # The compiler will see the non-string literal arguments to the fprintf calls and > -# omit warnings for them. Quiesce these warnings in contrib code: > +# omit warnings for them. Quiesce these warnings in contrib code: > # > # cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format > # string is not a string literal (potentially insecure) [-Wformat-security] > > Modified: head/cddl/lib/libumem/Makefile > ============================================================================== > --- head/cddl/lib/libumem/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libumem/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,10 +1,10 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > LIB= umem > SRCS= umem.c > WARNS?= 3 > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > > .include <bsd.lib.mk> > > Modified: head/cddl/lib/libuutil/Makefile > ============================================================================== > --- head/cddl/lib/libuutil/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libuutil/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/avl > > LIB= uutil > SRCS= avl.c \ > @@ -17,10 +17,10 @@ SRCS= avl.c \ > > WARNS?= 1 > CFLAGS+= -DNATIVE_BUILD > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > .include <bsd.lib.mk> > > Modified: head/cddl/lib/libzfs/Makefile > ============================================================================== > --- head/cddl/lib/libzfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,9 +1,9 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > LIB= zfs > LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core > @@ -39,20 +39,19 @@ SRCS+= libzfs_changelist.c \ > WARNS?= 0 > CSTD= c99 > CFLAGS+= -DZFS_NO_ACL > -CFLAGS+= -I${.CURDIR}/../../../sbin/mount > -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/sbin/mount > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > > .include <bsd.lib.mk> > > Modified: head/cddl/lib/libzfs_core/Makefile > ============================================================================== > --- head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzfs_core/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,10 +1,10 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +.PATH: ${SRCTOP}/cddl/compat/opensolaris/misc > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > LIB= zfs_core > LIBADD= nvpair > @@ -18,20 +18,19 @@ SRCS+= libzfs_compat.c > WARNS?= 0 > CSTD= c99 > CFLAGS+= -DZFS_NO_ACL > -CFLAGS+= -I${.CURDIR}/../../../sbin/mount > -CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/sbin/mount > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > > .include <bsd.lib.mk> > > Modified: head/cddl/lib/libzpool/Makefile > ============================================================================== > --- head/cddl/lib/libzpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/lib/libzpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,28 +1,28 @@ > # $FreeBSD$ > > -.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" > +.include "${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/Makefile.files" > > # ZFS_COMMON_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > # ZFS_SHARED_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > # KERNEL_SRCS > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > # LIST_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/os > # ATOMIC_SRCS > -.if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} > +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} > ATOMIC_SRCS= opensolaris_atomic.S > .if ${MACHINE_ARCH} != "sparc64" > ACFLAGS+= -Wa,--noexecstack > .endif > .else > -.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern > +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern > ATOMIC_SRCS= opensolaris_atomic.c > .endif > # UNICODE_SRCS > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/unicode > > LIB= zpool > > @@ -37,24 +37,23 @@ SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_S > ${UNICODE_SRCS} > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look > # into libthr private structures. That's sooo evil, but it's only for > # ZFS debugging tools needs. > CFLAGS+= -DWANTS_MUTEX_OWNED > -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread > -CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys > -CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include > +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread > +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys > +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include > > LIBADD= md pthread z nvpair avl umem > > > Modified: head/cddl/sbin/zfs/Makefile > ============================================================================== > --- head/cddl/sbin/zfs/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/sbin/zfs/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,26 +1,26 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zfs > > PROG= zfs > MAN= zfs.8 > SRCS= zfs_main.c zfs_iter.c > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > > LIBADD= jail nvpair uutil zfs_core zfs > > > Modified: head/cddl/sbin/zpool/Makefile > ============================================================================== > --- head/cddl/sbin/zpool/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/sbin/zpool/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,8 +1,8 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common > -.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zpool > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common > +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > > PROG= zpool > MAN= zpool.8 zpool-features.7 > @@ -10,22 +10,22 @@ SRCS= zpool_main.c zpool_vdev.c zpool_it > SRCS+= timestamp.c > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/cmd/stat/common > > LIBADD= geom nvpair uutil zfs > > > Modified: head/cddl/usr.bin/ctfconvert/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfconvert/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt > > PROG= ctfconvert > SRCS= alist.c \ > @@ -25,8 +25,8 @@ SRCS= alist.c \ > traverse.c \ > util.c > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > > Modified: head/cddl/usr.bin/ctfdump/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/dump > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump > > PROG= ctfdump > SRCS= dump.c \ > @@ -12,8 +12,8 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ > - -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > + -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common > > > Modified: head/cddl/usr.bin/ctfmerge/Makefile > ============================================================================== > --- head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ctfmerge/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/common > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/tools/ctf/cvt > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt > > PROG= ctfmerge > SRCS= alist.c \ > @@ -24,8 +24,8 @@ SRCS= alist.c \ > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR} \ > -I${OPENSOLARIS_SYS_DISTDIR} \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > > Modified: head/cddl/usr.bin/zinject/Makefile > ============================================================================== > --- head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zinject/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,25 +1,24 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zinject > > PROG= zinject > SRCS= zinject.c translate.c > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs/ > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= geom m nvpair umem uutil zfs_core zfs zpool > > > Modified: head/cddl/usr.bin/zlook/Makefile > ============================================================================== > --- head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zlook/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,25 +1,12 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zlook > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zlook > > PROG= zlook > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -#CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -#CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -#CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -#CFLAGS+= -I${.CURDIR}/../../lib/libumem > -# > -#DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ > -# ${LIBZFS} ${LIBZPOOL} > -#LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > > .include <bsd.prog.mk> > > Modified: head/cddl/usr.bin/zstreamdump/Makefile > ============================================================================== > --- head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/zstreamdump/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,21 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zstreamdump > > PROG= zstreamdump > MAN= zstreamdump.1 > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= m nvpair umem zpool pthread z avl > > > Modified: head/cddl/usr.bin/ztest/Makefile > ============================================================================== > --- head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.bin/ztest/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,21 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/ztest > > PROG= ztest > MAN= > > WARNS?= 0 > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil > > > Modified: head/cddl/usr.sbin/dtrace/Makefile > ============================================================================== > --- head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/dtrace/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -2,7 +2,7 @@ > > .include <src.opts.mk> > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/dtrace > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace > > PROG= dtrace > SRCS= dtrace.c > @@ -10,8 +10,8 @@ BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > > Modified: head/cddl/usr.sbin/lockstat/Makefile > ============================================================================== > --- head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/lockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat > > PROG= lockstat > SRCS= lockstat.c sym.c > @@ -8,14 +8,14 @@ BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/compat \ > - -I${.CURDIR}/../../../sys > + -I${SRCTOP}/sys > > CFLAGS+= -DNEED_ERRLOC -g > > > Modified: head/cddl/usr.sbin/plockstat/Makefile > ============================================================================== > --- head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/plockstat/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,22 +1,22 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/plockstat > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat > > PROG= plockstat > -SRCS= plockstat.c > +SRCS= plockstat.c > BINDIR?= /usr/sbin > > WARNS?= 1 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ > - -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris \ > + -I${SRCTOP}/cddl/compat/opensolaris/include \ > -I${OPENSOLARIS_USR_DISTDIR}/head \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \ > -I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \ > -I${OPENSOLARIS_SYS_DISTDIR}/compat \ > - -I${.CURDIR}/../../../cddl/lib/libdtrace \ > - -I${.CURDIR}/../../../sys > + -I${SRCTOP}/cddl/lib/libdtrace \ > + -I${SRCTOP}/sys > > LIBADD= dtrace proc > > > Modified: head/cddl/usr.sbin/zdb/Makefile > ============================================================================== > --- head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/zdb/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zdb > > PROG= zdb > MAN= zdb.8 > @@ -9,20 +9,19 @@ SRCS= zdb.c zdb_il.c > WARNS?= 0 > CSTD= c99 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= nvpair umem uutil zfs zpool > > > Modified: head/cddl/usr.sbin/zhack/Makefile > ============================================================================== > --- head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:28:03 2017 (r314653) > +++ head/cddl/usr.sbin/zhack/Makefile Sat Mar 4 11:30:04 2017 (r314654) > @@ -1,6 +1,6 @@ > # $FreeBSD$ > > -.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack > +.PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/zhack > > PROG= zhack > MAN= > @@ -8,20 +8,19 @@ MAN= > WARNS?= 0 > CSTD= c99 > > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include > -CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys > -CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs > -CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head > -CFLAGS+= -I${.CURDIR}/../../lib/libumem > +CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include > +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys > +CFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs > +CFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head > > LIBADD= nvpair zfs zpool > > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703041520.v24FK9ne077279>