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

[Robert Millan]

Author: rmh
Date: 2012-06-15 20:02:46 +0000 (Fri, 15 Jun 2012)
New Revision: 4307

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Convert __GNUCLIKE* feature tests into __GNUC__.  (Closes: #677417)

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-06-15 19:52:31 UTC (rev 4306)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-06-15 20:02:46 UTC (rev 4307)
@@ -1,3 +1,9 @@
+kfreebsd-kernel-headers (0.82) UNRELEASED; urgency=low
+
+  * Convert __GNUCLIKE* feature tests into __GNUC__.  (Closes: #677417)
+
+ -- Robert Millan <rmh at debian.org>  Fri, 15 Jun 2012 22:02:20 +0200
+
 kfreebsd-kernel-headers (0.81) unstable; urgency=low
 
   * Improve __size_t kludge to make it more compliant with FreeBSD (see

Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-06-15 19:52:31 UTC (rev 4306)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-06-15 20:02:46 UTC (rev 4307)
@@ -12,7 +12,7 @@
 -#ifndef _SYS_CDEFS_H
 -#error this file needs sys/cdefs.h as a prerequisite
 -#endif
--#if 1
+-#if defined(__GNUC__)
 -#warning "No user-serviceable parts inside."
 -#endif
 -#endif

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-06-15 19:52:31 UTC (rev 4306)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-06-15 20:02:46 UTC (rev 4307)
@@ -52,12 +52,12 @@
 		-e "s/__FreeBSD_version/__FreeBSD_kernel_version/g" \
 		\
 		-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/1/g' \
-		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 1/g' \
-		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 0/g' \
+		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if defined(__GNUC__)/g' \
+		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if !defined(__GNUC__)/g' \
 		\
-		-e 's/defined\s*(\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\s*)/1/g' \
-		-e 's/#\s*ifdef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 1/g' \
-		-e 's/#\s*ifndef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 0/g' \
+		-e 's/defined\s*(\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\s*)/defined(__GNUC__)/g' \
+		-e 's/#\s*ifdef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if defined(__GNUC__)/g' \
+		-e 's/#\s*ifndef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if !defined(__GNUC__)/g' \
 		\
 		-e 's/__unused/__attribute__((__unused__))/g' \
 		-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \