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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-06-09 22:23:01 +0000 (Thu, 09 Jun 2016)
New Revision: 6066

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/makefile.diff
   trunk/zfsutils/debian/rules
Log:
Switch to use system libmd (thanks, Guillem Jover!)


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2016-05-30 14:00:37 UTC (rev 6065)
+++ trunk/zfsutils/debian/changelog	2016-06-09 22:23:01 UTC (rev 6066)
@@ -1,5 +1,6 @@
 zfsutils (10.1~svn272500+ds1-1) UNRELEASED; urgency=medium
 
+  [ Steven Chamberlain ]
   * Update svn_revision regex to allow +suffix
   * svn export with --ignore-keywords and re-pack upstream source
   * Refresh patch debian/patches/disable_libjail.diff
@@ -7,6 +8,9 @@
   * Rename ztest executable to zfstest, to avoid conflict with zutils
     (Closes: #825268)
 
+  [ Guillem Jover ]
+  * Switch to use system libmd
+
  -- Steven Chamberlain <steven at pyro.eu.org>  Mon, 30 May 2016 14:11:59 +0100
 
 zfsutils (10.1~svn272500-1) unstable; urgency=low

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2016-05-30 14:00:37 UTC (rev 6065)
+++ trunk/zfsutils/debian/control	2016-06-09 22:23:01 UTC (rev 6066)
@@ -10,6 +10,7 @@
 Build-Depends: debhelper (>= 7.0.50~),
  freebsd-buildutils (>= 9.0-5~),
  libbsd-dev (>= 0.3.0),
+ libmd-dev,
  libc0.1-dev (>= 2.10),
  kfreebsd-kernel-headers (>= 10.1~4~),
  libgeom-dev,

Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff	2016-05-30 14:00:37 UTC (rev 6065)
+++ trunk/zfsutils/debian/patches/makefile.diff	2016-06-09 22:23:01 UTC (rev 6066)
@@ -16,7 +16,7 @@
  DPADD=	${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
  	${LIBAVL} ${LIBZFS_CORE}
 -LDADD=	-lmd -lpthread -lumem -lutil -lavl -lzfs_core
-+LDADD=	${.CURDIR}/../../../lib/libmd/libmd.a -lpthread -lumem -lzfs_core
++LDADD=	-lmd -lpthread -lumem -lzfs_core
 +
 +LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
@@ -26,28 +26,18 @@
  
  SRCS=	deviceid.c \
  	fsshare.c \
-@@ -58,5 +64,6 @@
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
- CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
-+CFLAGS+= -I${.CURDIR}/../../../lib/libmd
- 
- .include <bsd.lib.mk>
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
-@@ -57,7 +57,14 @@
+@@ -57,7 +57,11 @@
  CFLAGS+=	-I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
  
  DPADD=		${LIBMD} ${LIBPTHREAD} ${LIBZ}
 -LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl
-+LDADD=		     -lpthread -lz -lumem -lnvpair -lavl-illumos -lbsd -lrt
++LDADD=		-lmd -lpthread -lz -lumem -lnvpair -lavl-illumos -lbsd -lrt
 +
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libavl
-+
-+CFLAGS+= -I${.CURDIR}/../../../lib/libmd
-+LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
  
  # atomic.S doesn't like profiling.
  NO_PROFILE=

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2016-05-30 14:00:37 UTC (rev 6065)
+++ trunk/zfsutils/debian/rules	2016-06-09 22:23:01 UTC (rev 6066)
@@ -71,7 +71,6 @@
 		 cddl/contrib/opensolaris/cmd/stat/common/ \
 	         sys/cddl/compat/opensolaris \
 	         sys/cddl/contrib/opensolaris \
-		lib/libmd \
 	         cddl/lib/libavl \
 	         cddl/lib/libnvpair \
 	         cddl/lib/libuutil \
@@ -92,7 +91,7 @@
 
 build: build-arch build-indep
 
-build-arch: build-libmd build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
+build-arch: build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
 
 build-indep:
 # We have nothing to do by default.
@@ -115,7 +114,7 @@
 
 
 build-libzpool: build-libzpool-stamp
-build-libzpool-stamp: build-libavl build-libnvpair-stamp build-libumem build-libmd
+build-libzpool-stamp: build-libavl build-libnvpair-stamp build-libumem
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzpool
 	touch $@
 
@@ -134,11 +133,6 @@
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs_core
 	touch $@
 
-build-libmd: build-libmd-stamp
-build-libmd-stamp:
-	$(PMAKE) -C $(CURDIR)/lib/libmd
-	touch $@
-
 build-libavl: build-libavl-stamp
 build-libavl-stamp:
 	$(PMAKE) -C $(CURDIR)/cddl/lib/libavl
@@ -176,7 +170,6 @@
 	$(PMAKE) -C $(CURDIR)/cddl/usr.sbin/zdb clean
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/ztest clean
 	$(PMAKE) -C $(CURDIR)/cddl/usr.bin/zinject clean
-	$(PMAKE) -C $(CURDIR)/lib/libmd clean
 
 	rm -f *stamp
 	dh_clean