summaryrefslogtreecommitdiff
path: root/app-benchmarks/stress-ng
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-03-03 13:42:34 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-03-03 13:42:34 +0000
commit066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (patch)
tree3cb05783d73b2c33589ba305144a31c718e123cd /app-benchmarks/stress-ng
parent16449a80e28af2209916cc66d19c9a44ca2b90d9 (diff)
gentoo resync : 03.03.2019
Diffstat (limited to 'app-benchmarks/stress-ng')
-rw-r--r--app-benchmarks/stress-ng/Manifest9
-rw-r--r--app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch59
-rw-r--r--app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch (renamed from app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch)20
-rw-r--r--app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild35
-rw-r--r--app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild (renamed from app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild)2
5 files changed, 14 insertions, 111 deletions
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index d8ae3fe1d31f..d0f5a5137c3e 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,7 +1,4 @@
-AUX stress-ng-0.09.47-makefile.patch 1719 BLAKE2B ec889073ac77ee3109d9abbd039388acb2c3924af141a9111b2411e6ca5a721af2f331be03009913bae7aea39044fc1fc5ed7f2cff83b386df8a15c7edab8162 SHA512 f5a567ab766ef4bd473e0e2324cada9b4d63601ce27c310fcf1f24ca051286c72b8f41e666f148542e97ca95691828bd66ee55cbc801e4b8effcf0be46c976d6
-AUX stress-ng-0.09.50-makefile.patch 1714 BLAKE2B 214f285b898da3b004ccd2fb8e7bdee328509aa1a9254aeb196ac836b0fdd04942968f639948a5a2a5d2c18066b6d426020135e11d3663acaaedf12c6fe153b7 SHA512 c83d5e216a5cdd568be1755836b4a385ead1136500c4b4704ad338472de483b5aeb8234f1a9ed184de067e6ec42b864013aec7300a5256bfd953ee7153ac0aca
-DIST stress-ng-0.09.49.tar.xz 369304 BLAKE2B 48b11df90563ec7d09e84e441039366bfca9788af5079ce9bc921370d78371638ff9a9fbaa7e623eefb343b5c19b55a5e4b9bb9688898733c0452b3e2b9549e4 SHA512 b4eb93dc2d015766da1361840e4880db83a9e9297d4272383abdfcaeb26dc8437c3dc0b007efa5c12585bfaacaa2ae255ed52c693f9e8f6595a7294db48bc68a
-DIST stress-ng-0.09.50.tar.xz 372592 BLAKE2B 430e4e8feefb358d6e9445d2418356d306c978ae0e6521a8fa6f216cd2fd031569ce9359236080784682991d81a3d9aacc4cef54709fbed2d9a99d7154d9e6b0 SHA512 b52a2e52011d6fcc7c72ad12c6173c7e7e77028e6c90d2aef170235bfb5b9b0ffe7422b178e58d68c0239dc85cce59edb6a58b9edfea84aba2b24c995321d5d4
-EBUILD stress-ng-0.09.49.ebuild 683 BLAKE2B 37f2aedf2c4949e54bbfa4003473149abd6c65bc1c74f15fb0226cf94feef64c7537c5cb76312cfe9a2273484f3678fdcf647bce0590a6aac0c7f9801840868c SHA512 f83fe0332935dcbd91dd017fccda51d1a7f54bc5c27dd0e14956dfe6f217422fc78109db61081063e7fd081348cb19b7ff2ef7dd4aa3892ffb9e578e1b328fb1
-EBUILD stress-ng-0.09.50.ebuild 676 BLAKE2B af3c24528ca7f3b29a01a08dd49fcd4d0dcf682bfd932180e201c36d86c82254ab6f6bba72b3298b4f8883eaa7eff86a26d8684789cb9c20835c17abb995c4bf SHA512 b2f7a1d4c9fb9122f7bc08415e5615e3c77a0369a07930acf5f5122f7462409b50f59ab23ffb1e572bdd07e1dc28d57c1e3f7bffd04e5e8245e68f3999af1b21
+AUX stress-ng-0.09.53-makefile.patch 1736 BLAKE2B f96cf408d2158f435e25c66270062903e1efb435bf48fa2f8198b99d625f1a70f29e71c5deba1a05549ab6e91d6a1e579e7176d4f172f073d5fe5e71b8ad17ba SHA512 72a607a2a569ac7b390067e63c7c5da6d6f15661e6cdc1a723c3f5eee03f156155ed5977045d1b1bbd9ab7d8eef5f5588018cd10107ccacd3a1fddf3e71a9609
+DIST stress-ng-0.09.53.tar.xz 383408 BLAKE2B 3893bd4683c0b7b57c2a8809ca0889d4a06131465e099609e96954b6fd980fb9dcd1a2c517de3a70100815c5493a61fdb166cc5c493bcbd0c5b0d622b2a18e79 SHA512 fb83a849259aa0e376c2ae8d51bd018e3fbdd7beadf2770471039b4cf34f7827cdcf2492ad7ef79359de5750fffcc78bfc18171e429d2cb38d5bbde82e0e70f2
+EBUILD stress-ng-0.09.53.ebuild 674 BLAKE2B c361fb796b632471adf0909d082f759b2d32aec9e39e9d713e992d917c60fa518836ea7bef0541e63da1778b7f1beef24496974134a7f42342359a02a9ddddf6 SHA512 da694bbe558f22a6428c5e964dcbe87448e5d8a84ccc9d24f6ccaede86fedfaeae6e085cbc40194d378f19ec49956df4e19a2f9d8e0c9b4f6d05d46010b45e23
MISC metadata.xml 953 BLAKE2B c10dbe55ea86af30a97975174565c3c9bbc76bf029f1582a5fbe8a98f79afb80a509543730294673d5b51ddf4a32fc93e8017f8ba0b26cac119c1e97e8fd025a SHA512 7975ca315e447e9d6c2d551fcf396b2a03d71661c4bd33843dba0413ea7b119dd1d3f59aaa91298bb5be2a17f377f7cae96cc7413531f30a88e2f401ef76f0bb
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch
deleted file mode 100644
index 9458a005c314..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/Makefile 2018-11-21 18:06:08.000000000 +0100
-+++ b/Makefile 2018-11-27 23:43:41.000000000 +0100
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
-
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
-
- #
- # Pedantic flags
-@@ -343,12 +343,10 @@
- .o: stress-ng.h Makefile
-
- .c.o: stress-ng.h Makefile $(SRC)
-- @echo "CC $<"
-- @$(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- stress-ng: $(OBJS)
-- @echo "LD $@"
-- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
-+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
- @sync
-
- makeconfig:
-@@ -369,8 +367,7 @@
- sed '$$ s/.$$//' >> apparmor-data.c
- @echo "};" >> apparmor-data.c
- @echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
-- @echo "CC $<"
-- @$(CC) -c apparmor-data.c -o apparmor-data.o
-+ $(CC) -c apparmor-data.c -o apparmor-data.o
- @rm -rf apparmor-data.c apparmor-data.bin
-
- #
-@@ -385,12 +382,10 @@
- perf.o: perf.c perf-event.c
- @$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
- awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
-- @echo CC $<
-- @$(CC) $(CFLAGS) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-
- stress-vecmath.o: stress-vecmath.c
-- @echo CC $<
-- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
- @touch stress-ng.c
-
- $(OBJS): stress-ng.h Makefile
-@@ -438,6 +433,6 @@
- mkdir -p ${DESTDIR}${BINDIR}
- cp stress-ng ${DESTDIR}${BINDIR}
- mkdir -p ${DESTDIR}${MANDIR}
-- cp stress-ng.1.gz ${DESTDIR}${MANDIR}
-+ cp stress-ng.1 ${DESTDIR}${MANDIR}
- mkdir -p ${DESTDIR}${JOBDIR}
- cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
index 791f599118b7..cf08858d361b 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
@@ -1,15 +1,15 @@
---- a/Makefile 2019-01-02 18:19:15.000000000 +0100
-+++ b/Makefile 2019-01-27 15:09:56.000000000 +0100
+--- a/Makefile 2019-02-15 13:06:01.000000000 +0100
++++ b/Makefile 2019-02-19 21:44:10.000000000 +0100
@@ -21,7 +21,7 @@
# Codename "portable pressure producer"
#
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -g
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
#
# Pedantic flags
-@@ -344,12 +344,10 @@
+@@ -347,12 +347,10 @@
.o: stress-ng.h Makefile
.c.o: stress-ng.h Makefile $(SRC)
@@ -24,7 +24,7 @@
@sync
makeconfig:
-@@ -370,7 +368,7 @@
+@@ -373,7 +371,7 @@
sed '$$ s/.$$//' >> apparmor-data.c
@echo "};" >> apparmor-data.c
@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -33,10 +33,10 @@
@$(CC) -c apparmor-data.c -o apparmor-data.o
@rm -rf apparmor-data.c apparmor-data.bin
-@@ -386,12 +384,12 @@
- perf.o: perf.c perf-event.c
- @$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
- awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+@@ -389,12 +387,12 @@
+ core-perf.o: core-perf.c core-perf-event.c
+ @$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
- @echo CC $<
- @$(CC) $(CFLAGS) -c -o $@ $<
+ echo CC $<
@@ -50,7 +50,7 @@
@touch stress-ng.c
$(OBJS): stress-ng.h Makefile
-@@ -439,6 +437,6 @@
+@@ -442,6 +440,6 @@
mkdir -p ${DESTDIR}${BINDIR}
cp stress-ng ${DESTDIR}${BINDIR}
mkdir -p ${DESTDIR}${MANDIR}
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
deleted file mode 100644
index 0dd8c5303f6c..000000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Stress test for a computer system with various selectable ways"
-HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
-SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
- dev-libs/libaio
- dev-libs/libbsd
- dev-libs/libgcrypt:0=
- net-misc/lksctp-tools
- sys-apps/attr
- sys-apps/keyutils
- sys-libs/libapparmor
- sys-libs/libcap
- sys-libs/zlib:=
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=(
- "README"
- "README.Android"
- "TODO"
- "syscalls.txt"
-)
-
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
index 6cd26a164223..0eb983a1b75d 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
@@ -27,4 +27,4 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${PN}-0.09.47-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )