[Glibc-bsd-commits] r3781 - in trunk/zfsutils/debian: . patches
Robert Millan
rmh at alioth.debian.org
Thu Oct 27 22:49:35 UTC 2011
Author: rmh
Date: 2011-10-27 22:49:35 +0000 (Thu, 27 Oct 2011)
New Revision: 3781
Added:
trunk/zfsutils/debian/patches/libmd_static.diff
Modified:
trunk/zfsutils/debian/changelog
trunk/zfsutils/debian/control
trunk/zfsutils/debian/patches/04_stdint.diff
trunk/zfsutils/debian/patches/series
trunk/zfsutils/debian/rules
Log:
Link libmd statically untill a proper libmd package is available.
Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog 2011-10-27 22:37:39 UTC (rev 3780)
+++ trunk/zfsutils/debian/changelog 2011-10-27 22:49:35 UTC (rev 3781)
@@ -20,8 +20,9 @@
* Improve package descriptions.
* Add Breaks on GRUB versions that don't support ZFS v28. Also improve
documentation of this issue in 14_bootloader_advice.diff.
+ * Link libmd statically untill a proper libmd package is available.
- -- Robert Millan <rmh at debian.org> Sat, 22 Oct 2011 11:07:09 +0200
+ -- Robert Millan <rmh at debian.org> Fri, 28 Oct 2011 00:49:03 +0200
zfsutils (8.2-4) unstable; urgency=high
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2011-10-27 22:37:39 UTC (rev 3780)
+++ trunk/zfsutils/debian/control 2011-10-27 22:49:35 UTC (rev 3781)
@@ -5,7 +5,7 @@
Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>
Build-Depends: debhelper (>= 7.0.50~), freebsd-buildutils, libbsd-dev (>= 0.1.4),
libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev,
- zlib1g-dev, libmd-dev
+ zlib1g-dev
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/zfsutils/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/zfsutils/
Standards-Version: 3.9.2
Modified: trunk/zfsutils/debian/patches/04_stdint.diff
===================================================================
--- trunk/zfsutils/debian/patches/04_stdint.diff 2011-10-27 22:37:39 UTC (rev 3780)
+++ trunk/zfsutils/debian/patches/04_stdint.diff 2011-10-27 22:49:35 UTC (rev 3781)
@@ -37,3 +37,15 @@
#include <sys/note.h>
#include <sys/kernel.h>
#include <sys/debug.h>
+--- a/lib/libmd/sha256.h
++++ b/lib/libmd/sha256.h
+@@ -30,6 +30,9 @@
+ #define _SHA256_H_
+
+ #include <sys/types.h>
++#ifdef __GLIBC__
++#include <stdint.h>
++#endif
+
+ typedef struct SHA256Context {
+ uint32_t state[8];
Added: trunk/zfsutils/debian/patches/libmd_static.diff
===================================================================
--- trunk/zfsutils/debian/patches/libmd_static.diff (rev 0)
+++ trunk/zfsutils/debian/patches/libmd_static.diff 2011-10-27 22:49:35 UTC (rev 3781)
@@ -0,0 +1,43 @@
+--- a/cddl/lib/libzfs/Makefile
++++ b/cddl/lib/libzfs/Makefile
+@@ -7,12 +7,13 @@
+
+ LIB= zfs
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
+-LDADD= -lmd -lpthread -lumem -lnvpair -luutil -lgeom -lm -lbsd
++LDADD= -lpthread -lumem -lnvpair -luutil -lgeom -lm -lbsd
+
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libuutil
+ LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
++LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
+
+ SRCS= deviceid.c \
+ fsshare.c \
+@@ -57,5 +58,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/libmd
+
+ .include <bsd.lib.mk>
+--- a/cddl/lib/libzpool/Makefile
++++ b/cddl/lib/libzpool/Makefile
+@@ -54,13 +54,15 @@
+ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread
+ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
+ CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_ARCH}/include
++CFLAGS+= -I${.CURDIR}/../../../lib/libmd
+
+ DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ}
+-LDADD= -lmd -lpthread -lz -lumem -lnvpair -lbsd -lrt
++LDADD= -lpthread -lz -lumem -lnvpair -lbsd -lrt
+
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libumem
+ LDADD+= -L${.CURDIR}/../../../cddl/lib/libnvpair
+ LDADD+= ${.CURDIR}/../../../cddl/lib/libavl/libavl.a
++LDADD+= ${.CURDIR}/../../../lib/libmd/libmd.a
+
+ # atomic.S doesn't like profiling.
+ NO_PROFILE=
Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series 2011-10-27 22:37:39 UTC (rev 3780)
+++ trunk/zfsutils/debian/patches/series 2011-10-27 22:49:35 UTC (rev 3781)
@@ -20,3 +20,4 @@
# Debian-specific
makefile.diff
manpage_debian_specifics.diff
+libmd_static.diff
Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules 2011-10-27 22:37:39 UTC (rev 3780)
+++ trunk/zfsutils/debian/rules 2011-10-27 22:49:35 UTC (rev 3781)
@@ -59,6 +59,7 @@
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 \
@@ -81,7 +82,7 @@
build: build-arch build-indep
-build-arch: build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
+build-arch: build-libmd build-libuutil build-libnvpair build-libzfs build-libumem build-libzpool build-zfsutils build-libavl
build-indep:
# We have nothing to do by default.
@@ -109,10 +110,15 @@
touch $@
build-libzfs: build-libzfs-stamp
-build-libzfs-stamp: build-libnvpair-stamp build-libuutil-stamp build-libumem-stamp build-libavl-stamp
+build-libzfs-stamp: build-libnvpair-stamp build-libuutil-stamp build-libumem-stamp build-libavl-stamp build-libmd-stamp
$(PMAKE) -C $(CURDIR)/cddl/lib/libzfs
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
@@ -146,6 +152,7 @@
$(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
More information about the Glibc-bsd-commits
mailing list