This is the mail archive of the gcc-bugs@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Patch for texinfo v3 (from egcs) for Irix 6.3 native compiler



To compile egcs using the native compiler on Irix 6.3, I had to change
texinfo to use getopt() instead of getopt_long().  The following is a
patch to detect and handle this case.  I have added the single char
param -S for --no-split to makeinfo.  I skipped my generated configure
from the patch.  You should run autoconf with your version.

Copy sent to bug-texinfo.

diff -ru src-1.0/texinfo/configure.in src-1.0-sgiirix5/texinfo/configure.in
--- src-1.0/texinfo/configure.in        Tue Sep 16 07:01:43 1997
+++ src-1.0-sgiirix5/texinfo/configure.in       Sat Dec  6 14:30:57 1997
@@ -41,7 +41,7 @@
   AC_FUNC_SETVBUF_REVERSED
 fi
 AC_CHECK_FUNCS(setvbuf getcwd memset bzero strchr strcasecmp \
-  vfprintf vsprintf strerror sigprocmask sigsetmask)
+  vfprintf vsprintf strerror sigprocmask sigsetmask getopt_long)
 dnl strcasecmp, strerror, xmalloc, xrealloc, probably others should be added.
 AC_REPLACE_FUNCS(memcpy memmove strdup)
 
diff -ru src-1.0/texinfo/makeinfo/Makefile.in src-1.0-sgiirix5/texinfo/makeinfo/
Makefile.in
--- src-1.0/texinfo/makeinfo/Makefile.in        Fri Aug 22 00:58:07 1997
+++ src-1.0-sgiirix5/texinfo/makeinfo/Makefile.in       Sat Dec  6 12:43:36 1997
@@ -74,7 +74,7 @@
 $(OBJS): makeinfo.h
 
 info makeinfo.info: ./makeinfo makeinfo.texi #macro.texi
-       ./makeinfo --no-split -I$(srcdir) makeinfo.texi
+       ./makeinfo -S -I$(srcdir) makeinfo.texi
 
 # makeinfo.texi: ./makeinfo makeinfo.mki
 #      ./makeinfo -E makeinfo.texi -I$(srcdir) makeinfo.mki
diff -ru src-1.0/texinfo/makeinfo/makeinfo.c src-1.0-sgiirix5/texinfo/makeinfo/m
akeinfo.c
--- src-1.0/texinfo/makeinfo/makeinfo.c Tue Dec  2 21:18:39 1997
+++ src-1.0-sgiirix5/texinfo/makeinfo/makeinfo.c        Sat Dec  6 12:41:53 1997
@@ -71,6 +71,10 @@
 #endif /* HAVE_VARARGS_H */
 #include "getopt.h"
 
+#ifndef HAVE_GETOPT_LONG
+# define getopt_long(a,b,c,d,e) getopt((a),(b),(c),(d))
+#endif
+
 #if defined (HAVE_UNISTD_H)
 #include <unistd.h>
 #endif /* HAVE_UNISTD_H */
@@ -792,7 +796,7 @@
   { "no-headers", 0, &no_headers, 1 },         /* Do not output Node: foo */
   { "no-pointer-validate", 0, &validating, 0 }, /* formerly -nv */
   { "no-validate", 0, &validating, 0 },                /* formerly -nv */
-  { "no-split", 0, &splitting, 0 },            /* formerly -ns */
+  { "no-split", 0, &splitting, 'S' },          /* formerly -ns */
   { "no-warn", 0, &print_warnings, 0 },                /* formerly -nw */
 #if defined (HAVE_MACROS)
   { "macro-expand", 1, 0, 'E' },
@@ -839,9 +843,9 @@
   while ((c = getopt_long
          (argc, argv,
 #if defined (HAVE_MACROS)
-          "D:E:U:I:f:o:p:e:r:s:V",
+          "D:E:U:I:f:o:p:e:r:s:SV",
 #else
-          "D:U:I:f:o:p:e:r:s:V",
+          "D:U:I:f:o:p:e:r:s:SV",
 #endif /* !HAVE_MACROS */
           long_options, &ind))
         != EOF)
-- 
##>  Petter Reinholdtsen <##    | pere@td.org.uit.no
 O-  <SCRIPT Language="Javascript">window.close()</SCRIPT>
http://www.hungry.com/~pere/    | Go Mozilla, go! Go!


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]