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

[Robert Millan]

Author: rmh
Date: 2012-01-25 20:38:31 +0000 (Wed, 25 Jan 2012)
New Revision: 4006

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
   trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
   trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
   trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
   trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Check for <sys/cdefs.h> using _SYS_CDEFS_H instead of _SYS_CDEFS_H_.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-01-25 20:38:31 UTC (rev 4006)
@@ -2,8 +2,9 @@
 
   * Install geom/raid/*.h.
   * s/time_t/__time_t/ in struct bintime.
+  * Check for <sys/cdefs.h> using _SYS_CDEFS_H instead of _SYS_CDEFS_H_.
 
- -- Robert Millan <rmh at debian.org>  Tue, 24 Jan 2012 11:59:17 +0100
+ -- Robert Millan <rmh at debian.org>  Wed, 25 Jan 2012 21:38:15 +0100
 
 kfreebsd-kernel-headers (0.66) unstable; urgency=low
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff	2012-01-25 20:38:31 UTC (rev 4006)
@@ -9,7 +9,7 @@
 +/* kFreeBSD 8.0 headers */
 +
 +#include <sys/cdefs.h>
-+#ifndef _SYS_CDEFS_H_
++#ifndef _SYS_CDEFS_H
 +#define _SYS_CDEFS_H_
 +#define __XSTRING(x)    __STRING(x)     /* expand x, then stringify */
 +#define __aligned(x)    __attribute__((__aligned__(x)))

Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff	2012-01-25 20:38:31 UTC (rev 4006)
@@ -110,7 +110,7 @@
  
 +#include <stdint.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 --- a/sys/netinet/tcp_var.h

Modified: trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff	2012-01-25 20:38:31 UTC (rev 4006)
@@ -21,7 +21,7 @@
  
 +#include <sys/types.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 --- a/sys/amd64/include/frame.h
@@ -64,7 +64,7 @@
  
 +#include <sys/types.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error "sys/cdefs.h is a prerequisite for this file"
  #endif
 --- a/sys/amd64/include/proc.h
@@ -85,7 +85,7 @@
  
 +#include <sys/types.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 --- a/sys/amd64/include/reg.h
@@ -118,7 +118,7 @@
  
 +#include <sys/types.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 --- a/sys/i386/include/proc.h
@@ -139,7 +139,7 @@
  
 +#include <sys/types.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 --- a/sys/i386/include/sigframe.h

Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-01-25 20:38:31 UTC (rev 4006)
@@ -9,7 +9,7 @@
  #define _SYS_SYSLIMITS_H_
  
 -#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
--#ifndef _SYS_CDEFS_H_
+-#ifndef _SYS_CDEFS_H
 -#error this file needs sys/cdefs.h as a prerequisite
 -#endif
 -#ifdef __CC_SUPPORTS_WARNING

Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2012-01-25 20:38:31 UTC (rev 4006)
@@ -6,7 +6,7 @@
  
 +#include <stdint.h>
 +
- #ifndef _SYS_CDEFS_H_
+ #ifndef _SYS_CDEFS_H
  #error this file needs sys/cdefs.h as a prerequisite
  #endif
 @@ -697,11 +699,6 @@

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-01-24 10:59:23 UTC (rev 4005)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-01-25 20:38:31 UTC (rev 4006)
@@ -55,6 +55,10 @@
 		-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
 		-e 's/__aligned(\([0-9]*\))/ __attribute__((aligned(\1)))/g' \
 		-e 's/\(\s\|^\|(\)u_\(char\|int\|short\|long\)\(\s\)/\1unsigned \2\3/g' \
+		\
+		-e 's/defined\s*(\s*_SYS_CDEFS_H_\s*)/defined(_SYS_CDEFS_H)/g' \
+		-e 's/#\s*ifdef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifdef _SYS_CDEFS_H/g' \
+		-e 's/#\s*ifndef\s*_SYS_CDEFS_H_\(\s\|$$\)/#ifndef _SYS_CDEFS_H/g' \
 	; done)
 
 	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2