Re: inclhacks vs. latest autogen?

[Ismail DÃnmez <ismail at pardus dot org dot tr>]

Hi,

Sunday 27 January 2008 16:37:37 tarihinde Dave Korn ÅunlarÄ yazmÄÅtÄ:
>   I'm using the very latest autogen:
>
> /gnu/gcc/obj $ autogen --version
> autogen (GNU AutoGen) - The Automated Program Generator - Ver. 5.9.4
>
>   It doesn't seem to like our syntax in inclhacks.def any more:
>
> checking whether to enable maintainer-specific portions of Makefiles... yes
> configure: creating ./config.status
> /bin/sh ./config.status Makefile
> config.status: creating Makefile
> make[3]: Leaving directory
> `/win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes'
> make[3]: Entering directory
> `/win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes'
> cd /gnu/gcc/gcc/fixincludes ; /bin/sh ./genfixes
> AutoGen-ing fixincl.x
> autogen Error: Invalid input char '*' in inclhack.def on line 1088
> Makefile:128: *** [/gnu/gcc/gcc/fixincludes/fixincl.x] Error 1
>
> #0  /gnu/gcc/gcc/fixincludes/fixincl.x at
> /win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes/Makefile:128
> #1  fixincl.o at
> /win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes/Makefile:116
> #2  full-stamp at
> /win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes/Makefile:105
> #3  oneprocess at
> /win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes/Makefile:102
> #4  all at ??
> make[3]: Leaving directory
> `/win/i/FSF-Gcc/obj/build-i686-pc-cygwin/fixincludes'
> Command-line arguments:
> 	"all"
> Makefile:2784: *** [all-build-fixincludes] Error 2
>
>   It's pointing at some globs in shell syntax:
>
> /gnu/gcc/obj $ cat -n /gnu/gcc/gcc/fixincludes/inclhack.def | grep -C3 1088
>   1085   */
>   1086  fix = {
>   1087      hackname  = bsd_stdio_attrs_conflict;
>   1088      mach      = *-*-*bsd*;
>   1089      mach      = *-*-*darwin*;
>   1090      files     = stdio.h;
>   1091      select    = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
> /gnu/gcc/obj $
>
>
>   This isn't a recent change, so I'm assuming autogen has changed.  What
> versions are other people running?

I use the attached patch successfully, I didn't submit it yet because I 
couldn't test it with older autogen. Testing is appreciated.

Regards,
ismail

-- 
Never learn by your mistakes, if you do you may never dare to try again.

--- fixincludes/inclhack.def	2007-12-29 02:14:35.000000000 +0200
+++ fixincludes/inclhack.def	2007-12-31 04:21:00.000000000 +0200
@@ -1085,8 +1085,8 @@
  */
 fix = {
     hackname  = bsd_stdio_attrs_conflict;
-    mach      = *-*-*bsd*;
-    mach      = *-*-*darwin*;
+    mach      = "*-*-*bsd*";
+    mach      = "*-*-*darwin*";
     files     = stdio.h;
     select    = "^#define[ \t]*vfscanf[ \t]*__svfscanf[ \t]*$";
     c_fix     = format;
@@ -1303,7 +1303,7 @@
  */
 fix = {
     hackname  = freebsd_gcc3_breakage;
-    mach      = *-*-freebsd*;
+    mach      = "*-*-freebsd*";
     files     = sys/cdefs.h;
     select    = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7$';
     bypass    = '__GNUC__[ \t]*([>=]=[ \t]*[3-9]|>[ \t]*2)';
@@ -1320,7 +1320,7 @@
  */
 fix = {
     hackname  = freebsd_gcc4_breakage;
-    mach      = *-*-freebsd*; 
+    mach      = "*-*-freebsd*"; 
     files     = sys/cdefs.h;
     select    = '^#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 \|\| __GNUC__ == 3$';
     c_fix     = format;
@@ -1619,7 +1619,7 @@
 
 fix = {
      hackname  = hppa_hpux_fp_macros;
-     mach      = hppa*-hp-hpux11*;
+     mach      = "hppa*-hp-hpux11*";
      files     = math.h;
      select    = "#[ \t]*define[ \t]*FP_NORMAL.*\n"
 		 "#[ \t]*define[ \t]*FP_ZERO.*\n"
@@ -1728,7 +1728,7 @@
  */
 fix = {
     hackname  = hpux11_abs;
-    mach      = ia64-hp-hpux11*;
+    mach      = "ia64-hp-hpux11*";
     files     = stdlib.h;
     select    = "ifndef _MATH_INCLUDED";
     c_fix     = format;
@@ -2670,7 +2670,7 @@
  */
 fix = {
     hackname  = netbsd_c99_inline_1;
-    mach      = *-*-netbsd*;
+    mach      = "*-*-netbsd*";
     files     = signal.h;
     select    = "extern __inline int";
 
@@ -2683,7 +2683,7 @@
 
 fix = {
     hackname  = netbsd_c99_inline_2;
-    mach      = *-*-netbsd*;
+    mach      = "*-*-netbsd*";
     files     = signal.h;
     select    = "#define _SIGINLINE extern __inline";
 
@@ -2705,7 +2705,7 @@
  */
 fix = {
     hackname  = netbsd_extra_semicolon;
-    mach      = *-*-netbsd*;
+    mach      = "*-*-netbsd*";
     files     = sys/cdefs.h;
     select    = "#define[ \t]*__END_DECLS[ \t]*};";