- made imake completely independent from uname(2)

Changed files:
    XFree86-imake-kernel-version.patch -> 1.2

diff --git a/XFree86-imake-kernel-version.patch b/XFree86-imake-kernel-version.patch
index eb68e7e732c68d76f1fc7e55dcbb4ff0fd44e615..cd4701feda1773172a19299716212c3a92a5dadf 100644 (file)
--- a/XFree86-imake-kernel-version.patch
+++ b/XFree86-imake-kernel-version.patch
@@ -1,16 +1,76 @@
---- XFree86-4.0.2/xc/config/imake/imake.c.orig Fri Dec 22 14:48:51 2000
-+++ XFree86-4.0.2/xc/config/imake/imake.c      Fri Dec 22 14:48:46 2000
-@@ -265,6 +265,7 @@
+diff -ur XFree86-4.0.2/xc/config/imake/Imakefile XFree86-4.0.2.new/xc/config/imake/Imakefile
+--- XFree86-4.0.2/xc/config/imake/Imakefile    Sat Aug 14 12:49:01 1999
++++ XFree86-4.0.2.new/xc/config/imake/Imakefile        Sat Dec 23 17:48:28 2000
+@@ -15,10 +15,14 @@
+ INCLUDES = -I$(TOP)/include $(TOP_X_INCLUDES)/X11
+ CPP_PROGRAM = CppCmd
+ CPP_DEFINES = -DCPP_PROGRAM="\"$(CPP_PROGRAM)\""
+-DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES)
++DEFINES = $(SIGNAL_DEFINES) $(BOOTSTRAPCFLAGS) $(CPP_DEFINES) -DDEFAULT_OS_CPU_FROB="\"$(DEFAULT_OS_CPU_FROB)\""
+ 
+ #if defined(MacIIArchitecture) || defined(SequentArchitecture) || defined(i386ScoArchitecture)
+ XBSDLIB = /**/
++#endif
++
++#if !defined(DEFAULT_OS_CPU_FROB)
++DEFAULT_OS_CPU_FROB = `uname -m`
+ #endif
+ 
+ #if !defined(OS2Architecture)
+diff -ur XFree86-4.0.2/xc/config/imake/Makefile.ini XFree86-4.0.2.new/xc/config/imake/Makefile.ini
+--- XFree86-4.0.2/xc/config/imake/Makefile.ini Sat Oct 28 03:15:23 2000
++++ XFree86-4.0.2.new/xc/config/imake/Makefile.ini     Sat Dec 23 17:48:37 2000
+@@ -9,11 +9,15 @@
+ #
+ # $XFree86: xc/config/imake/Makefile.ini,v 3.9 2000/10/26 17:57:45 dawes Exp $
+ 
++#if !defined(DEFAULT_OS_CPU_FROB)
++DEFAULT_OS_CPU_FROB = `uname -m`
++#endif
++
+ BOOTSTRAPCFLAGS = 
+ CC = cc
+ CDEBUGFLAGS = -O
+ INCLUDES = -I../../include -I../../imports/x11/include/X11
+-CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
++CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES) -DDEFAULT_OS_CPU_FROB="\"$(DEFAULT_OS_CPU_FROB)\""
+ SHELL = /bin/sh
+ RM = rm -f
+ MV = mv
+diff -ur XFree86-4.0.2/xc/config/imake/imake.c XFree86-4.0.2.new/xc/config/imake/imake.c
+--- XFree86-4.0.2/xc/config/imake/imake.c      Sat Dec 23 17:53:30 2000
++++ XFree86-4.0.2.new/xc/config/imake/imake.c  Sat Dec 23 17:51:03 2000
+@@ -265,6 +265,8 @@
  #if defined(linux) || defined(__GNU__)
  #include <limits.h>
  #include <stdio.h>
++#include <linux/uts.h>
 +#include <linux/version.h>
  #endif
  #ifdef __QNX__
  #include <unix.h>
-@@ -1225,35 +1226,15 @@
-               fprintf(inFile, "#define DefaultOSName %s\n", buf);
- # endif
+@@ -1208,57 +1210,19 @@
+ #if !defined(WIN32) && !defined(__EMX__)
+ #if (defined(DEFAULT_OS_NAME) || defined(DEFAULT_OS_MAJOR_REV) || \
+      defined(DEFAULT_OS_MINOR_REV) || defined(DEFAULT_OS_TEENY_REV))
+-      struct utsname name;
+-      char buf[SYS_NMLN * 5 + 1];
+ 
+-      /* Obtain the system information. */
+-      if (uname(&name) < 0)
+-              LogFatal("Cannot invoke uname", "");
+-
+-# ifdef DEFAULT_OS_NAME
+-      parse_utsname(&name, DEFAULT_OS_NAME, buf, 
+-                    "Bad DEFAULT_OS_NAME syntax %s");
+-#  ifdef DEFAULT_OS_NAME_FROB
+-      DEFAULT_OS_NAME_FROB(buf, sizeof buf);
+-#  endif
+-      if (buf[0] != '\0')
+-              fprintf(inFile, "#define DefaultOSName %s\n", buf);
+-# endif
++      fprintf(inFile, "#define DefaultOSName %s %s %s\n",
++              UTS_SYSNAME, UTS_RELEASE, DEFAULT_OS_CPU_FROB);
  
 -# ifdef DEFAULT_OS_MAJOR_REV
 -      parse_utsname(&name, DEFAULT_OS_MAJOR_REV, buf,
@@ -48,6 +108,11 @@
 -      fprintf(inFile, "#define DefaultOSTeenyVersion %s\n",
 -              *buf ? trim_version(buf) : "0");
 -# endif
- # ifdef DEFAULT_MACHINE_ARCHITECTURE
-       parse_utsname(&name, DEFAULT_MACHINE_ARCHITECTURE, buf, 
-                     "Bad DEFAULT_MACHINE_ARCHITECTURE %s");
+-# ifdef DEFAULT_MACHINE_ARCHITECTURE
+-      parse_utsname(&name, DEFAULT_MACHINE_ARCHITECTURE, buf, 
+-                    "Bad DEFAULT_MACHINE_ARCHITECTURE %s");
+-      fprintf(inFile, "#ifndef %s\n# define %s\n#endif\n", buf, buf);
+-# endif
+ #endif
+ #ifdef linux
+     get_distrib (inFile);