[Asterisk-cvs] asterisk/codecs/gsm Makefile,1.19,1.20

markster at lists.digium.com markster at lists.digium.com
Mon Dec 20 18:53:27 CST 2004


Update of /usr/cvsroot/asterisk/codecs/gsm
In directory mongoose.digium.com:/tmp/cvs-serv13775/codecs/gsm

Modified Files:
	Makefile 
Log Message:
Fix Makefile for ppc64 (bug #3111)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/codecs/gsm/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile	14 Dec 2004 23:36:30 -0000	1.19
+++ Makefile	20 Dec 2004 23:49:22 -0000	1.20
@@ -42,6 +42,7 @@
 ifneq (${PROC},x86_64)
 ifneq (${PROC},ultrasparc)
 ifneq ($(shell uname -m),ppc)
+ifneq ($(shell uname -m),ppc64)
 ifneq ($(shell uname -m),alpha)
 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.
@@ -215,6 +217,7 @@
 ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m),x86_64)
 ifneq ($(shell uname -m),ppc)
+ifneq ($(shell uname -m),ppc64)
 ifneq ($(shell uname -m),alpha)
 ifneq ($(shell uname -m),sparc64)
 GSM_SOURCES+= $(SRC)/k6opt.s
@@ -223,6 +226,7 @@
 endif
 endif
 endif
+endif
 
 TOAST_SOURCES = $(SRC)/toast.c 		\
 		$(SRC)/toast_lin.c	\
@@ -271,6 +275,7 @@
 ifeq (${OSARCH},Linux)
 ifneq ($(shell uname -m), x86_64)
 ifneq ($(shell uname -m), ppc)
+ifneq ($(shell uname -m), ppc64)
 ifneq ($(shell uname -m), alpha)
 ifneq ($(shell uname -m), sparc64)
 GSM_OBJECTS+= $(SRC)/k6opt.o
@@ -279,6 +284,7 @@
 endif
 endif
 endif
+endif
 
 TOAST_OBJECTS =	$(SRC)/toast.o 		\
 		$(SRC)/toast_lin.o	\




More information about the svn-commits mailing list