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

[Petr Salinger]

Author: ps-guest
Date: 2010-07-29 05:43:52 +0000 (Thu, 29 Jul 2010)
New Revision: 3103

Modified:
   trunk/zfsutils/debian/patches/01_glibc_kludge.diff
   trunk/zfsutils/debian/rules
Log:
small cleanup


Modified: trunk/zfsutils/debian/patches/01_glibc_kludge.diff
===================================================================
--- trunk/zfsutils/debian/patches/01_glibc_kludge.diff	2010-07-29 03:14:59 UTC (rev 3102)
+++ trunk/zfsutils/debian/patches/01_glibc_kludge.diff	2010-07-29 05:43:52 UTC (rev 3103)
@@ -23,18 +23,6 @@
  	build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
  	    (size_t)-1);
  	build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
-diff -ur -x debian a/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c b/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c
---- a/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c	2008-03-28 18:16:18.000000000 -0400
-+++ b/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c	2010-07-27 20:07:02.660028620 -0400
-@@ -31,7 +31,7 @@
- #include <libintl.h>
- #include <limits.h>
- #include <string.h>
--#include <stdlib.h>
-+#include </usr/include/stdlib.h>
- #include <stdarg.h>
- #include <stdio.h>
- #include <errno.h>
 diff -ur -x debian a/sys/cddl/compat/opensolaris/rpc/xdr.h b/sys/cddl/compat/opensolaris/rpc/xdr.h
 --- a/sys/cddl/compat/opensolaris/rpc/xdr.h	2009-08-19 20:08:58.000000000 -0400
 +++ b/sys/cddl/compat/opensolaris/rpc/xdr.h	2010-07-27 20:07:02.661041790 -0400
@@ -71,26 +59,3 @@
  
  #include <assert.h>
  
-diff -ur -x debian a/sys/cddl/compat/opensolaris/sys/types.h b/sys/cddl/compat/opensolaris/sys/types.h
---- a/sys/cddl/compat/opensolaris/sys/types.h	2008-11-17 15:49:29.000000000 -0500
-+++ b/sys/cddl/compat/opensolaris/sys/types.h	2010-07-27 20:07:02.662057600 -0400
-@@ -66,7 +66,7 @@
- typedef	int		major_t;
- 
- #else
--#ifdef NEED_SOLARIS_BOOLEAN
-+#if 1 //def NEED_SOLARIS_BOOLEAN
- #if defined(__XOPEN_OR_POSIX)
- typedef enum { _B_FALSE, _B_TRUE }	boolean_t;
- #else
-diff -ur -x debian a/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h b/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
---- a/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h	2008-05-22 03:33:39.000000000 -0400
-+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h	2010-07-27 20:07:02.664079110 -0400
-@@ -34,6 +34,7 @@
- #pragma ident	"%Z%%M%	%I%	%E% SMI"
- 
- #include <sys/types.h>
-+//#include_next <sys/debug.h>
- 
- #ifdef	__cplusplus
- extern "C" {

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2010-07-29 03:14:59 UTC (rev 3102)
+++ trunk/zfsutils/debian/rules	2010-07-29 05:43:52 UTC (rev 3103)
@@ -9,7 +9,7 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-CFLAGS = -Wall -g -pipe -fPIC -I. -D_GNU_SOURCE -D'__FBSDID(string)=' -D__va_list=__builtin_va_list
+CFLAGS = -Wall -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
@@ -18,7 +18,7 @@
 endif
 
 VERSION=$(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
-SVN=svn://svn.freebsd.org/base/release/$(VERSION).0
+SVN=http://svn.freebsd.org/base/release/$(VERSION).0
 ORIGDIR=zfsutils-$(VERSION)
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
@@ -50,6 +50,7 @@
 	         ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
+	rm -f $(ORIGDIR)/cddl/compat/opensolaris/include/stdlib.h
 	tar -czf ../zfsutils_$(VERSION).orig.tar.gz $(ORIGDIR)
 	rm -rf $(ORIGDIR)
 
@@ -94,6 +95,7 @@
 	$(PMAKE) -C $(CURDIR)/cddl/sbin/zfs clean
 	
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -f cddl/compat/opensolaris/include/stdlib.h
 	rm -rf .pc
 	rm -f *stamp
 	dh_clean