- outdated

[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..1c2e9328980fcf6c42f2cef81201570aaadefe63 100644 (file)
--- a/asterisk-no_k6_on_sparc.patch
+++ b/asterisk-no_k6_on_sparc.patch
@@ -1,13 +1,14 @@
---- 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)
+--- 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
+@@ -245,6 +246,7 @@
  endif
  endif
  endif
@@ -15,14 +16,15 @@
  
  TOAST_SOURCES = $(SRC)/toast.c                \
                $(SRC)/toast_lin.c      \
-@@ -273,12 +273,14 @@
- ifneq ($(shell uname -m), ppc)
+@@ -296,6 +298,7 @@
+ ifneq ($(shell uname -m), ppc64)
  ifneq ($(shell uname -m), alpha)
  ifneq ($(shell uname -m), sparc64)
 +ifneq ($(shell uname -m), sparc)
+ ifneq ($(shell uname -m), armv4l)
  GSM_OBJECTS+= $(SRC)/k6opt.o
  endif
- endif
+@@ -305,6 +308,7 @@
  endif
  endif
  endif
@@ -30,39 +32,3 @@
  
  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.