Added workaround for gcc-3.4 broken/unsupported static inline handling on x86 (bug #76707)

4 files changed, 63 insertions, 5 deletions

diff --git a/net-misc/zaptel/ChangeLog b/net-misc/zaptel/ChangeLog
index 87058e6e9981..ae56148c57df 100644
--- a/net-misc/zaptel/ChangeLog
+++ b/net-misc/zaptel/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/zaptel
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.21 2005/01/05 01:49:19 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/ChangeLog,v 1.22 2005/01/13 21:09:05 stkn Exp $
+
+  13 Jan 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/zaptel-1.0.3-gcc34.patch, zaptel-1.0.3.ebuild:
+  Added workaround for gcc-3.4.x broken/unsupported static inline handling on
+  x86 (bug #76707).
 
   05 Jan 2005; Stefan Knoblich <stkn@gentoo.org> zaptel-1.0.3.ebuild:
   changed the linux-2.6 + devfs warning messages, should be less confusing now...
diff --git a/net-misc/zaptel/Manifest b/net-misc/zaptel/Manifest
index af56e224b15b..44b4c33c7eb7 100644
--- a/net-misc/zaptel/Manifest
+++ b/net-misc/zaptel/Manifest
@@ -1,14 +1,15 @@
 MD5 b11affe4ba04b8f208c9677929a4b93e zaptel-1.0.0.ebuild 3196
-MD5 3f93c72df6f3145e1c47f0fd71d88c74 zaptel-1.0.3.ebuild 3334
+MD5 8bb56905e51e418010024bfb797284fe zaptel-1.0.3.ebuild 3522
 MD5 cfce09091affa8e8668e7a22801ac097 zaptel-1.0.1.ebuild 3186
 MD5 d3af40abe5c1c99dfab1802a906d9942 zaptel-0.7.0.ebuild 1400
 MD5 44cf247f04cc83413fcb40ed59d0847a metadata.xml 248
-MD5 da6fbcabed4c6658738bc179be7c542a ChangeLog 3288
+MD5 3bf529ff03d82f78d2fd6afdad26d503 ChangeLog 3492
 MD5 eaa764a27a800be752aba85a7df8d342 zaptel-1.0.2.ebuild 3127
 MD5 8d66c378ea6b3b3f7bb2ee1fd2b6e51c zaptel-0.9.1.ebuild 3526
 MD5 edef16214c6ea7a0f4b548748b9fcc97 zaptel-0.8.1.ebuild 1347
 MD5 0edad95ac20c6e43ea6ee933e25ac23a files/zaptel-1.0.1-skbuff.diff 564
 MD5 9cf4f1d646d216441b7f4508ac7c0e8b files/digest-zaptel-1.0.0 64
+MD5 9abebf47ce7e7122a184a62e5baed146 files/zaptel-1.0.3-gcc34.patch 1540
 MD5 66c86744220e6716f15393caf0ee408d files/digest-zaptel-1.0.3 64
 MD5 b72142a9b09e32506b88b96706abaeb4 files/zaptel.rc6 903
 MD5 fea918445512e51f2019ff20d78a7926 files/zaptel-install_prefix-typo.patch 486
diff --git a/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch b/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch
new file mode 100644
index 000000000000..d27f7956cd25
--- /dev/null
+++ b/net-misc/zaptel/files/zaptel-1.0.3-gcc34.patch
@@ -0,0 +1,46 @@
+diff -r -u -b -B zaptel-1.0.3.orig/wcfxs.c zaptel-1.0.3/wcfxs.c
+--- zaptel-1.0.3.orig/wcfxs.c	2004-09-15 14:40:16.000000000 -0500
++++ zaptel-1.0.3/wcfxs.c	2005-01-07 14:17:10.000000000 -0600
+@@ -469,9 +469,9 @@
+ 	zt_receive(&wc->span);
+ }
+ 
+-static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card);
+-static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card);
+-static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card);
++static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card);
++static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card);
++static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card);
+ 
+ static void wcfxs_stop_dma(struct wcfxs *wc);
+ static void wcfxs_reset_tdm(struct wcfxs *wc);
+
+--- zaptel-1.0.3/wcfxs.c.orig	2005-01-10 19:33:37.304026336 +0000
++++ zaptel-1.0.3/wcfxs.c	2005-01-10 19:35:11.453713408 +0000
+@@ -1356,7 +1356,7 @@
+ 	return 0;
+ }
+ 
+-static inline void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
++static void wcfxs_proslic_recheck_sanity(struct wcfxs *wc, int card)
+ {
+ 	int res;
+ 	/* Check loopback */
+@@ -1380,7 +1380,7 @@
+ 	}
+ }
+ 
+-static inline void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
++static void wcfxs_voicedaa_check_hook(struct wcfxs *wc, int card)
+ {
+ #ifndef AUDIO_RINGCHECK
+ 	unsigned char res;
+@@ -1524,7 +1524,7 @@
+ 	}
+ }
+ 
+-static inline void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
++static void wcfxs_proslic_check_hook(struct wcfxs *wc, int card)
+ {
+ 	char res;
+ 	int hook;
diff --git a/net-misc/zaptel/zaptel-1.0.3.ebuild b/net-misc/zaptel/zaptel-1.0.3.ebuild
index ad631c8c9bf7..c72efa7cecaf 100644
--- a/net-misc/zaptel/zaptel-1.0.3.ebuild
+++ b/net-misc/zaptel/zaptel-1.0.3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.2 2005/01/05 01:49:19 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/zaptel/zaptel-1.0.3.ebuild,v 1.3 2005/01/13 21:09:05 stkn Exp $
 
 IUSE="devfs26"
 
-inherit eutils kernel-mod
+inherit eutils kernel-mod toolchain-funcs
 
 DESCRIPTION="Pseudo-TDM engine"
 HOMEPAGE="http://www.asterisk.org"
@@ -74,6 +74,12 @@ src_unpack() {
 		einfo "Enabling experimental devfs support for linux-2.6..."
 		epatch ${FILESDIR}/${PN}-1.0.0-experimental-devfs26.diff
 	fi
+
+	# apply patch for gcc-3.4.x if that's the compiler in use...
+	# fixes (#76707)
+	if use x86 && [[ `gcc-version` = "3.4" ]]; then
+		epatch ${FILESDIR}/${P}-gcc34.patch
+	fi
 }
 
 src_compile() {