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

[Aurelien Jarno]

Author: aurel32
Date: 2010-07-29 01:55:08 +0000 (Thu, 29 Jul 2010)
New Revision: 3098

Modified:
   trunk/zfsutils/debian/patches/05_makefile.diff
   trunk/zfsutils/debian/rules
Log:
Fix libraries linking


Modified: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff	2010-07-29 01:15:19 UTC (rev 3097)
+++ trunk/zfsutils/debian/patches/05_makefile.diff	2010-07-29 01:55:08 UTC (rev 3098)
@@ -1,45 +1,61 @@
-diff -ur -x debian a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
---- a/cddl/lib/libzfs/Makefile	2008-11-17 15:49:29.000000000 -0500
-+++ b/cddl/lib/libzfs/Makefile	2010-07-27 20:11:17.801799169 -0400
-@@ -47,5 +47,6 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
-+CFLAGS+= -I${.CURDIR}/../../../lib/libgeom
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -7,7 +7,10 @@
  
+ LIB=	zfs
+ DPADD=	${LIBUTIL}
+-LDADD=	-lutil
++LDADD=	-lm -lbsd -lgeom -lnvpair -luutil
++
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair \
++	-L${.CURDIR}/../../../cddl/lib/libuutil \
+ 
+ SRCS=	deviceid.c \
+ 	fsshare.c \
+--- a/cddl/lib/libuutil/Makefile	2010-07-29 03:23:17.000000000 +0200
++++ b/cddl/lib/libuutil/Makefile	2010-07-29 03:24:01.000000000 +0200
+@@ -22,4 +22,6 @@
+ CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+ 
++LDADD= -lrt -lbsd -lpthread
++
  .include <bsd.lib.mk>
 diff -ur -x debian a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile
 --- a/cddl/sbin/zfs/Makefile	2008-03-27 19:21:25.000000000 -0400
 +++ b/cddl/sbin/zfs/Makefile	2010-07-27 20:11:17.802817408 -0400
-@@ -21,7 +21,13 @@
+@@ -19,9 +19,12 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
  
- DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+-DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+-	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
 -LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
-+LDADD=	-lzfs -lgeom -lexpat -lsbuf \
- 	-lm -lnvpair -luutil -lutil
+-	-lm -lnvpair -luutil -lutil
++DPADD=	${LIBZFS} ${LIBGEOM} \
++	${LIBM} ${LIBNVPAIR} ${LIBUUTIL}
++LDADD=	-lzfs -lgeom -lnvpair -luutil
++
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
++       -L${.CURDIR}/../../../cddl/lib/libnvpair \
++       -L${.CURDIR}/../../../cddl/lib/libuutil 
  
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
-+	-L${.CURDIR}/../../../cddl/lib/libnvpair \
-+	-L${.CURDIR}/../../../cddl/lib/libuutil \
-+	-L${.CURDIR}/../../../lib/libgeom \
-+	-L${.CURDIR}/../../../lib/libsbuf
-+
  .include <bsd.prog.mk>
 diff -ur -x debian a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile
 --- a/cddl/sbin/zpool/Makefile	2008-11-17 15:49:29.000000000 -0500
 +++ b/cddl/sbin/zpool/Makefile	2010-07-27 20:11:17.803821828 -0400
-@@ -23,7 +23,12 @@
+@@ -21,9 +21,10 @@
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
  
- DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
- 	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+-DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+-	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
 -LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
-+LDADD=	-lavl -lzfs -lgeom -lexpat -lsbuf \
- 	-lm -lnvpair -luutil -lutil
- 
+-	-lm -lnvpair -luutil -lutil
++DPADD=	${LIBZFS} ${LIBGEOM} ${LIBNVPAIR} ${LIBUUTIL}
++LDADD=	-lzfs -lgeom -lnvpair -luutil
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
 +	-L${.CURDIR}/../../../cddl/lib/libnvpair \
 +	-L${.CURDIR}/../../../cddl/lib/libuutil
-+
-+
+ 
  .include <bsd.prog.mk>

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2010-07-29 01:15:19 UTC (rev 3097)
+++ trunk/zfsutils/debian/rules	2010-07-29 01:55:08 UTC (rev 3098)
@@ -52,9 +52,9 @@
 
 build-zfs: build-zfs-stamp
 build-zfs-stamp: patch
-	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs SHLIBDIR=./
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair SHLIBDIR=./
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil SHLIBDIR=./
+	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs SHLIBDIR=./
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs
 	touch $@
@@ -62,9 +62,9 @@
 clean:
 	dh_testdir
 	dh_testroot
-	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs clean
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair clean
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil clean
+	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs clean
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool clean
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
@@ -78,10 +78,10 @@
 	dh_clean -k -s
 	dh_installdirs -s
 
-	mkdir -p $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man
-	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs install
+	mkdir -p $(DESTDIR)/usr/lib $(DESTDIR)/usr/include $(DESTDIR)/usr/share/man/man8
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libnvpair install
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libuutil install
+	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs install
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zpool install
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs install