[Glibc-bsd-commits] r3574 - in trunk/freebsd-buildutils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-12 16:10:40 +0000 (Tue, 12 Jul 2011)
New Revision: 3574

Added:
   trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
   trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
   trunk/freebsd-buildutils/debian/patches/17_multiarch.diff
   trunk/freebsd-buildutils/debian/patches/series
Log:
04_lex_disable_unused.diff: Fix generation of code in lex, which defined __unused and broke system headers (see #522773 and #522774).

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2011-07-12 15:34:43 UTC (rev 3573)
+++ trunk/freebsd-buildutils/debian/changelog	2011-07-12 16:10:40 UTC (rev 3574)
@@ -1,3 +1,10 @@
+freebsd-buildutils (8.2-7) unstable; urgency=low
+
+  * 04_lex_disable_unused.diff: Fix generation of code in lex, which
+    defined __unused and broke system headers (see #522773 and #522774).
+
+ -- Robert Millan <rmh at debian.org>  Tue, 12 Jul 2011 17:53:12 +0200
+
 freebsd-buildutils (8.2-6) unstable; urgency=low
 
   * 21_endian.diff: If neither TARGET_BIG_ENDIAN or TARGET_LITTLE_ENDIAN are

Added: trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/patches/04_lex_disable_unused.diff	2011-07-12 16:10:40 UTC (rev 3574)
@@ -0,0 +1,30 @@
+
+Defining __unused causes breakage in system headers (see #522773 and #522774).
+
+Note: special care should be taken with flex.skl; this code isn't compiled in
+lex itself, it is used as template to generate code that will later be built
+in other packages (e.g. kfreebsd-9).
+
+--- a/src/usr.bin/lex/flex.skl
++++ b/src/usr.bin/lex/flex.skl
+@@ -5,10 +5,8 @@
+  * $FreeBSD$
+  */
+ 
+-#if defined(__FreeBSD__)
+ #include <sys/cdefs.h>
+-#else
+-#define __unused
++#ifndef __dead2
+ #define __dead2
+ #endif
+ 
+@@ -264,7 +262,7 @@
+ %*
+ 
+ static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
+-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __unused;
++static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) __attribute__((unused));
+ static void yy_flex_free YY_PROTO(( void * ));
+ 
+ #define yy_new_buffer yy_create_buffer

Modified: trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2011-07-12 15:34:43 UTC (rev 3573)
+++ trunk/freebsd-buildutils/debian/patches/08_maxpathlen.diff	2011-07-12 16:10:40 UTC (rev 3574)
@@ -23,7 +23,7 @@
   * Arch_ParseArchive --
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -248,6 +248,9 @@
+@@ -250,6 +250,9 @@
  {
  	char *fname, *fnamesave;	/* makefile to read */
  	FILE *stream;

Modified: trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-07-12 15:34:43 UTC (rev 3573)
+++ trunk/freebsd-buildutils/debian/patches/10_non_kfreebsd.diff	2011-07-12 16:10:40 UTC (rev 3574)
@@ -4,7 +4,7 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -948,11 +948,11 @@
+@@ -950,11 +950,11 @@
  	 * run-time.
  	 */
  	if (machine == NULL) {

Modified: trunk/freebsd-buildutils/debian/patches/17_multiarch.diff
===================================================================
--- trunk/freebsd-buildutils/debian/patches/17_multiarch.diff	2011-07-12 15:34:43 UTC (rev 3573)
+++ trunk/freebsd-buildutils/debian/patches/17_multiarch.diff	2011-07-12 16:10:40 UTC (rev 3574)
@@ -7,7 +7,7 @@
 
 --- a/src/usr.bin/make/main.c
 +++ b/src/usr.bin/make/main.c
-@@ -858,6 +858,7 @@
+@@ -860,6 +860,7 @@
  {
  	const char *machine;
  	const char *machine_arch;
@@ -15,7 +15,7 @@
  	const char *machine_cpu;
  	Boolean outOfDate = TRUE;	/* FALSE if all targets up to date */
  	const char *p;
-@@ -944,8 +945,8 @@
+@@ -946,8 +947,8 @@
  	 * so we can share an executable for similar machines.
  	 * (i.e. m68k: amiga hp300, mac68k, sun3, ...)
  	 *
@@ -26,7 +26,7 @@
  	 */
  	if (machine == NULL) {
  #ifdef MACHINE_ARCH
-@@ -963,6 +964,14 @@
+@@ -965,6 +966,14 @@
  #endif
  	}
  
@@ -41,7 +41,7 @@
  	/*
  	 * Set machine_cpu to the minumum supported CPU revision based
  	 * on the target architecture, if not already set.
-@@ -1005,6 +1014,7 @@
+@@ -1007,6 +1016,7 @@
  	Var_SetGlobal("MFLAGS", "");
  	Var_SetGlobal("MACHINE", machine);
  	Var_SetGlobal("MACHINE_ARCH", machine_arch);

Modified: trunk/freebsd-buildutils/debian/patches/series
===================================================================
--- trunk/freebsd-buildutils/debian/patches/series	2011-07-12 15:34:43 UTC (rev 3573)
+++ trunk/freebsd-buildutils/debian/patches/series	2011-07-12 16:10:40 UTC (rev 3574)
@@ -2,6 +2,7 @@
 01_make_fixes.diff
 02_libbsd.diff
 03_glibc.diff
+04_lex_disable_unused.diff
 05_disable_hardlinks.diff
 07_brandelf.diff
 08_maxpathlen.diff