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

[Robert Millan]

Author: rmh
Date: 2013-08-04 16:29:48 +0000 (Sun, 04 Aug 2013)
New Revision: 4863

Added:
   trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/patches/03_glibc_namespace.diff
   trunk/zfsutils/debian/patches/series
   trunk/zfsutils/debian/rules
Log:
  * Build with -Werror=implicit-function-declaration.
    - Requires freebsd-glue >= 0.1.1.
    - fix_implicit_warnx_declaration.diff: Cherry-pick from HEAD.
    - 03_glibc_namespace.diff: Extend solaris_hasmntopt kludge.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2013-08-04 16:24:16 UTC (rev 4862)
+++ trunk/zfsutils/debian/changelog	2013-08-04 16:29:48 UTC (rev 4863)
@@ -1,3 +1,12 @@
+zfsutils (9.1-3) UNRELEASED; urgency=low
+
+  * Build with -Werror=implicit-function-declaration.
+    - Requires freebsd-glue >= 0.1.1.
+    - fix_implicit_warnx_declaration.diff: Cherry-pick from HEAD.
+    - 03_glibc_namespace.diff: Extend solaris_hasmntopt kludge.
+
+ -- Robert Millan <rmh at debian.org>  Sun, 04 Aug 2013 18:28:11 +0200
+
 zfsutils (9.1-2) unstable; urgency=low
 
   * Reupload.

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2013-08-04 16:24:16 UTC (rev 4862)
+++ trunk/zfsutils/debian/control	2013-08-04 16:29:48 UTC (rev 4863)
@@ -10,7 +10,7 @@
  kfreebsd-kernel-headers (>= 9.1-2~),
  libgeom-dev,
  zlib1g-dev,
- freebsd-glue (>= 0.0.7~),
+ freebsd-glue (>= 0.1.1~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/zfsutils/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/zfsutils/
 Standards-Version: 3.9.3

Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2013-08-04 16:24:16 UTC (rev 4862)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2013-08-04 16:29:48 UTC (rev 4863)
@@ -102,3 +102,14 @@
  	ssize_t		start_resid = uio->uio_resid;
  	ssize_t		tx_bytes;
  	uint64_t	end_size;
+--- a/cddl/compat/opensolaris/include/mnttab.h
++++ b/cddl/compat/opensolaris/include/mnttab.h
+@@ -28,6 +28,8 @@
+ 
+ int getmntany(FILE *fd, struct mnttab *mgetp, struct mnttab *mrefp);
+ int getmntent(FILE *fp, struct mnttab *mp);
++
++#define hasmntopt solaris_hasmntopt
+ char *hasmntopt(struct mnttab *mnt, char *opt);
+ 
+ void statfs2mnttab(struct statfs *sfs, struct mnttab *mp);

Added: trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff
===================================================================
--- trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff	                        (rev 0)
+++ trunk/zfsutils/debian/patches/fix_implicit_warnx_declaration.diff	2013-08-04 16:29:48 UTC (rev 4863)
@@ -0,0 +1,13 @@
+
+From SVN rev 253930
+
+--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
++++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+@@ -56,6 +56,7 @@
+ #include <sys/fs/zfs.h>
+ #include <sys/types.h>
+ #include <time.h>
++#include <err.h>
+ 
+ #include <libzfs.h>
+ #include <zfs_prop.h>

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2013-08-04 16:24:16 UTC (rev 4862)
+++ trunk/zfsutils/debian/patches/series	2013-08-04 16:29:48 UTC (rev 4863)
@@ -1,5 +1,6 @@
 # Patches from (or merged in) upstream
 12_freebsd.diff
+fix_implicit_warnx_declaration.diff
 
 # Mergeable material
 gratuitous_dependencies.diff

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2013-08-04 16:24:16 UTC (rev 4862)
+++ trunk/zfsutils/debian/rules	2013-08-04 16:29:48 UTC (rev 4863)
@@ -12,7 +12,8 @@
 CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. \
          -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN \
 	-isystem /usr/include/freebsd \
-	-D__va_list=__builtin_va_list
+	-Werror=implicit-function-declaration \
+	$(NULL)
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0