[Glibc-bsd-commits] r2238 - in trunk/freebsd-buildutils: . debian debian/patches

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-07-12 14:01:27 +0000 (Sat, 12 Jul 2008)
New Revision: 2238

Modified:
   trunk/freebsd-buildutils/debian/patches/14_config.diff
   trunk/freebsd-buildutils/debian/rules
   trunk/freebsd-buildutils/fetch
Log:
* use also private <sys/sbuf.h>
  it should suffice for building freebsd-buildutils on linux



Modified: trunk/freebsd-buildutils/debian/patches/14_config.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/14_config.diff	2008-07-12 13:19:42 UTC (rev 2237)
+++ trunk/freebsd-buildutils/debian/patches/14_config.diff	2008-07-12 14:01:27 UTC (rev 2238)
@@ -1,3 +1,41 @@
+diff -u src/sys/sys/sbuf.h src/sys/sys/sbuf.h
+--- src/sys/sys/sbuf.h
++++ src/sys/sys/sbuf.h
+@@ -31,7 +31,8 @@
+ #ifndef _SYS_SBUF_H_
+ #define	_SYS_SBUF_H_
+ 
+-#include <sys/_types.h>
++#include <stdarg.h>
++#include <sys/types.h>
+ 
+ /*
+  * Structure definition
+@@ -63,8 +63,8 @@
+ int		 sbuf_bcpy(struct sbuf *, const void *, size_t);
+ int		 sbuf_cat(struct sbuf *, const char *);
+ int		 sbuf_cpy(struct sbuf *, const char *);
+-int		 sbuf_printf(struct sbuf *, const char *, ...) __printflike(2, 3);
+-int		 sbuf_vprintf(struct sbuf *, const char *, __va_list) __printflike(2, 0);
++int		 sbuf_printf(struct sbuf *, const char *, ...);
++int		 sbuf_vprintf(struct sbuf *, const char *, va_list);
+ int		 sbuf_putc(struct sbuf *, int);
+ int		 sbuf_trim(struct sbuf *);
+ int		 sbuf_overflowed(struct sbuf *);
+diff -u src/sys/kern/subr_sbuf.c src/sys/kern/subr_sbuf.c
+--- src/sys/kern/subr_sbuf.c
++++ src/sys/kern/subr_sbuf.c
+@@ -76,8 +76,8 @@
+ #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
+ 
+ #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
+-#define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
+-#define	SBUF_MAXEXTENDINCR	PAGE_SIZE
++#define	SBUF_MAXEXTENDSIZE	4096
++#define	SBUF_MAXEXTENDINCR	SBUF_MAXEXTENDSIZE
+ 
+ /*
+  * Debugging support
 diff -u src/usr.sbin/config/Makefile src/usr.sbin/config/Makefile
 --- src/usr.sbin/config/Makefile
 +++ src/usr.sbin/config/Makefile

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2008-07-12 13:19:42 UTC (rev 2237)
+++ trunk/freebsd-buildutils/debian/rules	2008-07-12 14:01:27 UTC (rev 2238)
@@ -12,7 +12,7 @@
 DEB_HOST_ARCH_CPU	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 PMAKE=pmake
-CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE
+CFLAGS=-O2 -g -Wall -DMACHINE_ARCH='"$(DEB_HOST_ARCH_CPU)"' -D_GNU_SOURCE -I$(CURDIR)/build-tree/src/sys
 MAKE_BUILD_FLAGS= CC=gcc NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO
 YACC=$(CURDIR)/build-tree/src/usr.bin/yacc/yacc
 export LDADD=-lbsd

Modified: trunk/freebsd-buildutils/fetch
===================================================================
--- trunk/freebsd-buildutils/fetch	2008-07-12 13:19:42 UTC (rev 2237)
+++ trunk/freebsd-buildutils/fetch	2008-07-12 14:01:27 UTC (rev 2238)
@@ -29,6 +29,7 @@
     src/usr.sbin/config \
     src/usr.sbin/kgzip \
     src/usr.sbin/mtree \
+    src/sys/sys/sbuf.h \
     src/sys/kern/subr_sbuf.c \
   ; do
   cvs -d $ANONCVS ${action} -r $RELENG $i