[Glibc-bsd-commits] r3485 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-06-26 15:15:27 +0000 (Sun, 26 Jun 2011)
New Revision: 3485

Added:
   trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
  * 14_sbuf_page_size.diff: PAGE_SIZE is not available on all
    platforms (fixes FTBFS on armel, ia64, powerpc, sparc).

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-06-26 15:12:45 UTC (rev 3484)
+++ trunk/freebsd-libs/debian/changelog	2011-06-26 15:15:27 UTC (rev 3485)
@@ -4,6 +4,8 @@
     (Closes: #631544)
   * Build-Depend on libbsd-dev everywhere, not just [kfreebsd-any]
     (fixes FTBFS on non-kFreeBSD).
+  * 14_sbuf_page_size.diff: PAGE_SIZE is not available on all
+    platforms (fixes FTBFS on armel, ia64, powerpc, sparc).
 
  -- Robert Millan <rmh at debian.org>  Sun, 26 Jun 2011 17:11:53 +0200
 

Added: trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/14_sbuf_page_size.diff	2011-06-26 15:15:27 UTC (rev 3485)
@@ -0,0 +1,17 @@
+
+Fixes FTBFS on armel, ia64, powerpc, sparc.
+
+--- a/sys/kern/subr_sbuf.c
++++ b/sys/kern/subr_sbuf.c
+@@ -77,6 +77,11 @@
+ #define	SBUF_SETFLAG(s, f)	do { (s)->s_flags |= (f); } while (0)
+ #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
+ 
++#if !defined(PAGE_SIZE) && !defined(_KERNEL)
++#include <unistd.h>
++#define PAGE_SIZE		sysconf(_SC_PAGESIZE)
++#endif
++
+ #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
+ #define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
+ #define	SBUF_MAXEXTENDINCR	PAGE_SIZE

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2011-06-26 15:12:45 UTC (rev 3484)
+++ trunk/freebsd-libs/debian/patches/series	2011-06-26 15:15:27 UTC (rev 3485)
@@ -11,3 +11,4 @@
 11_netgraph.diff
 12_usb.diff
 13_jail.diff
+14_sbuf_page_size.diff