Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Add libumem to makefile, remove spl.h dependency

This commit is contained in:
Brian Behlendorf 2008-12-08 15:06:20 -08:00
parent 725d82bac9
commit 2f6187c243
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zfs/lib/libspl/Makefile.in
View File

@ -2,16 +2,21 @@ subdir-m += include
DISTFILES = kernel.c mkdirp.c strlcpy.c taskq.c util.c DISTFILES = kernel.c mkdirp.c strlcpy.c taskq.c util.c
DISTFILES += list.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@/libumem/include
HOSTCFLAGS += -I@LIBDIR@/libspl/include HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem
# Additional shared library paths for executing binaries in-tree
export LD_RUN_PATH = @LIBDIR@/libumem
hostprogs-y := zu hostprogs-y := zu
always := $(hostprogs-y) always := $(hostprogs-y)

1
zfs/lib/libspl/kernel.c
View File

@ -30,7 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <zlib.h> #include <zlib.h>
#include <sys/spa.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/processor.h> #include <sys/processor.h>
#include <sys/zfs_context.h> #include <sys/zfs_context.h>