Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
This commit is contained in:
commit
0dcf124a5e
|
@ -1,15 +1,13 @@
|
||||||
subdir-m += include
|
subdir-m += include
|
||||||
DISTFILES = mkdirp.c strlcpy.c taskq.c util.c
|
DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c u8_textprep.c
|
||||||
DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c
|
|
||||||
|
|
||||||
LIBRARY := libzport
|
LIBRARY := libspl
|
||||||
|
|
||||||
# Compile as shared library. There's an extra useless host program
|
# Compile as shared library. There's an extra useless host program
|
||||||
# here called 'zu' because it was the easiest way I could convince
|
# here called 'zu' because it was the easiest way I could convince
|
||||||
# the kernel build system to construct a user space shared library.
|
# the kernel build system to construct a user space shared library.
|
||||||
|
|
||||||
HOSTCFLAGS += @HOSTCFLAGS@
|
HOSTCFLAGS += @HOSTCFLAGS@
|
||||||
HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
|
|
||||||
HOSTCFLAGS += -I@LIBDIR@/libspl/include
|
HOSTCFLAGS += -I@LIBDIR@/libspl/include
|
||||||
|
|
||||||
hostprogs-y := zu
|
hostprogs-y := zu
|
||||||
|
@ -19,8 +17,6 @@ zu-objs := zu.o ${LIBRARY}.so
|
||||||
|
|
||||||
${LIBRARY}-objs += mkdirp.o
|
${LIBRARY}-objs += mkdirp.o
|
||||||
${LIBRARY}-objs += strlcpy.o
|
${LIBRARY}-objs += strlcpy.o
|
||||||
${LIBRARY}-objs += taskq.o
|
|
||||||
${LIBRARY}-objs += util.o
|
|
||||||
${LIBRARY}-objs += list.o
|
${LIBRARY}-objs += list.o
|
||||||
${LIBRARY}-objs += strlcat.o
|
${LIBRARY}-objs += strlcat.o
|
||||||
${LIBRARY}-objs += strnlen.o
|
${LIBRARY}-objs += strnlen.o
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
DISTFILES = list.h list_impl.h vmem.h zfs_context.h
|
DISTFILES = list.h list_impl.h vmem.h
|
||||||
|
|
Loading…
Reference in New Issue