Add patch to fix gcc-3.4.x building #74538 by splite.

7 files changed, 39 insertions, 6 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index b41efe495f68..2f4d7d69ccd3 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.73 2004/12/08 03:00:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.74 2004/12/23 23:21:01 vapier Exp $
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/modutils-2.4.27-gcc34.patch, module-init-tools-3.0-r2.ebuild,
+  module-init-tools-3.1.ebuild:
+  Add patch to fix gcc-3.4.x building #74538 by splite.
 
   07 Dec 2004; Mike Frysinger <vapier@gentoo.org>
   +files/modutils-2.4.27-PATH_MAX.patch, module-init-tools-3.1.ebuild:
diff --git a/sys-apps/module-init-tools/files/modutils-2.4.27-gcc34.patch b/sys-apps/module-init-tools/files/modutils-2.4.27-gcc34.patch
new file mode 100644
index 000000000000..83a27cc3ab25
--- /dev/null
+++ b/sys-apps/module-init-tools/files/modutils-2.4.27-gcc34.patch
@@ -0,0 +1,10 @@
+--- obj/obj_ia64.c.orig	2003-03-12 22:39:45.000000000 -0500
++++ obj/obj_ia64.c	2004-12-15 14:47:05.813475138 -0500
+@@ -127,6 +127,7 @@
+ 	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
+ 
+     default:
++	;
+     }
+     return (-1);
+ }
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
index 35cf11136886..01e70569e8d7 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.11 2004/10/03 10:05:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.12 2004/12/23 23:21:01 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 
@@ -39,6 +39,7 @@ src_unpack() {
 	if ! use no-old-linux ; then
 		cd ${WORKDIR}/modutils-${MODUTILS_PV}
 		epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
 	fi
 
 	# Support legacy .o modules
diff --git a/sys-apps/module-init-tools/module-init-tools-3.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.1.ebuild
index 31e71b7a8a23..86acd3eef6e8 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.1.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.1.ebuild,v 1.4 2004/12/08 03:00:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.1.ebuild,v 1.5 2004/12/23 23:21:01 vapier Exp $
 
 inherit flag-o-matic eutils gnuconfig toolchain-funcs
 
@@ -38,6 +38,7 @@ src_unpack() {
 		cd ${WORKDIR}/modutils-${MODUTILS_PV}
 		epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
 		epatch ${FILESDIR}/modutils-2.4.27-PATH_MAX.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
 	fi
 
 	# Support legacy .o modules
diff --git a/sys-apps/modutils/ChangeLog b/sys-apps/modutils/ChangeLog
index 88b38be85ada..444c0708cddf 100644
--- a/sys-apps/modutils/ChangeLog
+++ b/sys-apps/modutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/modutils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.44 2004/09/03 21:03:24 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/ChangeLog,v 1.45 2004/12/23 23:16:36 vapier Exp $
+
+  23 Dec 2004; Mike Frysinger <vapier@gentoo.org> +files/2.4.27-gcc34.patch,
+  modutils-2.4.27.ebuild:
+  Add patch to fix gcc-3.4.x building #74538 by splite.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   modutils-2.4.23.ebuild:
diff --git a/sys-apps/modutils/files/2.4.27-gcc34.patch b/sys-apps/modutils/files/2.4.27-gcc34.patch
new file mode 100644
index 000000000000..83a27cc3ab25
--- /dev/null
+++ b/sys-apps/modutils/files/2.4.27-gcc34.patch
@@ -0,0 +1,10 @@
+--- obj/obj_ia64.c.orig	2003-03-12 22:39:45.000000000 -0500
++++ obj/obj_ia64.c	2004-12-15 14:47:05.813475138 -0500
+@@ -127,6 +127,7 @@
+ 	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
+ 
+     default:
++	;
+     }
+     return (-1);
+ }
diff --git a/sys-apps/modutils/modutils-2.4.27.ebuild b/sys-apps/modutils/modutils-2.4.27.ebuild
index dcc34170a9f0..dcab236ceda6 100644
--- a/sys-apps/modutils/modutils-2.4.27.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.2 2004/09/02 13:20:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/modutils/modutils-2.4.27.ebuild,v 1.3 2004/12/23 23:16:36 vapier Exp $
 
-inherit flag-o-matic eutils
+inherit eutils
 
 DESCRIPTION="Standard kernel module utilities"
 HOMEPAGE="http://www.kernel.org/pub/linux/utils/kernel/modutils/"
@@ -22,6 +22,8 @@ src_unpack() {
 
 	EPATCH_OPTS="-d ${S}/util" \
 	epatch ${FILESDIR}/alias.h.diff
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc34.patch
 }
 
 src_compile() {