Bug#678136: zfsutils: FTBFS with libbsd-dev >= 0.4.0
Package: zfsutils
Version: 9.0-2
Severity: serious
Tags: wheezy sid
User: debian-bsd@lists.debian.org
Usertags: kfreebsd
X-Debbugs-Cc: debian-bsd@lists.debian.org
Justification: fails to build from source (but built successfully in the
past)
Hi,
Due to libbsd-dev 0.4.0 moving libutil.h into /bsd/, zfsutils can no
longer build. Attached patch would be a way to fix that but I wasn't
sure if there could be a better way.
Then there are other issues during build which I don't have time to look
into just yet:
> cc -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -isystem /usr/include/freebsd -D__va_list=__builtin_va_list -O2 -DZFS_NO_ACL -I/h[10/1964]
> n/zfsutils-9.0/cddl/lib/libzfs/../../../sbin/mount -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/lib/libumem -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys
> /cddl/compat/opensolaris -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/compat/opensolaris/include -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/compat/op
> ensolaris/lib/libumem -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzpool/common -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/
> cddl/contrib/opensolaris/common/zfs -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs -I/home/steven/zfsutils-9.0/cddl/lib/libz
> fs/../../../sys/cddl/contrib/opensolaris/uts/common/sys -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/head -I/home/steven/zfsutils-9.0/cddl/lib/l
> ibzfs/../../../sys/cddl/contrib/opensolaris/uts/common -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libnvpair -I/home/steven/zfsutils-9.0/cd
> dl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libuutil/common -I/home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/contrib/opensolaris/lib/libzfs/common -I/home/steve
> n/zfsutils-9.0/cddl/lib/libzfs/../../../lib/libmd -std=iso9899:1999 -fstack-protector -Wno-pointer-sign -c /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/compat/opensol
> aris/misc/deviceid.c
> In file included from /usr/include/sys/kern/types.h:48:0,
> from /usr/include/sys/kern/param.h:67,
> from /usr/include/osreldate.h:1,
> from /usr/include/i386-kfreebsd-gnu/sys/param.h:39,
> from /usr/include/freebsd/sys/param.h:1,
> from /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/param.h:33,
> from /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../cddl/compat/opensolaris/misc/deviceid.c:30:
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:49:1: error: unknown type name ‘u_int’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:50:1: error: unknown type name ‘u_char’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:51:1: error: unknown type name ‘u_short’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:52:1: error: unknown type name ‘u_long’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:55:1: error: unknown type name ‘off_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:56:1: error: unknown type name ‘id_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:57:1: error: unknown type name ‘id_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:58:1: error: unknown type name ‘id_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:59:1: error: unknown type name ‘id_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:60:1: error: unknown type name ‘id_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:61:1: error: unknown type name ‘mode_t’
> /home/steven/zfsutils-9.0/cddl/lib/libzfs/../../../sys/cddl/compat/opensolaris/sys/types.h:63:1: error: unknown type name ‘u_int’
Regards,
--
Steven Chamberlain
steven@pyro.eu.org
Index: debian/control
===================================================================
--- debian/control (revision 4319)
+++ debian/control (working copy)
@@ -6,7 +6,7 @@
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
freebsd-buildutils (>= 9.0-5~),
- libbsd-dev (>= 0.1.4),
+ libbsd-dev (>= 0.3.0),
libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51),
libgeom-dev,
zlib1g-dev
Index: debian/patches/08_libbsd.diff
===================================================================
--- debian/patches/08_libbsd.diff (revision 4319)
+++ debian/patches/08_libbsd.diff (working copy)
@@ -48,6 +48,17 @@
int
devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name)
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
+@@ -34,7 +34,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <fsshare.h>
+-#include <libutil.h>
++#include <bsd/libutil.h>
+ #include <signal.h>
+ #include <stdio.h>
+ #include <string.h>
--- a/cddl/compat/opensolaris/misc/mnttab.c
+++ b/cddl/compat/opensolaris/misc/mnttab.c
@@ -42,6 +42,7 @@
Reply to: