[Glibc-bsd-commits] r5377 - in trunk/freebsd-utils/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-23 13:03:58 +0000 (Thu, 23 Jan 2014)
New Revision: 5377

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/026_kdump.diff
Log:
Remove kludge that allowed auto-detected macros to be missing when building kdump. (Closes: #736202)

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-01-23 13:02:37 UTC (rev 5376)
+++ trunk/freebsd-utils/debian/changelog	2014-01-23 13:03:58 UTC (rev 5377)
@@ -3,6 +3,8 @@
   * Handle USB keyboard attach/detach events.
   * Remove Build-Conflicts on libc0.1-dev-i386 (not needed anymore since
     kdump is now using headers from kfreebsd-headers-10.0-1).
+  * Remove kludge that allowed auto-detected macros to be missing when
+    building kdump. (Closes: #736202)
 
  -- Robert Millan <rmh at debian.org>  Tue, 21 Jan 2014 12:38:27 +0100
 

Modified: trunk/freebsd-utils/debian/patches/026_kdump.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/026_kdump.diff	2014-01-23 13:02:37 UTC (rev 5376)
+++ trunk/freebsd-utils/debian/patches/026_kdump.diff	2014-01-23 13:03:58 UTC (rev 5377)
@@ -88,10 +88,10 @@
  			break; \
  		++i; \
 -		printf "\tif (!((arg > 0) ^ ((%s) > 0)))\n\t\tif_print_or(arg, %s, or);\n", $i, $i }'
-+		if ($i) { \
 +		printf "#ifdef %s\n", $i; \
 +		printf "\tif (!((arg > 0) ^ ((%s) > 0)))\n\t\tif_print_or(arg, %s, or);\n", $i, $i; \
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  	printf(">");
  	if (or == 0)
@@ -100,10 +100,10 @@
  			break; \
  		++i; \
 -		printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i }'
-+		if ($i) { \
 +		printf "#ifdef %s\n", $i; \
 +		printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i; \
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  	default: /* Should not reach */
  		printf("<invalid=%jd>", arg);
@@ -113,14 +113,14 @@
  		$include_dir/$file | \
 -	awk '{ printf "\t"; \
 +	awk '{
-+		if ($2) { \
 +		printf "#ifdef %s\n", $2; \
 +		printf "\t"; \
  		if (NR > 1) \
  			printf "else " ; \
 -		printf "if (arg == %s) \n\t\tprintf(\"%s\");\n", $2, $2 }'
 +		printf "if (arg == %s) \n\t\tprintf(\"%s\");\n", $2, $2;
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  	else /* Should not reach */
  		printf("<invalid=%jd>", arg);
@@ -218,11 +218,11 @@
  			break; \
  		++i; \
  		if (o <= $(i+1)) \
-+			{
-+			if ($i) { \
++			{ \
 +			printf "#ifdef %s\n", $i; \
  			printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i; \
-+			printf "#endif\n"; } } \
++			printf "#endif\n";
++			} \
  		else \
  			exit; \
  		o = $(i+1) }'
@@ -239,10 +239,10 @@
  			break; \
  		++i; \
 -		printf "\tif (!((flags > 0) ^ ((%s) > 0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i }'
-+		if ($i) { \
 +		printf "#ifdef %s\n", $i; \
 +		printf "\tif (!((flags > 0) ^ ((%s) > 0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i; \
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  #ifdef MAP_32BIT
  	if (!((flags > 0) ^ ((MAP_32BIT) > 0)))
@@ -267,10 +267,10 @@
  			break; \
  		++i; \
 -		printf "\tif(!((flags>0)^((%s)>0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i }'
-+		if ($i) { \
 +		printf "#ifdef %s\n", $i; \
 +		printf "\tif(!((flags>0)^((%s)>0)))\n\t\tif_print_or(flags, %s, or);\n", $i, $i; \
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  	printf(">");
  }
@@ -279,10 +279,10 @@
  			break; \
  		++i; \
 -		printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i }'
-+		if ($i) { \
 +		printf "#ifdef %s\n", $i; \
 +		printf "\tcase %s:\n\t\tprintf(\"%s\");\n\t\tbreak;\n", $i, $i; \
-+		printf "#endif\n" } }'
++		printf "#endif\n" \
++		}'
  cat <<_EOF_
  	default:
  		switch (sig) {