[Glibc-bsd-commits] r5144 - in trunk/kfreebsd-kernel-headers/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-20 13:42:14 +0000 (St, 20 lis 2013)
New Revision: 5144

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/install
   trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Add <sys/signal.h> (in alternate kglue directory), and use it internally instead of the userland version.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2013-11-20 13:41:12 UTC (rev 5143)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2013-11-20 13:42:14 UTC (rev 5144)
@@ -6,6 +6,8 @@
   [ Robert Millan ]
   * Add <sys/mac.h>.
   * Add <sys/stdint.h> (as #include stub).
+  * Add <sys/signal.h> (in alternate kglue directory), and use it
+    internally instead of the userland version.
 
  -- Robert Millan <rmh at debian.org>  Fri, 01 Nov 2013 14:10:16 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install	2013-11-20 13:41:12 UTC (rev 5143)
+++ trunk/kfreebsd-kernel-headers/debian/install	2013-11-20 13:42:14 UTC (rev 5144)
@@ -292,6 +292,7 @@
 sys/sys/sdt.h                           usr/include/sys
 sys/sys/selinfo.h                       usr/include/sys
 sys/sys/sigio.h                         usr/include/sys
+sys/sys/signal.h			usr/include/sys/kglue/sys
 sys/sys/signalvar.h                     usr/include/sys
 sys/sys/snoop.h                         usr/include/sys
 sys/sys/socket.h			usr/include/sys/kglue/sys

Modified: trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff	2013-11-20 13:41:12 UTC (rev 5143)
+++ trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff	2013-11-20 13:42:14 UTC (rev 5144)
@@ -77,3 +77,26 @@
  
  #endif /* __BSD_VISIBLE */
  
+--- a/sys/sys/signal.h
++++ b/sys/sys/signal.h
+@@ -45,6 +45,13 @@
+ #include <machine/_limits.h>	/* __MINSIGSTKSZ */
+ #include <machine/signal.h>	/* sig_atomic_t; trap codes; sigcontext */
+ 
++/* For now just disable everything except the implicit includes.
++   TODO: We might want to enable some things below, as long as they don't
++   collide with GNU version of <sys/signal.h>.  */
++#ifdef __GLIBC__
++#include <sys/signal.h>
++#else
++
+ /*
+  * System defined signals.
+  */
+@@ -440,4 +447,6 @@
+ __sighandler_t *signal(int, __sighandler_t *);
+ __END_DECLS
+ 
++#endif
++
+ #endif /* !_SYS_SIGNAL_H_ */

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2013-11-20 13:41:12 UTC (rev 5143)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2013-11-20 13:42:14 UTC (rev 5144)
@@ -76,6 +76,7 @@
 		-e 's/#\s*include\s\+<sys\/types\.h>\s*/#include <sys\/kglue\/sys\/types.h>/g' \
 		-e 's/#\s*include\s\+<sys\/time\.h>\s*/#include <sys\/kglue\/sys\/time.h>/g' \
 		-e 's/#\s*include\s\+<sys\/param\.h>\s*/#include <sys\/kglue\/sys\/param.h>/g' \
+		-e 's/#\s*include\s\+<sys\/signal\.h>\s*/#include <sys\/kglue\/sys\/signal.h>/g' \
 		-e 's/#\s*include\s\+<sys\/queue\.h>\s*/#include <sys\/kglue\/sys\/queue.h>/g' \
 		-e 's/#\s*include\s\+<netinet\/if_ether\.h>\s*/#include <sys\/kglue\/netinet\/if_ether.h>/g' \
 		-e 's/#\s*include\s\+<sys\/_termios\.h>\s*/#include <sys\/termios.h>/g' \