[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtester/files/, sys-apps/memtester/

[David Seifert]

commit:     dca74e8493fee4b80a20d44c281feb9a20894d78
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 00:18:13 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 00:18:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dca74e84

sys-apps/memtester: Port to EAPI 7

Closes: https://bugs.gentoo.org/708052
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../memtester-4.3.0-fix-gcc10-fno-common.patch     | 31 ++++++++++++++++++++++
 sys-apps/memtester/memtester-4.3.0.ebuild          | 16 ++++++-----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
new file mode 100644
index 00000000000..8bb58e5771c
--- /dev/null
+++ b/sys-apps/memtester/files/memtester-4.3.0-fix-gcc10-fno-common.patch
@@ -0,0 +1,31 @@
+--- a/tests.c
++++ b/tests.c
+@@ -27,6 +27,9 @@
+ #define PROGRESSOFTEN 2500
+ #define ONE 0x00000001L
+ 
++union mword8_type mword8;
++union mword16_type mword16;
++
+ /* Function definitions. */
+ 
+ int compare_regions(ulv *bufa, ulv *bufb, size_t count) {
+--- a/types.h
++++ b/types.h
+@@ -25,12 +25,12 @@
+     int (*fp)();
+ };
+ 
+-union {
++union mword8_type {
+     unsigned char bytes[UL_LEN/8];
+     ul val;
+-} mword8;
++};
+ 
+-union {
++union mword16_type {
+     unsigned short u16s[UL_LEN/16];
+     ul val;
+-} mword16;
++};

diff --git a/sys-apps/memtester/memtester-4.3.0.ebuild b/sys-apps/memtester/memtester-4.3.0.ebuild
index 56a07613ef1..cccff64b5d4 100644
--- a/sys-apps/memtester/memtester-4.3.0.ebuild
+++ b/sys-apps/memtester/memtester-4.3.0.ebuild
@@ -1,23 +1,25 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="userspace utility for testing the memory subsystem for faults"
 HOMEPAGE="http://pyropus.ca/software/memtester/"
-SRC_URI="http://pyropus.ca/software/memtester/${P}.tar.gz
+SRC_URI="
+	http://pyropus.ca/software/memtester/${P}.tar.gz
 	http://pyropus.ca/software/memtester/old-versions/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
 
-src_prepare() {
-	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-fix-gcc10-fno-common.patch )
+
+src_configure() {
+	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
+	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die
 }
 
 src_install() {