Added a patch that fixes a gcc-3.3.x compile issue. Closes Bug #28614

4 files changed, 34 insertions, 4 deletions

diff --git a/net-misc/bcm4400/ChangeLog b/net-misc/bcm4400/ChangeLog
index eeacd30404c3..f12cdabd4548 100644
--- a/net-misc/bcm4400/ChangeLog
+++ b/net-misc/bcm4400/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for net-misc/bcm4400
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.4 2003/07/13 14:31:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/ChangeLog,v 1.5 2003/10/02 08:24:16 kumba Exp $
+
 
 *bcm4400-1.0.1 (Jan 18 2003)
 
+  02 Oct 2003; Joshua Kinard <kumba@gentoo.org> bcm4400-1.0.1.ebuild,
+  files/bcm4400-1.0.1-gcc33-fix.patch:
+  Added a patch to the ebuild that fixes a gcc-3.3 issue.  Closes Bug #28614.
+
   18 Jan 2003; Seth Chandler <sethbc@gentoo.org> bcm4400-1.0.1.ebuild :
   initial import into portage
diff --git a/net-misc/bcm4400/Manifest b/net-misc/bcm4400/Manifest
index b581ede4a4b5..a26f2fecd188 100644
--- a/net-misc/bcm4400/Manifest
+++ b/net-misc/bcm4400/Manifest
@@ -1,4 +1,4 @@
-MD5 5c773d662acf6e6a6d7a44544fd29eb4 ChangeLog 533
-MD5 ce4c111589c6850e820efccd2ec9fcb4 bcm4400-1.0.1.ebuild 793
+MD5 396601e8ef2c103c6e0ce4a9a782d0f1 ChangeLog 534
+MD5 7b21d08450b3c32282167ded8d7ba0fd bcm4400-1.0.1.ebuild 794
 MD5 0e4dcb709292a0e3ad8dc1c8b0007a70 files/digest-bcm4400-1.0.1 64
 MD5 5d8babff662bb7839a483a6b60c6bd95 files/bcm4400-1.0.1-gcc33-fix.patch 786
diff --git a/net-misc/bcm4400/bcm4400-1.0.1.ebuild b/net-misc/bcm4400/bcm4400-1.0.1.ebuild
index 0e2d6c736581..a465e5a049cf 100644
--- a/net-misc/bcm4400/bcm4400-1.0.1.ebuild
+++ b/net-misc/bcm4400/bcm4400-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-1.0.1.ebuild,v 1.6 2003/07/13 14:31:35 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/bcm4400/bcm4400-1.0.1.ebuild,v 1.7 2003/10/02 08:24:16 kumba Exp $
 
 SRC_URI="http://www.nodomain.org/bcm4400-1.0.1.tar.gz"
 DESCRIPTION="Driver for the bcm4400 gigabit card (in the form of kernel modules)."
@@ -12,8 +12,17 @@ KEYWORDS="x86"
 
 S=${WORKDIR}/src
 
+src_unpack() {
+	unpack ${A}
+
+	# Patch to fix gcc-3.3.x issues.
+	# Closes Bug #28614
+	epatch ${FILESDIR}/${P}-gcc33-fix.patch
+}
+
 src_compile() {
 	check_KV
+
 	mv Makefile Makefile.orig
 	sed -e "s|\`uname -r\`|$KV|" \
 		< Makefile.orig > Makefile
diff --git a/net-misc/bcm4400/files/bcm4400-1.0.1-gcc33-fix.patch b/net-misc/bcm4400/files/bcm4400-1.0.1-gcc33-fix.patch
new file mode 100644
index 000000000000..d5746228052b
--- /dev/null
+++ b/net-misc/bcm4400/files/bcm4400-1.0.1-gcc33-fix.patch
@@ -0,0 +1,16 @@
+--- src/b44.h	2003-09-15 13:59:32.000000000 +0000
++++ src/b44.h.patched	2003-09-15 14:00:07.000000000 +0000
+@@ -1079,10 +1079,10 @@
+ /******************************************************************************/
+ 
+ #define REG_RD(pDevice, OffsetName)                                         \
+-        __raw_readl(&((pDevice)->pMemView->##OffsetName))
++        __raw_readl(&((pDevice)->pMemView->OffsetName))
+ 
+ #define REG_WR(pDevice, OffsetName, Value32)                                \
+-        (void) __raw_writel(Value32, &((pDevice)->pMemView->##OffsetName))
++        (void) __raw_writel(Value32, &((pDevice)->pMemView->OffsetName))
+ 
+ #define REG_RD_OFFSET(pDevice, Offset)                                      \
+     __raw_readl(((LM_UINT8 *) (pDevice)->pMemView + Offset))
+