3 files changed, 28 insertions, 1 deletions
diff --git a/libidmap/debian/control b/libidmap/debian/control
index cec5b3f..235dcce 100644
--- a/libidmap/debian/control
+++ b/libidmap/debian/control
@@ -6,7 +6,7 @@ Build-Depends:
  dh-illumos,
  gcc-multilib,
  illumos-source-2.10,
- lib32sunavl1-dev, libsunavl1-dev,
+ lib32sunavl-dev, libsunavl-dev,
  lib32nvpair1-dev, libnvpair1-dev,
  lib32uutil1-dev, libuutil1-dev,
  quilt,
diff --git a/libidmap/debian/patches/libidmap-libsunavl.patch b/libidmap/debian/patches/libidmap-libsunavl.patch
new file mode 100644
index 0000000..ea50775
--- /dev/null
+++ b/libidmap/debian/patches/libidmap-libsunavl.patch
@@ -0,0 +1,26 @@
+Index: libidmap/usr/src/lib/libidmap/common/idmap_cache.c
+===================================================================
+--- libidmap.orig/usr/src/lib/libidmap/common/idmap_cache.c
++++ libidmap/usr/src/lib/libidmap/common/idmap_cache.c
+@@ -31,7 +31,7 @@
+ 
+ 
+ #include <sys/types.h>
+-#include <sys/avl.h>
++#include <libsunavl.h>
+ #include <assert.h>
+ #include <pthread.h>
+ #include <strings.h>
+Index: libidmap/usr/src/lib/libidmap/Makefile.com
+===================================================================
+--- libidmap.orig/usr/src/lib/libidmap/Makefile.com
++++ libidmap/usr/src/lib/libidmap/Makefile.com
+@@ -43,7 +43,7 @@ include ../../Makefile.lib
+ C99MODE = $(C99_ENABLE)
+ 
+ LIBS =		$(DYNLIB) $(LINTLIB)
+-LDLIBS +=	-lc -lavl -lnsl -lnvpair -luutil
++LDLIBS +=	-lc -lsunavl -lnsl -lnvpair -luutil
+ 
+ SRCDIR =	../common
+ $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
diff --git a/libidmap/debian/patches/series b/libidmap/debian/patches/series
index 28882c2..1ded62b 100644
--- a/libidmap/debian/patches/series
+++ b/libidmap/debian/patches/series
@@ -1,2 +1,3 @@
 libidmap-no-libscf.h.patch
 libidmap-use-system-idmap_prot.x.patch
+libidmap-libsunavl.patch