diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-30 01:11:30 +0000 |
commit | 76dfef0cec9170000357d2f354e412daf48941fc (patch) | |
tree | 56647120c0ee20ab3494475c86722034cd194b02 /app-benchmarks/nbench | |
parent | ccf84bcd604130256d1377cd58f0a634ae6ee20f (diff) |
gentoo resync : 30.12.2017
Diffstat (limited to 'app-benchmarks/nbench')
-rw-r--r-- | app-benchmarks/nbench/Manifest | 4 | ||||
-rw-r--r-- | app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch | 61 | ||||
-rw-r--r-- | app-benchmarks/nbench/nbench-2.2.3-r1.ebuild | 18 |
3 files changed, 70 insertions, 13 deletions
diff --git a/app-benchmarks/nbench/Manifest b/app-benchmarks/nbench/Manifest index 8aa92f5dd11f..bcfa59f014eb 100644 --- a/app-benchmarks/nbench/Manifest +++ b/app-benchmarks/nbench/Manifest @@ -1,4 +1,4 @@ -AUX nbench-2.2.3-Makefile.patch 709 BLAKE2B a83f2ca3ba4d01d96e3c684d04db8d87f90c0b24819007a5a352ce8e9e8dae35205aa2f99135ce23a89a796fa54f7fa5a78106c234bca4a050108c1276e1fa5a SHA512 f2d30abaf00baba8afc01c921dac5cc493ad98bf6c76d3cb203444a991519bbbfe521cfdc5aa7cd4f6ffd5cd89e9d13dcce30a84675f1715687e1e1ba8e95198 +AUX nbench-2.2.3-Makefile.patch 2616 BLAKE2B 60ac4ec24c7787ebf4c0f76c25c1ad1afcc96818a9c2c6dd6f5fb8b04de6ff6d3a6832f030c0f7cc7ddbebeca647bf129009926d7a550a7299b2f81e26cbef61 SHA512 9d5df03ec62ca535ae432a3644ae7903f0d8520d86d9bf16d3e715fabf63e124230ddd8f735f03599592a02bac4f06f95fdf427923fe54150bfb05f553011815 DIST nbench-byte-2.2.3.tar.gz 111791 BLAKE2B 83b602f582af32fbf8e2440cf597e8fb605fba5e0c7e5ae070e4e759ad00ee86022123c7a8a5957382a03bb4c7450aa1a2633e8d98fc86d03ea52e7a8f2895ce SHA512 68ae34c083e2e01f0114e6ff9ce04df41d70facbb05533b4cb9432fd9856048fde28e5c024d92f202e5f2de10fe223fdb46570873b1e2f69b2c847779645dec8 -EBUILD nbench-2.2.3-r1.ebuild 1014 BLAKE2B 69c10d5476f7eca84bb14c605b5b73556277d623c19b55aa2b7f8a4b78983614a98f269fba03c0620d673868271a990ed14f906a549db9e8efca77281487f7da SHA512 133757ee20e26bcae413cd5bd74c0c4771a7dc6df8cf706deed52d349201f3996a52cd7ea296f4f1efea08d4b9a4765c705958cf717528f11a1e45810b56be2e +EBUILD nbench-2.2.3-r1.ebuild 952 BLAKE2B b3308cbcfcc7d2487efaed4eb665f6ac56c1f028b305d9c58d48e7bf58ccbe8f38e6a6056ba564883ba1da071f52ab74e35efb311484de85eabd487180027694 SHA512 e0af98ec3324dd2bf252f1b0054ac69f109f3ab71be8bb9f3fe615755df3b475b228a1d24a5d249a57f9860637167cda3ccf5d7f20e7c8e4be6914f61d2410d8 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch index c41fd07557b7..b853fc7b65ad 100644 --- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch +++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch @@ -1,5 +1,5 @@ ---- Makefile.org 2004-12-30 03:23:30.000000000 +0100 -+++ Makefile 2009-12-14 13:31:18.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -19,10 +19,10 @@ # You should leave -static in the CFLAGS so that your sysinfo can be # compiled into the executable. @@ -13,12 +13,65 @@ # if your gcc lets you do it, then try this one #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops -@@ -126,7 +126,7 @@ +@@ -96,10 +96,10 @@ + ########################################################################## + # For LINUX-like systems with gcc + sysinfoc.c: Makefile +- ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) ++ ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) + + sysinfo.c: Makefile +- ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) ++ ./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) + + ########################################################################## + # For non-LINUX systems +@@ -107,39 +107,39 @@ + # and take sysinfo.c and sysinfoc.c out of the dependencies for nbench0.o + + hardware.o: hardware.c hardware.h Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -c hardware.c + + nbench0.o: nbench0.h nbench0.c nmglobal.h pointer.h hardware.h\ + Makefile sysinfo.c sysinfoc.c +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -c nbench0.c + + emfloat.o: emfloat.h emfloat.c nmglobal.h pointer.h Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -c emfloat.c + + pointer.h: pointer Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -o pointer pointer.c + rm -f pointer.h if [ "4" = `./pointer` ] ; then touch pointer.h ;\ else echo "#define LONG64" >pointer.h ; fi -misc.o: misc.h misc.c Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ +misc.o: misc.h misc.c pointer.h Makefile - $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ -c misc.c + nbench1.o: nbench1.h nbench1.c wordcat.h nmglobal.h pointer.h Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -c nbench1.c + + sysspec.o: sysspec.h sysspec.c nmglobal.h pointer.h Makefile +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\ + -c sysspec.c + + nbench: emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o +- $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(LINKFLAGS)\ ++ $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\ + emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o\ + -o nbench -lm + diff --git a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild index d8b2ba1301cd..2954671d7f89 100644 --- a/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild +++ b/app-benchmarks/nbench/nbench-2.2.3-r1.ebuild @@ -1,11 +1,12 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=6 -inherit eutils toolchain-funcs +inherit toolchain-funcs MY_P="${PN}-byte-${PV}" + DESCRIPTION="Linux/Unix of release 2 of BYTE Magazine's BYTEmark benchmark" HOMEPAGE="http://www.tux.org/~mayer/linux/bmark.html" SRC_URI="http://www.tux.org/~mayer/linux/${MY_P}.tar.gz" @@ -16,9 +17,11 @@ KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sh sparc x86" IUSE="" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}/${P}-Makefile.patch" ) src_prepare() { - epatch "${FILESDIR}/${P}-Makefile.patch" + default + sed \ -e 's:$compiler -v\( 2>&1 | sed -e "/version/!d"\|\):$compiler -dumpversion:' \ -i sysinfo.sh || die "patching sysinfo.sh failed" @@ -26,13 +29,14 @@ src_prepare() { -i nbench1.h || die "patching nbench1.h failed" } -src_compile() { - emake LINKFLAGS="${LDFLAGS}" CC=$(tc-getCC) CFLAGS="${CFLAGS}" || die "make failed" +src_configure() { + tc-export CC } src_install() { dobin nbench + dodoc Changes README* bdoc.txt + insinto /usr/share/nbench doins NNET.DAT - dodoc Changes README* bdoc.txt } |