upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

MFhead @ r305020

Browse source
This commit is contained in:
Enji Cooper 2016-08-29 19:14:52 +00:00
commit 84cd8a602a
5 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cddl/usr.sbin/zfsd/Makefile
View file

@ -1,6 +1,5 @@
# $FreeBSD$
SRCDIR=${.CURDIR}/../../..
.include "Makefile.common"
PROG_CXX= zfsd

28
cddl/usr.sbin/zfsd/Makefile.common
View file

@ -15,20 +15,20 @@ WARNS?= 3
# Ignore warnings about Solaris specific pragmas.
IGNORE_PRAGMA= YES
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzpool/common
INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/include
INCFLAGS+= -I${SRCDIR}/cddl/compat/opensolaris/lib/libumem
INCFLAGS+= -I${SRCDIR}/sys/cddl/compat/opensolaris
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/head
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libuutil/common
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libumem/common
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs_core/common
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libzfs/common
INCFLAGS+= -I${SRCDIR}/cddl/contrib/opensolaris/lib/libnvpair
INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/common/zfs
INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common
INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
INCFLAGS+= -I${SRCDIR}/sys/cddl/contrib/opensolaris/uts/common/sys
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzpool/common
INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
INCFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
INCFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/head
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libuutil/common
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libumem/common
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs_core/common
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libzfs/common
INCFLAGS+= -I${SRCTOP}/cddl/contrib/opensolaris/lib/libnvpair
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/common/zfs
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
INCFLAGS+= -I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS= -g -DNEED_SOLARIS_BOOLEAN ${INCFLAGS}

11
cddl/usr.sbin/zfsd/tests/Makefile
View file

@ -1,10 +1,7 @@
# $FreeBSD$
SRCDIR=${.CURDIR}/../../../..
.include "${.CURDIR}/../Makefile.common"
.PATH: ${.CURDIR}/..
TESTSDIR?= ${TESTSBASE}/cddl/sbin/zfsd
.PATH: ${.CURDIR:H}
PLAIN_TESTS_CXX= zfsd_unittest
SRCS.zfsd_unittest:= ${SRCS:Nzfsd_main.cc}
@ -12,7 +9,7 @@ SRCS.zfsd_unittest+= libmocks.c zfsd_unittest.cc
SRCS=
# Use #include <zfsd/xxx.h> in test programs.
INCFLAGS+= -I${.CURDIR}/../..
INCFLAGS+= -I${.CURDIR:H:H}
.if defined(DESTDIR)
INCFLAGS+= -I${DESTDIR}/usr/include
@ -27,7 +24,6 @@ LIBRARY_PATH=
.endif
# Googletest options
LOCALBASE?= /usr/local
INCFLAGS+= -I${LOCALBASE}/include -D_THREAD_SAFE -pthread
LDFLAGS.zfsd_unittest+= -L${LOCALBASE}/lib -D_THREAD_SAFE -pthread
LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgtest.a
@ -39,7 +35,4 @@ LDADD.zfsd_unittest+= ${LOCALBASE}/lib/libgmock.a ${LOCALBASE}/lib/libgmock_main
# https://groups.google.com/forum/#!msg/googletestframework/h8ixEPCFm0o/amwfu4xGJb0J
CFLAGS.zfsd_unittest+= -DGTEST_HAS_PTHREAD
# Install the tests
TESTSBASE?= /usr/tests
.include <bsd.test.mk>

1
cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc
View file

@ -72,7 +72,6 @@ using std::string;
using std::stringstream;
using DevdCtl::Event;
using DevdCtl::EventBuffer;
using DevdCtl::EventFactory;
using DevdCtl::EventList;
using DevdCtl::Guid;

1
lib/libc/aarch64/sys/Makefile.inc
View file

@ -4,7 +4,6 @@ MIASM:= ${MIASM:Nfreebsd[467]_*}
SRCS+= __vdso_gettc.c
#MDASM= ptrace.S
MDASM= cerror.S \
shmat.S \
sigreturn.S \