[Glibc-bsd-commits] r3295 - in trunk/zfsutils/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2011-04-23 19:05:36 +0000 (Sat, 23 Apr 2011)
New Revision: 3295

Modified:
   trunk/zfsutils/debian/patches/05_makefile.diff
   trunk/zfsutils/debian/rules
Log:
Correctly link libzpool



Modified: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff	2011-04-23 08:49:30 UTC (rev 3294)
+++ trunk/zfsutils/debian/patches/05_makefile.diff	2011-04-23 19:05:36 UTC (rev 3295)
@@ -64,7 +64,7 @@
 ===================================================================
 --- zfsutils-8.1-patch.orig/cddl/usr.sbin/zdb/Makefile	2011-04-06 17:17:31.000000000 -0400
 +++ zfsutils-8.1-patch/cddl/usr.sbin/zdb/Makefile	2011-04-06 17:17:47.000000000 -0400
-@@ -18,7 +18,13 @@
+@@ -18,7 +18,12 @@
  
  DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
  	${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
@@ -75,7 +75,6 @@
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl  ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
  
  CSTD=	c99
  
@@ -83,7 +82,7 @@
 ===================================================================
 --- zfsutils-8.1-patch.orig/cddl/usr.bin/zinject/Makefile	2011-04-06 17:17:31.000000000 -0400
 +++ zfsutils-8.1-patch/cddl/usr.bin/zinject/Makefile	2011-04-06 17:17:47.000000000 -0400
-@@ -17,6 +17,12 @@
+@@ -17,6 +17,11 @@
  
  DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
  	${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
@@ -94,14 +93,13 @@
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl  ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
  
  .include <bsd.prog.mk>
 Index: zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile
 ===================================================================
 --- zfsutils-8.1-patch.orig/cddl/usr.bin/ztest/Makefile	2011-04-06 17:17:31.000000000 -0400
 +++ zfsutils-8.1-patch/cddl/usr.bin/ztest/Makefile	2011-04-06 17:21:32.000000000 -0400
-@@ -14,7 +14,11 @@
+@@ -14,7 +14,10 @@
  CFLAGS+= -I${.CURDIR}/../../lib/libumem
  
  DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
@@ -111,7 +109,21 @@
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzpool
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl  ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
  
  CSTD=	c99
  
+--- zfsutils-8.2.orig/cddl/lib/libzpool/Makefile
++++ zfsutils-8.2/cddl/lib/libzpool/Makefile
+@@ -53,7 +53,10 @@
+ CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
+ 
+ DPADD=		${LIBPTHREAD} ${LIBZ}
+-LDADD=		-lpthread -lz
++LDADD=		-lpthread -lz -lrt -lbsd -lnvpair -lumem
++LDADD+=	-L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+=	-L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+=	${.CURDIR}/../../../cddl/lib/libavl/libavl.a
+ 
+ # atomic.S doesn't like profiling.
+ NO_PROFILE=
+

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-04-23 08:49:30 UTC (rev 3294)
+++ trunk/zfsutils/debian/rules	2011-04-23 19:05:36 UTC (rev 3295)
@@ -86,7 +86,7 @@
 
 
 build-libzpool: build-libzpool-stamp
-build-libzpool-stamp: patch
+build-libzpool-stamp: patch build-libavl build-libnvpair-stamp build-libumem
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzpool
 	touch $@
 
@@ -101,7 +101,7 @@
 	touch $@
 
 build-zfsutils: build-zfsutils-stamp
-build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool build-libavl
+build-zfsutils-stamp: patch build-libzfs-stamp build-libnvpair-stamp build-libuutil-stamp build-libumem build-libzpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs