summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/lm-sensors')
-rw-r--r--sys-apps/lm-sensors/ChangeLog6
-rw-r--r--sys-apps/lm-sensors/files/lm-sensors-2.6.5-hk-longstring.patch31
-rw-r--r--sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild3
3 files changed, 38 insertions, 2 deletions
diff --git a/sys-apps/lm-sensors/ChangeLog b/sys-apps/lm-sensors/ChangeLog
index 0039dbfe0619..bc0a73dc38a1 100644
--- a/sys-apps/lm-sensors/ChangeLog
+++ b/sys-apps/lm-sensors/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/lm-sensors
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.31 2004/07/12 15:07:34 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/ChangeLog,v 1.32 2004/07/12 15:27:53 plasmaroo Exp $
+
+ 12 Jul 2004; <plasmaroo@gentoo.org> lm-sensors-2.6.5.ebuild,
+ +files/lm-sensors-2.6.5-hk-longstring.patch:
+ Added a compile fix for lm-sensors-2.6.5 on newer GCCs. Closes bug #50635.
*lm-sensors-2.8.7 (12 Jul 2004)
diff --git a/sys-apps/lm-sensors/files/lm-sensors-2.6.5-hk-longstring.patch b/sys-apps/lm-sensors/files/lm-sensors-2.6.5-hk-longstring.patch
new file mode 100644
index 000000000000..6aa4e07cf87f
--- /dev/null
+++ b/sys-apps/lm-sensors/files/lm-sensors-2.6.5-hk-longstring.patch
@@ -0,0 +1,31 @@
+diff -ruN lm_sensors-2.6.5.orig/kernel/busses/i2c-ali1535.c lm_sensors-2.6.5/kernel/busses/i2c-ali1535.c
+--- lm_sensors-2.6.5.orig/kernel/busses/i2c-ali1535.c 2002-06-08 21:49:06.000000000 +0200
++++ lm_sensors-2.6.5/kernel/busses/i2c-ali1535.c 2004-05-08 20:13:32.000000000 +0200
+@@ -672,8 +672,7 @@
+ #ifdef MODULE
+
+ MODULE_AUTHOR
+- ("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>,
+- Mark D. Studebaker <mdsxyz123@yahoo.com> and Dan Eaton <dan.eaton@rocketlogix.com>");
++ ("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>, Mark D. Studebaker <mdsxyz123@yahoo.com> and Dan Eaton <dan.eaton@rocketlogix.com>");
+ MODULE_DESCRIPTION("ALI1535 SMBus driver");
+
+ int init_module(void)
+diff -ruN lm_sensors-2.6.5.orig/kernel/chips/lm87.c lm_sensors-2.6.5/kernel/chips/lm87.c
+--- lm_sensors-2.6.5.orig/kernel/chips/lm87.c 2002-02-09 23:36:26.000000000 +0100
++++ lm_sensors-2.6.5/kernel/chips/lm87.c 2004-05-08 20:20:14.000000000 +0200
+@@ -1060,10 +1060,10 @@
+ #endif
+
+ MODULE_AUTHOR
+- ("Frodo Looijaard <frodol@dds.nl>,
+- Philip Edelbrock <phil@netroedge.com>,
+- Mark Studebaker <mdsxyz123@yahoo.com>,
+- and Stephen Rousset <stephen.rousset@rocketlogix.com>");
++ ("Frodo Looijaard <frodol@dds.nl>, "
++ "Philip Edelbrock <phil@netroedge.com>, "
++ "Mark Studebaker <mdsxyz123@yahoo.com>, "
++ "and Stephen Rousset <stephen.rousset@rocketlogix.com>");
+
+ MODULE_DESCRIPTION("LM87 driver");
+
diff --git a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild b/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
index 9d65c5c71cf4..8204c40adc7d 100644
--- a/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-2.6.5.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/lm-sensors/lm-sensors-2.6.5.ebuild,v 1.10 2004/06/30 17:36:56 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm-sensors/lm-sensors-2.6.5.ebuild,v 1.11 2004/07/12 15:27:53 plasmaroo Exp $
inherit flag-o-matic eutils
@@ -22,6 +22,7 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/no-isadump-ppc.patch
+ epatch ${FILESDIR}/${P}-hk-longstring.patch || die "Failed to apply GCC 3.3 compilation patch!"
}
src_compile() {