From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 12 Mar 2006 18:07:23 +0000 (+0000)
Subject: Merged revisions 12577 via svnmerge from
X-Git-Tag: 1.4.0-beta1~2441
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=083a9627b56f08578492c3d5b0516e18d8f1ae7f;p=thirdparty%2Fasterisk.git

Merged revisions 12577 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r12577 | russell | 2006-03-12 12:57:37 -0500 (Sun, 12 Mar 2006) | 2 lines

fix build on parisc (issue #6704)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12610 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 8c0cf99296..f162b141b1 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -239,6 +239,7 @@ ifneq ($(shell uname -m),armv4l)
 ifneq ($(shell uname -m),sparc64)
 ifneq (${PROC},arm)
 ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -302,6 +303,7 @@ ifneq ($(shell uname -m), alpha)
 ifneq ($(shell uname -m), sparc64)
 ifneq ($(shell uname -m), armv4l)
 ifneq (${PROC},ia64)
+ifneq ($(shell uname -m), parisc)
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif