summaryrefslogtreecommitdiff
path: root/sys-apps/iotools
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/iotools')
-rw-r--r--sys-apps/iotools/Manifest3
-rw-r--r--sys-apps/iotools/files/iotools-1.5-makefile.patch11
-rw-r--r--sys-apps/iotools/iotools-1.5.ebuild12
3 files changed, 18 insertions, 8 deletions
diff --git a/sys-apps/iotools/Manifest b/sys-apps/iotools/Manifest
index 0864a5871147..648e9e64acc6 100644
--- a/sys-apps/iotools/Manifest
+++ b/sys-apps/iotools/Manifest
@@ -1,3 +1,4 @@
+AUX iotools-1.5-makefile.patch 351 BLAKE2B 756e8f49e137bebef521a3ac87b6da503e5c3331875afb33fdacdc81fffd2a24abbf4d568928e93ed64c3e219f3578676232993c8c83d84a97e61773644b4da4 SHA512 c1df3aa0f4c5b08af5d2dec14551eef122d274f0f6aa55446f488318b68e581b93226676134fc62dc6da37851eaee6ad110fbab926a7b720fca7f0701ac34429
DIST iotools-1.5.tar.gz 23422 BLAKE2B 7d647a32e0289e6b85055252eb6ccf9bdb71b99ebdec7e0c1de0d60157c7401e462a07422e0dd25fb3aec42744be981cd927a4c359b577a764acef331bd42bbe SHA512 d298343ee814c8b7d8404bc6af4050df730e89963a7c53798b3d251e94fd2b13e04c36e6da7ec5fd4126ea3a961be26a937910f791844e1b1d5b7dc5aa638c44
-EBUILD iotools-1.5.ebuild 1896 BLAKE2B 74f6f32431484f95a5fcb3647f16bdd472d22cd124fa18838bfa3a66c0b3b9972bbc0a916760088c4ccf33273e3ae7f150dfdeac47dcfa832e28136c83acaf18 SHA512 befe48aa95a4d6d177d0fd2ea8a3e967bb37ae1f39bf4f46d5977304119ea35e3346d79c73ee1a475b48089b71e6b43d96e33eb78c79ab17921cef913657bdef
+EBUILD iotools-1.5.ebuild 1875 BLAKE2B f8014f9f5f6209d422cf084d5a4e865f89ba0389ac27a9ea41e1d1ee81114a2c65e94c318a81a653afc9997054754fe49a310be8b5a8507410e6e9d948c52a37 SHA512 29c7d1af5e5e949a4142e4728f0111bb27ea4e0a917e0ba1b28d6661680566ce9a3f49aa3d655702031542d89b4ac86fe1ce8c025c202fd1cdaaee1f26572c35
MISC metadata.xml 296 BLAKE2B dd62d3a71a69f58d9c971d17dcc8f3859665b2ad03a6adcb2242c7c58ecd39924478d40f86c8727aa617d2a7957fb5991679d585c4f3ed24278925116789ef91 SHA512 97eee413fc6356dd0c9a7f0eb32bd9a6c9593a0632dc9975ee70b0ef903dfbc2f75538144c0914b70f2a74bcf1ab6ecfd08fb505403a9c5745c243feaf831c73
diff --git a/sys-apps/iotools/files/iotools-1.5-makefile.patch b/sys-apps/iotools/files/iotools-1.5-makefile.patch
new file mode 100644
index 000000000000..79d89f6f6d06
--- /dev/null
+++ b/sys-apps/iotools/files/iotools-1.5-makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,7 @@
+ IOTOOLS_DEBUG = -O2 -DNDEBUG
+ endif
+
+-CFLAGS = -Wall -Werror $(DEFS) $(ARCHFLAGS) $(EXTRA_CFLAGS) \
++CFLAGS = -Wall $(DEFS) $(ARCHFLAGS) $(EXTRA_CFLAGS) \
+ $(IOTOOLS_STATIC) $(IOTOOLS_DEBUG)
+ DEFS = -D_GNU_SOURCE -DVER_MAJOR=$(VER_MAJOR) -DVER_MINOR=$(VER_MINOR)
+ SBINDIR ?= /usr/local/sbin
diff --git a/sys-apps/iotools/iotools-1.5.ebuild b/sys-apps/iotools/iotools-1.5.ebuild
index d508f1263e1a..01ade1d402f3 100644
--- a/sys-apps/iotools/iotools-1.5.ebuild
+++ b/sys-apps/iotools/iotools-1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="4"
+EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Simple commands to access hardware device registers"
HOMEPAGE="https://code.google.com/p/iotools/"
@@ -14,9 +14,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="static make-symlinks"
-src_prepare() {
- sed -i 's:-Werror::' Makefile || die
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
src_compile() {
emake \
@@ -32,7 +30,7 @@ src_install() {
# when cross-compiling will likely fail.
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";;
+ 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))