[Glibc-bsd-commits] r3782 - trunk/zfsutils/debian/patches
Robert Millan
rmh at alioth.debian.org
Thu Oct 27 23:31:01 UTC 2011
Author: rmh
Date: 2011-10-27 23:31:01 +0000 (Thu, 27 Oct 2011)
New Revision: 3782
Modified:
trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
trunk/zfsutils/debian/patches/makefile.diff
Log:
-lumem wasn't so gratuitous, fix that
Modified: trunk/zfsutils/debian/patches/gratuitous_dependencies.diff
===================================================================
--- trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2011-10-27 22:49:35 UTC (rev 3781)
+++ trunk/zfsutils/debian/patches/gratuitous_dependencies.diff 2011-10-27 23:31:01 UTC (rev 3782)
@@ -27,7 +27,7 @@
DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -lutil -luutil -lzfs
++LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>
--- a/cddl/sbin/zpool/Makefile
@@ -37,7 +37,7 @@
DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
-+LDADD= -lavl -lgeom -lnvpair -lutil -luutil -lzfs
++LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>
--- a/cddl/usr.bin/zinject/Makefile
Modified: trunk/zfsutils/debian/patches/makefile.diff
===================================================================
--- trunk/zfsutils/debian/patches/makefile.diff 2011-10-27 22:49:35 UTC (rev 3781)
+++ trunk/zfsutils/debian/patches/makefile.diff 2011-10-27 23:31:01 UTC (rev 3782)
@@ -42,31 +42,34 @@
NO_PROFILE=
--- a/cddl/sbin/zfs/Makefile
+++ b/cddl/sbin/zfs/Makefile
-@@ -22,6 +22,10 @@
+@@ -22,6 +22,12 @@
DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lgeom -lnvpair -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -luutil -lzfs -lbsd
+-LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
++LDADD= -lgeom -lnvpair -lumem -luutil -lzfs -lbsd
+
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++
.include <bsd.prog.mk>
--- a/cddl/sbin/zpool/Makefile
+++ b/cddl/sbin/zpool/Makefile
-@@ -27,6 +27,11 @@
+@@ -27,6 +27,12 @@
DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
--LDADD= -lavl -lgeom -lnvpair -lutil -luutil -lzfs
-+LDADD= -lgeom -lnvpair -luutil -lzfs -lbsd
+-LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
++LDADD= -lgeom -lnvpair -lumem -luutil -lzfs -lbsd
+
-+LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs \
-+ -L${.CURDIR}/../../../cddl/lib/libnvpair \
-+ -L${.CURDIR}/../../../cddl/lib/libuutil \
-+ ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libzfs
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
++LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
++LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
.include <bsd.prog.mk>
--- a/cddl/usr.bin/zinject/Makefile
More information about the Glibc-bsd-commits
mailing list