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

Package-Manager: portage-2.0.51.22-r2

9 files changed, 99 insertions, 30 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/Manifest b/net-misc/asterisk/Manifest
index ce4bfb3e1398..cefc6af857ae 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,34 +1,35 @@
-MD5 7e4ecfa9b84cafc2b2092bc94f966adf asterisk-1.0.6-r1.ebuild 13732
-MD5 5cc744bdd69d40d8fb8f1fa069d50d09 asterisk-1.0.5-r2.ebuild 11967
-MD5 c97fbbd601c32b386729e30ba9b5447e asterisk-1.0.8.ebuild 13466
-MD5 0f7448a7a262be597b4e8679088e8555 asterisk-1.0.9.ebuild 13357
+MD5 99727728655bb3e767902287e2c75f14 asterisk-1.0.6-r1.ebuild 13863
+MD5 4e26c63adccf06e09cedcf99e8e1cdb5 asterisk-1.0.7-r1.ebuild 13476
+MD5 bb6b96e813c833c0b375079a15e500c4 asterisk-1.0.8.ebuild 13596
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 539e39faba56805d6395f3b4d8a343c1 ChangeLog 15691
-MD5 37dab9566e364fcf836778be7a8a1bd1 asterisk-1.0.7-r1.ebuild 13346
+MD5 b374720f81a938311ffcf44caa73f391 ChangeLog 16242
+MD5 57c2f9545643c4d2a74e8082731a8f6d asterisk-1.0.9-r1.ebuild 13490
 MD5 df9ea8bc317b80bea6cddc2702ad3e44 asterisk-1.2.0_beta1.ebuild 7976
-MD5 1022b3d9c455f5c247ea695d93eaed39 asterisk-1.0.9-r1.ebuild 13360
-MD5 5d8a088b5a0b3ea1681f4f085ff36299 files/digest-asterisk-1.2.0_beta1 156
-MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
+MD5 56a2bd2650b8eef4517f56e2a7ab8fb6 asterisk-1.0.9.ebuild 13487
+MD5 955c25b1c763ec7419ed1c445537c2c2 asterisk-1.0.5-r2.ebuild 12090
+MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
 MD5 b3bbedde09faea609a0357b21eafa596 files/digest-asterisk-1.0.8 210
-MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r1 210
 MD5 48a3518349e2abfe20fa918a9db5eea2 files/digest-asterisk-1.0.7-r1 210
-MD5 f399592939cd5b43b7851e20744a108e files/digest-asterisk-1.0.6-r1 210
+MD5 97ed00bdccf7c70d5fcbf37580da91c4 files/digest-asterisk-1.0.5-r2 139
 MD5 19916e691993701d9707674f9f046bd6 files/digest-asterisk-1.0.9 210
-MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
-MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
-MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
-MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
-MD5 df56abd9d0dcf307c17c1e1d68b05dfd files/1.0.0/asterisk.rc6.sec 1232
-MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
-MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
+MD5 5d8a088b5a0b3ea1681f4f085ff36299 files/digest-asterisk-1.2.0_beta1 156
+MD5 58b3329253168e6dfb4c8ecbb98aeecd files/digest-asterisk-1.0.9-r1 210
+MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 d8501003cf3148ae662a03866e734481 files/1.0.0/asterisk-1.0.7-manager-cli-segv.patch 4008
+MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
+MD5 0c31aac944f4fdff2b26b446d0d0eef4 files/1.0.0/asterisk-1.0.7-initgroups.diff 1826
+MD5 f20e5b869d5e221194187dd7f504d38b files/1.0.0/asterisk-1.0.5-astcfg-0.0.2.diff 5829
+MD5 ed3f8c9cd712391f76700827322a7aeb files/1.0.0/asterisk-1.0.5-lpc10flags.diff 1254
+MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
+MD5 8929203070b56a9d9204423cc5b3349a files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
 MD5 ab552fbbe803766b5291d61942dbcd9f files/1.0.0/res_perl-1.0.7-bristuff-0.2.0.diff 860
+MD5 a839d8b6b55e3b6ad17b9a7f4be2e6ba files/1.0.0/asterisk-1.0.5-hppa.patch 909
 MD5 85e291d6eb70a24fdc82469ed53bfe54 files/1.0.0/asterisk.confd 283
-MD5 5e1e00b71a830e487787ce48be04ccdc files/1.0.0/asterisk-1.0.8-initgroups.diff 1558
-MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
+MD5 920f8ae54f895cfa46a8a037c865e59a files/1.0.0/asterisk.rc6 517
 MD5 f0fe0308b464c71f83cf2483388c8058 files/1.0.0/asterisk-1.0.1-linux26.diff 474
 MD5 08d718c04e911f465f867577d649d204 files/1.0.0/asterisk-1.0.5-uclibc-dns.diff 304
-MD5 8929203070b56a9d9204423cc5b3349a files/1.0.0/asterisk-1.0.9-weak-references.diff 8406
-MD5 18fb1b2e1fbf2f19e8a9a600eab4c5c8 files/1.0.0/asterisk-1.0.8-callerid.patch 631
-MD5 6a50db2ee46d4139128d0c4225ac071f files/1.0.0/asterisk-uclibc-dns.diff 433
 MD5 38064faca1838d7c57bb26293741f31b files/1.0.0/asterisk-1.0.8-hppa.patch 1274
+MD5 df56abd9d0dcf307c17c1e1d68b05dfd files/1.0.0/asterisk.rc6.sec 1232
+MD5 b2446878d3b46ea595a7994ae8de0499 files/1.0.0/asterisk-1.0.7-scripts.diff 1629
+MD5 1d5c7f8847a95005af3ffb0699bba20f files/1.0.0/asterisk.confd.sec 528
+MD5 93d2e0533a32a38e21f99f278f635266 files/1.0.0/asterisk-1.0.5-speex.diff 1214
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
+