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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-03-05 20:48:33 +0000 (Sat, 05 Mar 2016)
New Revision: 5925

Added:
   trunk/freebsd-libs/debian/patches/subr_prf.diff
Removed:
   trunk/freebsd-libs/debian/patches/sys_ctype.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
Also don't include machine/stdarg.h


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2016-03-05 20:20:21 UTC (rev 5924)
+++ trunk/freebsd-libs/debian/changelog	2016-03-05 20:48:33 UTC (rev 5925)
@@ -1,8 +1,8 @@
 freebsd-libs (10.3~svn296373-2) UNRELEASED; urgency=medium
 
-  * Don't include sys/ctype.h kernel header;  fixes FTBFS on non-
-    kfreebsd arches.
-      - sys_ctype.diff
+  * Avoid including kernel headers on non-kfreebsd arches,
+    sys/ctype.h and machine/stdarg.h in sys/kern/subr_prf.c
+      - subr_prf.diff
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 20:17:57 +0000
 

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2016-03-05 20:20:21 UTC (rev 5924)
+++ trunk/freebsd-libs/debian/patches/series	2016-03-05 20:48:33 UTC (rev 5925)
@@ -32,4 +32,4 @@
 libusb_reported_version.diff
 libusb_set_auto_detach_kernel_driver.diff
 pkgconfig_dir.diff
-sys_ctype.diff
+subr_prf.diff

Added: trunk/freebsd-libs/debian/patches/subr_prf.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/subr_prf.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/subr_prf.diff	2016-03-05 20:48:33 UTC (rev 5925)
@@ -0,0 +1,12 @@
+--- a/sys/kern/subr_prf.c
++++ b/sys/kern/subr_prf.c
+@@ -60,8 +60,8 @@
+ #include <sys/syslog.h>
+ #include <sys/cons.h>
+ #include <sys/uio.h>
+-#endif
+ #include <sys/ctype.h>
++#endif
+ #include <sys/sbuf.h>
+ 
+ #ifdef DDB

Deleted: trunk/freebsd-libs/debian/patches/sys_ctype.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/sys_ctype.diff	2016-03-05 20:20:21 UTC (rev 5924)
+++ trunk/freebsd-libs/debian/patches/sys_ctype.diff	2016-03-05 20:48:33 UTC (rev 5925)
@@ -1,12 +0,0 @@
---- a/sys/kern/subr_prf.c
-+++ b/sys/kern/subr_prf.c
-@@ -60,8 +60,8 @@
- #include <sys/syslog.h>
- #include <sys/cons.h>
- #include <sys/uio.h>
--#endif
- #include <sys/ctype.h>
-+#endif
- #include <sys/sbuf.h>
- 
- #ifdef DDB