- restore todo (removed in r1.175), the problem is not fixed

[packages/asterisk.git] / asterisk-no_k6_on_sparc.patch

diff --git a/asterisk-no_k6_on_sparc.patch b/asterisk-no_k6_on_sparc.patch
index b133851d4b7529b99e1233c72997ff3fdcae16fe..775596a63e1177ed3639716dc14d559bd08dd4b1 100644 (file)
--- a/asterisk-no_k6_on_sparc.patch
+++ b/asterisk-no_k6_on_sparc.patch
@@ -1,35 +1,20 @@
-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 @@
- ifneq ($(shell uname -m),alpha)
- ifneq ($(shell uname -m),armv4l)
- ifneq ($(shell uname -m),sparc64)
-+ifneq ($(shell uname -m),sparc)
+--- asterisk-1.6.1.12/codecs/gsm/Makefile~     2009-12-29 20:48:57.000000000 +0200
++++ asterisk-1.6.1.12/codecs/gsm/Makefile      2009-12-29 20:49:58.084691177 +0200
+@@ -208,7 +208,7 @@
+ # XXX Keep a space after each findstring argument
+ # XXX should merge with GSM_OBJECTS
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
++ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc s390 ))
+ ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 s390 bfin mipsel mips ))
  GSM_SOURCES+= $(SRC)/k6opt.s
  endif
- endif
-@@ -231,6 +232,7 @@
- endif
- endif
- endif
-+endif
+@@ -261,7 +261,7 @@
+               $(SRC)/table.o
  
- TOAST_SOURCES = $(SRC)/toast.c                \
-               $(SRC)/toast_lin.c      \
-@@ -282,6 +284,7 @@
- ifneq ($(shell uname -m), alpha)
- ifneq ($(shell uname -m), armv4l)
- ifneq ($(shell uname -m), sparc64)
-+ifneq ($(shell uname -m), sparc)
+ ifeq ($(OSARCH),linux-gnu)
+-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
++ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 sparc parisc ))
+ ifeq (,$(findstring $(PROC) , arm armv5b armeb powerpc ia64 bfin mipsel mips ))
  GSM_OBJECTS+= $(SRC)/k6opt.o
  endif
- endif
-@@ -289,6 +292,7 @@
- endif
- endif
- endif
-+endif
- 
- TOAST_OBJECTS =       $(SRC)/toast.o          \
-               $(SRC)/toast_lin.o      \