Fix lpc10 Makefile, closes (#84939). (see ChangeLog for details).

(Portage version: 2.0.51.22-r2)

8 files changed, 75 insertions, 7 deletions

diff --git a/net-misc/asterisk/ChangeLog b/net-misc/asterisk/ChangeLog
index 3bdd4e9f5548..b479dc91c7e9 100644
--- a/net-misc/asterisk/ChangeLog
+++ b/net-misc/asterisk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-misc/asterisk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.81 2005/09/02 18:37:01 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/ChangeLog,v 1.82 2005/09/07 23:35:53 stkn Exp $
+
+  08 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/1.0.0/asterisk-1.0.5-lpc10flags.diff, asterisk-1.0.5-r2.ebuild,
+  asterisk-1.0.6-r1.ebuild, asterisk-1.0.7-r1.ebuild, asterisk-1.0.8.ebuild,
+  asterisk-1.0.9-r1.ebuild, asterisk-1.0.9.ebuild:
+  Removed the CFLAGS+=-march=$(PROC) (where $(PROC) = uname -m) part from the
+  lpc10 Makefile, this fixes the illegal instruction error message on
+  non-nehemiah Via C3 CPUs (bug #84939). Thanks to
+  Christian Zoffoli <xmerlin@gentoo.org> for providing the neccessary
+  information to fix this bug.
 
   02 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
   asterisk-1.2.0_beta1.ebuild:
diff --git a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild b/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
index 69ed89f4a6d1..ab97f9254ca5 100644
--- a/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r2.ebuild,v 1.7 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.5-r2.ebuild,v 1.8 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -153,6 +153,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${P}-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${P}-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild b/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
index 2b61776e5ee9..932bd0b2726a 100644
--- a/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.9 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.6-r1.ebuild,v 1.10 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -194,6 +194,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
index 106a9b98b50a..05273341fa5e 100644
--- a/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.17 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.7-r1.ebuild,v 1.18 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -193,6 +193,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/asterisk-1.0.8.ebuild b/net-misc/asterisk/asterisk-1.0.8.ebuild
index 8174c0274f73..779a155c4a23 100644
--- a/net-misc/asterisk/asterisk-1.0.8.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.13 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.8.ebuild,v 1.14 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -197,6 +197,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
index c0fe0f746575..d2c5054291a5 100644
--- a/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.2 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9-r1.ebuild,v 1.3 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -197,6 +197,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/asterisk-1.0.9.ebuild b/net-misc/asterisk/asterisk-1.0.9.ebuild
index df046ab3bec2..38799009f4d4 100644
--- a/net-misc/asterisk/asterisk-1.0.9.ebuild
+++ b/net-misc/asterisk/asterisk-1.0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.4 2005/08/23 13:57:43 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/asterisk/asterisk-1.0.9.ebuild,v 1.5 2005/09/07 23:35:53 stkn Exp $
 
 inherit eutils perl-module
 
@@ -197,6 +197,10 @@ src_unpack() {
 	# other patches
 	#
 
+	# fix lpc10 Makefile, remove the
+	# CFLAGS+=-march=$(shell uname -m) part
+	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-lpc10flags.diff
+
 	# asterisk-config
 	epatch ${FILESDIR}/1.0.0/${PN}-1.0.5-astcfg-0.0.2.diff
 
diff --git a/net-misc/asterisk/files/1.0.0/asterisk-1.0.5-lpc10flags.diff b/net-misc/asterisk/files/1.0.0/asterisk-1.0.5-lpc10flags.diff
new file mode 100644
index 000000000000..8b828e3fafed
--- /dev/null
+++ b/net-misc/asterisk/files/1.0.0/asterisk-1.0.5-lpc10flags.diff
@@ -0,0 +1,34 @@
+--- asterisk-1.0.9/codecs/lpc10/Makefile.orig	2005-09-08 00:29:27.000000000 +0200
++++ asterisk-1.0.9/codecs/lpc10/Makefile	2005-09-08 00:30:15.000000000 +0200
+@@ -22,30 +22,7 @@
+ # 
+ 
+ WARNINGS = -Wall -Wno-comment -Wno-error
+-CFLAGS += $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
+-#CFLAGS+= $(shell if uname -m | grep -q 86; then echo "-mpentium" ; fi)
+-
+-#fix for PPC processors and ALPHA, And UltraSparc too
+-ifneq ($(OSARCH),Darwin)
+-ifneq ($(findstring BSD,${OSARCH}),BSD)
+-ifneq ($(PROC),ppc)
+-ifneq ($(PROC),x86_64)
+-ifneq ($(PROC),alpha)
+-#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.
+-#So we go lowest common available by gcc and go a step down, still a step up from
+-#the default as we now have a better instruction set to work with. - Belgarath
+-ifeq ($(PROC),ultrasparc)
+-        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
+-else
+-        CFLAGS+= -march=$(PROC)
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
++CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
+ 
+ LIB = $(LIB_TARGET_DIR)/liblpc10.a
+