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

[Aurelien Jarno]

Author: aurel32
Date: 2010-07-29 18:52:32 +0000 (Thu, 29 Jul 2010)
New Revision: 3114

Modified:
   trunk/zfsutils/debian/patches/03_glibc_namespace.diff
   trunk/zfsutils/debian/patches/08_libbsd.diff
   trunk/zfsutils/debian/rules
Log:
Kill a few more warnings


Modified: trunk/zfsutils/debian/patches/03_glibc_namespace.diff
===================================================================
--- trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2010-07-29 18:16:30 UTC (rev 3113)
+++ trunk/zfsutils/debian/patches/03_glibc_namespace.diff	2010-07-29 18:52:32 UTC (rev 3114)
@@ -14,6 +14,14 @@
 diff -ur -x debian a/cddl/compat/opensolaris/misc/fsshare.c b/cddl/compat/opensolaris/misc/fsshare.c
 --- a/cddl/compat/opensolaris/misc/fsshare.c	2008-03-28 18:16:18.000000000 -0400
 +++ b/cddl/compat/opensolaris/misc/fsshare.c	2010-07-27 20:09:52.789492219 -0400
+@@ -28,6 +28,7 @@
+ __FBSDID("$FreeBSD$");
+ 
+ #include <sys/param.h>
++#include <sys/file.h>
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <fcntl.h>
 @@ -67,7 +67,7 @@
   * mountpoint specified in the 'skip' argument.
   */
@@ -35,6 +43,14 @@
 diff -ur -x debian a/cddl/compat/opensolaris/misc/mnttab.c b/cddl/compat/opensolaris/misc/mnttab.c
 --- a/cddl/compat/opensolaris/misc/mnttab.c	2008-11-17 15:49:29.000000000 -0500
 +++ b/cddl/compat/opensolaris/misc/mnttab.c	2010-07-27 20:09:52.790512709 -0400
+@@ -36,6 +36,7 @@
+ #include <sys/mount.h>
+ #include <sys/mntent.h>
+ #include <sys/mnttab.h>
++#include <ctype.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
 @@ -63,7 +63,7 @@
  }
  

Modified: trunk/zfsutils/debian/patches/08_libbsd.diff
===================================================================
--- trunk/zfsutils/debian/patches/08_libbsd.diff	2010-07-29 18:16:30 UTC (rev 3113)
+++ trunk/zfsutils/debian/patches/08_libbsd.diff	2010-07-29 18:52:32 UTC (rev 3114)
@@ -129,3 +129,13 @@
  
  #include <libzfs.h>
  
+--- a/cddl/compat/opensolaris/misc/fsshare.c
++++ b/cddl/compat/opensolaris/misc/fsshare.c
+@@ -36,6 +36,7 @@
+ #include <libutil.h>
+ #include <assert.h>
+ #include <fsshare.h>
++#include <bsd/string.h>
+ 
+ #define	FILE_HEADER	"# !!! DO NOT EDIT THIS FILE MANUALLY !!!\n\n"
+ #define	OPTSSIZE	1024

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2010-07-29 18:16:30 UTC (rev 3113)
+++ trunk/zfsutils/debian/rules	2010-07-29 18:52:32 UTC (rev 3114)
@@ -9,7 +9,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -D'__FBSDID(string)=' -D__va_list=__builtin_va_list -include bsd/string.h
+CFLAGS = -Wall -Wno-unknown-pragmas -g -pipe -fPIC -I. -D_GNU_SOURCE -DNEED_SOLARIS_BOOLEAN -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
 
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0