| 1 |
commit: 97d96cb9abc4c281350ada9260dbf36c0141564e |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 28 12:14:11 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 28 12:49:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d96cb9 |
| 7 |
|
| 8 |
app-benchmarks/nbench: [QA] Port to EAPI 6 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../nbench/files/nbench-2.2.3-Makefile.patch | 61 ++++++++++++++++++++-- |
| 13 |
app-benchmarks/nbench/nbench-2.2.3-r1.ebuild | 18 ++++--- |
| 14 |
2 files changed, 68 insertions(+), 11 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch |
| 17 |
index c41fd07557b..b853fc7b65a 100644 |
| 18 |
--- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch |
| 19 |
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch |
| 20 |
@@ -1,5 +1,5 @@ |
| 21 |
---- Makefile.org 2004-12-30 03:23:30.000000000 +0100 |
| 22 |
-+++ Makefile 2009-12-14 13:31:18.000000000 +0100 |
| 23 |
+--- a/Makefile |
| 24 |
++++ b/Makefile |
| 25 |
@@ -19,10 +19,10 @@ |
| 26 |
# You should leave -static in the CFLAGS so that your sysinfo can be |
| 27 |
# compiled into the executable. |
| 28 |
@@ -13,12 +13,65 @@ |
| 29 |
|
| 30 |
# if your gcc lets you do it, then try this one |
| 31 |
#CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops |
| 32 |
-@@ -126,7 +126,7 @@ |
| 33 |
+@@ -96,10 +96,10 @@ |
| 34 |
+ ########################################################################## |
| 35 |
+ # For LINUX-like systems with gcc |
| 36 |
+ sysinfoc.c: Makefile |
| 37 |
+- ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) |
| 38 |
++ ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) |
| 39 |
+ |
| 40 |
+ sysinfo.c: Makefile |
| 41 |
+- ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) |
| 42 |
++ ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) |
| 43 |
+ |
| 44 |
+ ########################################################################## |
| 45 |
+ # For non-LINUX systems |
| 46 |
+@@ -107,39 +107,39 @@ |
| 47 |
+ # and take sysinfo.c and sysinfoc.c out of the dependencies for nbench0.o |
| 48 |
+ |
| 49 |
+ hardware.o: hardware.c hardware.h Makefile |
| 50 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 51 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 52 |
+ -c hardware.c |
| 53 |
+ |
| 54 |
+ nbench0.o: nbench0.h nbench0.c nmglobal.h pointer.h hardware.h\ |
| 55 |
+ Makefile sysinfo.c sysinfoc.c |
| 56 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 57 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 58 |
+ -c nbench0.c |
| 59 |
+ |
| 60 |
+ emfloat.o: emfloat.h emfloat.c nmglobal.h pointer.h Makefile |
| 61 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 62 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 63 |
+ -c emfloat.c |
| 64 |
+ |
| 65 |
+ pointer.h: pointer Makefile |
| 66 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 67 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 68 |
+ -o pointer pointer.c |
| 69 |
+ rm -f pointer.h |
| 70 |
if [ "4" = `./pointer` ] ; then touch pointer.h ;\ |
| 71 |
else echo "#define LONG64" >pointer.h ; fi |
| 72 |
|
| 73 |
-misc.o: misc.h misc.c Makefile |
| 74 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 75 |
+misc.o: misc.h misc.c pointer.h Makefile |
| 76 |
- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 77 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 78 |
-c misc.c |
| 79 |
|
| 80 |
+ nbench1.o: nbench1.h nbench1.c wordcat.h nmglobal.h pointer.h Makefile |
| 81 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 82 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 83 |
+ -c nbench1.c |
| 84 |
+ |
| 85 |
+ sysspec.o: sysspec.h sysspec.c nmglobal.h pointer.h Makefile |
| 86 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ |
| 87 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ |
| 88 |
+ -c sysspec.c |
| 89 |
+ |
| 90 |
+ nbench: emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o |
| 91 |
+- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(LINKFLAGS)\ |
| 92 |
++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\ |
| 93 |
+ emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o\ |
| 94 |
+ -o nbench -lm |
| 95 |
+ |
| 96 |
|
| 97 |
diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild |
| 98 |
index d8b2ba1301c..2954671d7f8 100644 |
| 99 |
--- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild |
| 100 |
+++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild |
| 101 |
@@ -1,11 +1,12 @@ |
| 102 |
-# Copyright 1999-2010 Gentoo Foundation |
| 103 |
+# Copyright 1999-2017 Gentoo Foundation |
| 104 |
# Distributed under the terms of the GNU General Public License v2 |
| 105 |
|
| 106 |
-EAPI="2" |
| 107 |
+EAPI=6 |
| 108 |
|
| 109 |
-inherit eutils toolchain-funcs |
| 110 |
+inherit toolchain-funcs |
| 111 |
|
| 112 |
MY_P="${PN}-byte-${PV}" |
| 113 |
+ |
| 114 |
DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark" |
| 115 |
HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html" |
| 116 |
SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz" |
| 117 |
@@ -16,9 +17,11 @@ KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86" |
| 118 |
IUSE="" |
| 119 |
|
| 120 |
S=${WORKDIR}/${MY_P} |
| 121 |
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" ) |
| 122 |
|
| 123 |
src_prepare() { |
| 124 |
- epatch "${FILESDIR}/${P}-Makefile.patch" |
| 125 |
+ default |
| 126 |
+ |
| 127 |
sed \ |
| 128 |
-e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \ |
| 129 |
-i sysinfo.sh || die "patching sysinfo.sh failed" |
| 130 |
@@ -26,13 +29,14 @@ src_prepare() { |
| 131 |
-i nbench1.h || die "patching nbench1.h failed" |
| 132 |
} |
| 133 |
|
| 134 |
-src_compile() { |
| 135 |
- emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed" |
| 136 |
+src_configure() { |
| 137 |
+ tc-export CC |
| 138 |
} |
| 139 |
|
| 140 |
src_install() { |
| 141 |
dobin nbench |
| 142 |
+ dodoc Changes README* bdoc.txt |
| 143 |
+ |
| 144 |
insinto /usr/share/nbench |
| 145 |
doins NNET.DAT |
| 146 |
- dodoc Changes README* bdoc.txt |
| 147 |
} |
Archives