summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-01-13 22:18:48 +0000
committerMike Frysinger <vapier@gentoo.org>2014-01-13 22:18:48 +0000
commit56e3bb206687f47c6bf6689c3b5b283017629235 (patch)
treea0cf7968b0b45eca0e8437e936b95073af72ad41 /sys-apps/iotools
parentCut over to new configure flags rather than set ac_cv_xxx vars directly #4978... (diff)
downloadgentoo-2-56e3bb206687f47c6bf6689c3b5b283017629235.tar.gz
gentoo-2-56e3bb206687f47c6bf6689c3b5b283017629235.tar.bz2
gentoo-2-56e3bb206687f47c6bf6689c3b5b283017629235.zip
Add arm/ppc keywords and mark amd64/x86 stable #497846 by David Hendricks.
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'sys-apps/iotools')
-rw-r--r--sys-apps/iotools/ChangeLog7
-rw-r--r--sys-apps/iotools/iotools-1.5.ebuild16
2 files changed, 15 insertions, 8 deletions
diff --git a/sys-apps/iotools/ChangeLog b/sys-apps/iotools/ChangeLog
index 6af4335836e7..69b6447c46ac 100644
--- a/sys-apps/iotools/ChangeLog
+++ b/sys-apps/iotools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/iotools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/ChangeLog,v 1.5 2013/04/23 18:31:41 vapier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/ChangeLog,v 1.6 2014/01/13 22:18:48 vapier Exp $
+
+ 13 Jan 2014; Mike Frysinger <vapier@gentoo.org> iotools-1.5.ebuild:
+ Add arm/ppc keywords and mark amd64/x86 stable #497846 by David Hendricks.
*iotools-1.5 (23 Apr 2013)
diff --git a/sys-apps/iotools/iotools-1.5.ebuild b/sys-apps/iotools/iotools-1.5.ebuild
index bab503af02d8..eeba0b6a86a0 100644
--- a/sys-apps/iotools/iotools-1.5.ebuild
+++ b/sys-apps/iotools/iotools-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/iotools-1.5.ebuild,v 1.1 2013/04/23 18:31:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iotools/iotools-1.5.ebuild,v 1.2 2014/01/13 22:18:48 vapier Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://iotools.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="static make-symlinks"
src_prepare() {
@@ -31,11 +31,15 @@ src_install() {
# Note: This is done manually because invoking the iotools binary
# when cross-compiling will likely fail.
- local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 rdmsr rdtsc runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock wrmsr xor"
+ local known_cmds="and btr bts busy_loop cmos_read cmos_write cpu_list mem_dump mem_read16 mem_read32 mem_read64 mem_read8 mem_write16 mem_write32 mem_write64 mem_write8 mmio_dump mmio_read16 mmio_read32 mmio_read64 mmio_read8 mmio_write16 mmio_write32 mmio_write64 mmio_write8 not or pci_list pci_read16 pci_read32 pci_read8 pci_write16 pci_write32 pci_write8 runon shl shr smbus_quick smbus_read16 smbus_read8 smbus_readblock smbus_receive_byte smbus_send_byte smbus_write16 smbus_write8 smbus_writeblock xor"
+ case ${ARCH} in
+ amd64|x86) known_cmds+=" cpuid io_read16 io_read32 io_read8 io_write16 io_write32 io_write8 rdmsr rdtsc wrmsr";;
+ esac
if ! tc-is-cross-compiler ; then
+ local sorted_cmds=$(echo $(printf '%s\n' ${known_cmds} | LC_ALL=C sort))
local check_cmds=$(echo $(./iotools --list-cmds 2>/dev/null | grep '^ ' | LC_ALL=C sort))
- if [[ ${known_cmds} != "${check_cmds:-${known_cmds}}" ]] ; then
- eerror "known_cmds = ${known_cmds}"
+ if [[ ${sorted_cmds} != "${check_cmds:-${sorted_cmds}}" ]] ; then
+ eerror "known_cmds = ${sorted_cmds}"
eerror "check_cmds = ${check_cmds}"
die "need to update known_cmds cache in the ebuild"
fi