From 2f6187c24323c7fc09918555e1cd45fe48fd06f3 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Mon, 8 Dec 2008 15:06:20 -0800
Subject: [PATCH] Add libumem to makefile, remove spl.h dependency

---
 zfs/lib/libspl/Makefile.in | 9 +++++++--
 zfs/lib/libspl/kernel.c    | 1 -
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/zfs/lib/libspl/Makefile.in b/zfs/lib/libspl/Makefile.in
index cc197a7c0a..474311fe8a 100644
--- a/zfs/lib/libspl/Makefile.in
+++ b/zfs/lib/libspl/Makefile.in
@@ -2,16 +2,21 @@ subdir-m += include
 DISTFILES  = kernel.c mkdirp.c strlcpy.c taskq.c util.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
 # here called 'zu' because it was the easiest way I could convince
 # the kernel build system to construct a user space shared library.
 
 HOSTCFLAGS += @HOSTCFLAGS@
-HOSTCFLAGS += -I@LIBDIR@/libzcommon/include
+HOSTCFLAGS += -I@LIBDIR@/libumem/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
 always := $(hostprogs-y)
 
diff --git a/zfs/lib/libspl/kernel.c b/zfs/lib/libspl/kernel.c
index 4bdfd9766b..b463c9e9d4 100644
--- a/zfs/lib/libspl/kernel.c
+++ b/zfs/lib/libspl/kernel.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zlib.h>
-#include <sys/spa.h>
 #include <sys/stat.h>
 #include <sys/processor.h>
 #include <sys/zfs_context.h>