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

[Aurelien Jarno]

Author: aurel32
Date: 2011-04-22 15:32:33 +0000 (Fri, 22 Apr 2011)
New Revision: 3288

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/patches/05_makefile.diff
Log:
  * Fix build with recent binutils versions.



Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-04-01 12:02:11 UTC (rev 3287)
+++ trunk/zfsutils/debian/changelog	2011-04-22 15:32:33 UTC (rev 3288)
@@ -6,8 +6,11 @@
   [ Robert Millan ]
   * Fix bootloader advice to give instructions on upgrading GRUB.
 
- -- Robert Millan <rmh at debian.org>  Wed, 23 Feb 2011 11:32:17 +0100
+  [ Aurelien Jarno ]
+  * Fix build with recent binutils versions.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Fri, 22 Apr 2011 17:29:09 +0200
+
 zfsutils (8.1-4) unstable; urgency=low
 
   * Create a /boot/zfs/ directory in zfsutils-udeb, so that zpool.cache

Modified: trunk/zfsutils/debian/patches/05_makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/05_makefile.diff	2011-04-01 12:02:11 UTC (rev 3287)
+++ trunk/zfsutils/debian/patches/05_makefile.diff	2011-04-22 15:32:33 UTC (rev 3288)
@@ -34,7 +34,7 @@
 -	-lm -lnvpair -luutil -lutil
 +DPADD=	${LIBZFS} ${LIBGEOM} \
 +	${LIBM} ${LIBNVPAIR} ${LIBUUTIL}
-+LDADD=	-lzfs -lgeom -lnvpair -luutil
++LDADD=	-lzfs -lgeom -lnvpair -luutil -lbsd
 +
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
 +       -L${.CURDIR}/../../../cddl/lib/libnvpair \
@@ -53,7 +53,7 @@
 -LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
 -	-lm -lnvpair -luutil -lutil
 +DPADD=	${LIBZFS} ${LIBGEOM} ${LIBNVPAIR} ${LIBUUTIL}
-+LDADD=	-lzfs -lgeom -lnvpair -luutil
++LDADD=	-lzfs -lgeom -lnvpair -luutil -lbsd
 +LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
 +	-L${.CURDIR}/../../../cddl/lib/libnvpair \
 +	-L${.CURDIR}/../../../cddl/lib/libuutil