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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-06-09 23:24:58 +0000 (Thu, 09 Jun 2016)
New Revision: 6068

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/makefile.diff
Log:
Avoid gratuitously linking against bsdxml/expat:


Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2016-06-09 23:20:53 UTC (rev 6067)
+++ trunk/zfsutils/debian/changelog	2016-06-09 23:24:58 UTC (rev 6068)
@@ -18,6 +18,8 @@
     - 13_freebsd.diff: use __FreeBSD_kernel__ macro as needed
     - libmd.diff: use system sha2.h from libmd
     - noinline.diff: convert to using __attribute__ keyword
+  * Avoid gratuitously linking against bsdxml/expat:
+    - makefile.diff
   * Update svn_revision regex to allow +suffix
   * svn export with --ignore-keywords and re-pack upstream source
   * Refresh patch debian/patches/disable_libjail.diff

Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff	2016-06-09 23:20:53 UTC (rev 6067)
+++ trunk/zfsutils/debian/patches/makefile.diff	2016-06-09 23:24:58 UTC (rev 6068)
@@ -121,23 +121,23 @@
  CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 --- a/cddl/lib/libzfs/Makefile
 +++ b/cddl/lib/libzfs/Makefile
-@@ -10,9 +10,15 @@
+@@ -10,8 +10,14 @@
  	${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
  	${LIBNVPAIR} ${LIBZ}
  
 -LDADD=	-lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
+-	-lbsdxml -lgeom -lnvpair -lz -lzfs_core
 +LDADD=	-lmd -lpthread -lumem -luutil -lm -lnvpair \
- 	-lbsdxml -lgeom -lnvpair -lz -lzfs_core
- 
++	-lgeom -lnvpair -lz -lzfs_core
++
 +LDADD+= -lbsd -lm -luutil -lnvpair -lgeom
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs_core
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
-+
+ 
  SRCS=	deviceid.c \
  	fsshare.c \
- 	mkdirp.c \
 --- a/cddl/lib/libzpool/Makefile
 +++ b/cddl/lib/libzpool/Makefile
 @@ -58,7 +58,11 @@