diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2010-01-19 10:47:57 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2010-01-19 10:47:57 +0000 |
| commit | 09725eb10e2d37b5a762f9ef5177bc44f3fe08a3 (patch) | |
| tree | 915b656e709f57433a54892c511d43c849c47e63 /sys-apps | |
| parent | Keyword ~amd64-linux/~x86-linux (diff) | |
| download | gentoo-2-09725eb10e2d37b5a762f9ef5177bc44f3fe08a3.tar.gz gentoo-2-09725eb10e2d37b5a762f9ef5177bc44f3fe08a3.tar.bz2 gentoo-2-09725eb10e2d37b5a762f9ef5177bc44f3fe08a3.zip | |
fix building with newer kernels (#282261)
(Portage version: 2.2_rc61/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/lm_sensors/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild | 16 | ||||
| -rw-r--r-- | sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild | 14 |
3 files changed, 25 insertions, 13 deletions
diff --git a/sys-apps/lm_sensors/ChangeLog b/sys-apps/lm_sensors/ChangeLog index efd15a9db4a0..be8fb5a8a1cf 100644 --- a/sys-apps/lm_sensors/ChangeLog +++ b/sys-apps/lm_sensors/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/lm_sensors -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.96 2009/11/29 13:13:08 bangert Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/ChangeLog,v 1.97 2010/01/19 10:47:57 bangert Exp $ + + 19 Jan 2010; Thilo Bangert <bangert@gentoo.org> lm_sensors-2.10.7.ebuild, + lm_sensors-2.10.8.ebuild: + fix building with newer kernels (#282261) 29 Nov 2009; Thilo Bangert <bangert@gentoo.org> lm_sensors-3.1.1.ebuild, +files/sensord-3-init.d: diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild index 9512aa7def44..9a6298978cfb 100644 --- a/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild +++ b/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 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.10.7.ebuild,v 1.5 2008/10/18 18:07:40 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.7.ebuild,v 1.6 2010/01/19 10:47:57 bangert Exp $ inherit eutils flag-o-matic linux-info toolchain-funcs multilib @@ -91,9 +91,13 @@ src_compile() { einfo filter-flags -fstack-protector - - emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ - || die "emake user failed" + if kernel_is lt 2 6 31; then + emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ + || die "emake user failed" + else + emake CC=$(tc-getCC) LINUX=${KV_DIR} user \ + || die "emake user failed" + fi } src_install() { @@ -114,7 +118,7 @@ src_install() { dodoc doc/donations doc/fancontrol.txt doc/fan-divisors doc/FAQ \ doc/progs doc/temperature-sensors doc/vid - dohtml doc/lm_sensors-FAQ.html doc/useful_addresses.html + dohtml doc/lm_sensors-FAQ.html docinto busses dodoc doc/busses/* diff --git a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild b/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild index 2bf8f2c608ee..cb8563cc1ab0 100644 --- a/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild +++ b/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.10.8.ebuild,v 1.2 2009/10/17 01:18:04 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/lm_sensors/lm_sensors-2.10.8.ebuild,v 1.3 2010/01/19 10:47:57 bangert Exp $ inherit eutils flag-o-matic linux-info toolchain-funcs multilib @@ -100,9 +100,13 @@ src_compile() { einfo filter-flags -fstack-protector - - emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ - || die "emake user failed" + if kernel_is lt 2 6 31; then + emake CC=$(tc-getCC) LINUX=${KV_DIR} I2C_HEADERS=${KV_DIR}/include user \ + || die "emake user failed" + else + emake CC=$(tc-getCC) LINUX=${KV_DIR} user \ + || die "emake user failed" + fi } src_install() { |