SOURCES: quake3-alphafix.patch - more consistency

[qboosh]

Author: qboosh                       Date: Mon Oct 31 08:45:49 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- more consistency

---- Files affected:
SOURCES:
   quake3-alphafix.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/quake3-alphafix.patch
diff -u SOURCES/quake3-alphafix.patch:1.3 SOURCES/quake3-alphafix.patch:1.4
--- SOURCES/quake3-alphafix.patch:1.3	Fri Oct 28 17:40:15 2005
+++ SOURCES/quake3-alphafix.patch	Mon Oct 31 09:45:44 2005
@@ -1,24 +1,60 @@
-diff -ur quake3/code/unix/Makefile quake3.alpha-fix/code/unix/Makefile
---- quake3/code/unix/Makefile	2005-10-15 18:02:11.000000000 +0200
-+++ quake3.alpha-fix/code/unix/Makefile	2005-10-15 18:03:31.000000000 +0200
-@@ -98,7 +98,7 @@
+--- quake3/code/unix/Makefile.orig	2005-10-31 02:33:28.121431424 +0100
++++ quake3/code/unix/Makefile	2005-10-31 02:49:44.691970136 +0100
+@@ -91,9 +91,6 @@
+   CC=gcc
    CXX=g++
  
-   ifeq ($(ARCH),alpha)
+-  ifeq ($(ARCH),alpha)
 -    ARCH=axp
-+    LIB=lib64
-   else
+-  else
    ifeq ($(ARCH),x86_64)
      LIB=lib64
-diff -ur quake3/code/unix/unix_main.c quake3.alpha-fix/code/unix/unix_main.c
---- quake3/code/unix/unix_main.c	2005-10-15 15:34:29.000000000 +0200
-+++ quake3.alpha-fix/code/unix/unix_main.c	2005-10-15 18:04:45.000000000 +0200
-@@ -802,7 +802,7 @@
- #elif defined __sh__
-   snprintf (fname, sizeof(fname), "%ssh.so", name);
+   else
+@@ -105,7 +102,6 @@
+   endif
+   endif
+   endif
+-  endif
+ 
+   BASE_CFLAGS =  -pipe -Wall -Wimplicit -Wstrict-prototypes
+ 
+--- quake3/code/unix/unix_main.c.orig	2005-10-30 02:18:46.000000000 +0200
++++ quake3/code/unix/unix_main.c	2005-10-31 02:51:43.283941416 +0100
+@@ -794,7 +794,7 @@
+ #elif defined __ia64__
+   snprintf (fname, sizeof(fname), "%sia64.so", name);
+ #elif defined __alpha__
+-  snprintf (fname, sizeof(fname), "%saxp.so", name);
++  snprintf (fname, sizeof(fname), "%salpha.so", name);
+ #elif defined __mips__
+   snprintf (fname, sizeof(fname), "%smips.so", name);
+ #elif defined __arm__
+@@ -808,7 +808,7 @@
+ #elif defined __sparc__
+   snprintf (fname, sizeof(fname), "%ssparc.so", name);
  #else
 -#error Unknown arch
 +  snprintf (fname, sizeof(fname), "%sother.so", name);
  #endif
  
    // TODO: use fs_searchpaths from files.c
+--- quake3/code/qcommon/q_shared.h.orig	2005-10-30 02:18:52.000000000 +0200
++++ quake3/code/qcommon/q_shared.h	2005-10-31 02:54:58.551256272 +0100
+@@ -266,7 +266,7 @@
+ 
+ #ifdef __i386__
+ #define	CPUSTRING	"linux-i386"
+-#elif defined __axp__
++#elif defined(__alpha__)
+ #define	CPUSTRING	"linux-alpha"
+ #elif defined __x86_64__
+ #define	CPUSTRING	"linux-x86_64"
+@@ -278,6 +278,8 @@
+ #define	CPUSTRING	"linux-s390"
+ #elif defined __s390x__
+ #define	CPUSTRING	"linux-s390x"
++#elif defined(__sparc__)
++#define	CPUSTRING	"linux-sparc"
+ #elif defined __ia64__
+ #define	CPUSTRING	"linux-ia64"
+ #else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/quake3-alphafix.patch?r1=1.3&r2=1.4&f=u