SOURCES: asterisk-no_k6_on_sparc.patch - updated to 1.2.0

[pawcioos]

Author: pawcioos                     Date: Mon Nov 21 13:56:15 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 1.2.0

---- Files affected:
SOURCES:
   asterisk-no_k6_on_sparc.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/asterisk-no_k6_on_sparc.patch
diff -u SOURCES/asterisk-no_k6_on_sparc.patch:1.3 SOURCES/asterisk-no_k6_on_sparc.patch:1.4
--- SOURCES/asterisk-no_k6_on_sparc.patch:1.3	Fri Jun 24 07:29:32 2005
+++ SOURCES/asterisk-no_k6_on_sparc.patch	Mon Nov 21 14:56:10 2005
@@ -1,15 +1,14 @@
-diff -ur asterisk-1.0.8-o/codecs/gsm/Makefile asterisk-1.0.8/codecs/gsm/Makefile
---- asterisk-1.0.8-o/codecs/gsm/Makefile	2005-06-21 08:27:28.000000000 -0600
-+++ asterisk-1.0.8/codecs/gsm/Makefile	2005-06-23 23:28:35.000000000 -0600
-@@ -224,6 +224,7 @@
+--- asterisk-1.2.0/codecs/gsm/Makefile.orig	2005-11-21 13:34:00.000000000 +0100
++++ asterisk-1.2.0/codecs/gsm/Makefile	2005-11-21 13:40:02.000000000 +0100
+@@ -235,6 +235,7 @@
  ifneq ($(shell uname -m),alpha)
  ifneq ($(shell uname -m),armv4l)
  ifneq ($(shell uname -m),sparc64)
 +ifneq ($(shell uname -m),sparc)
+ ifneq (${PROC},arm)
  GSM_SOURCES+= $(SRC)/k6opt.s
  endif
- endif
-@@ -231,6 +232,7 @@
+@@ -245,6 +246,7 @@
  endif
  endif
  endif
@@ -17,15 +16,15 @@
  
  TOAST_SOURCES = $(SRC)/toast.c 		\
  		$(SRC)/toast_lin.c	\
-@@ -282,6 +284,7 @@
+@@ -296,6 +298,7 @@
+ ifneq ($(shell uname -m), ppc64)
  ifneq ($(shell uname -m), alpha)
- ifneq ($(shell uname -m), armv4l)
  ifneq ($(shell uname -m), sparc64)
 +ifneq ($(shell uname -m), sparc)
+ ifneq ($(shell uname -m), armv4l)
  GSM_OBJECTS+= $(SRC)/k6opt.o
  endif
- endif
-@@ -289,6 +292,7 @@
+@@ -305,6 +308,7 @@
  endif
  endif
  endif
================================================================

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