- rel 1

[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 dc65212078bf506694efcd7e5132b1347d957cd3..775596a63e1177ed3639716dc14d559bd08dd4b1 100644 (file)
--- a/asterisk-no_k6_on_sparc.patch
+++ b/asterisk-no_k6_on_sparc.patch
@@ -1,68 +1,20 @@
---- codecs/gsm/Makefile~       2004-08-31 18:33:00.000000000 +0200
-+++ codecs/gsm/Makefile        2004-12-11 01:18:42.000000000 +0100
-@@ -215,12 +215,14 @@
- ifneq ($(shell uname -m),ppc)
- ifneq ($(shell uname -m),alpha)
- 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
- endif
- endif
- endif
-+endif
+@@ -261,7 +261,7 @@
+               $(SRC)/table.o
  
- TOAST_SOURCES = $(SRC)/toast.c                \
-               $(SRC)/toast_lin.c      \
-@@ -273,12 +273,14 @@
- ifneq ($(shell uname -m), ppc)
- ifneq ($(shell uname -m), alpha)
- 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
- endif
- endif
- endif
-+endif
- 
- TOAST_OBJECTS =       $(SRC)/toast.o          \
-               $(SRC)/toast_lin.o      \
---- codecs/lpc10/Makefile~     2004-08-31 18:33:00.000000000 +0200
-+++ codecs/lpc10/Makefile      2004-12-11 08:13:19.000000000 +0100
-@@ -31,6 +31,7 @@
- ifneq ($(PROC),ppc)
- ifneq ($(PROC),x86_64)
- ifneq ($(PROC),alpha)
-+ifneq ($(shell uname -m),sparc)
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
-@@ -46,6 +47,7 @@
- endif
- endif
- endif
-+endif
- 
- LIB = $(LIB_TARGET_DIR)/liblpc10.a
- 
---- codecs/gsm/Makefile~       2005-03-01 06:32:03.582121632 +0100
-+++ codecs/gsm/Makefile        2005-03-01 06:52:55.075865664 +0100
-@@ -42,6 +42,7 @@
- ifneq (${PROC},ultrasparc)
- ifneq ($(shell uname -m),ppc)
- ifneq ($(shell uname -m),alpha)
-+ifneq ($(shell uname -m),sparc)
- ifneq (${PROC},sparc64)
- OPTIMIZE+=-march=$(PROC)
- endif
-@@ -50,6 +51,7 @@
- endif
- endif
- endif
-+endif
- 
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.