From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- app-benchmarks/stress-ng/Manifest | 6 +- .../files/stress-ng-0.09.31-makefile.patch | 64 ---------------------- .../files/stress-ng-0.09.38-makefile.patch | 64 ++++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild | 28 ---------- app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild | 28 ++++++++++ 5 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch create mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild create mode 100644 app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild (limited to 'app-benchmarks/stress-ng') diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index 2ccd4b27b189..c2405e4daa27 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1,4 +1,4 @@ -AUX stress-ng-0.09.31-makefile.patch 1860 BLAKE2B a5fe82d643f79fd74303de3528a25444914e0071d9e43519c567a38c6f7956bafac3b48b12ed4d74abec9494fec70521a7e1e065905651de979f0051a6ade6ef SHA512 87fde07ed850f5761fd73bb147dd0d0a0781f190dd20d9cbfcc79013c5c8c3e5c1b1217f5dc20b596c9a8482b209f2855fbde73984249b156154eb87df273f86 -DIST stress-ng-0.09.37.tar.xz 354748 BLAKE2B 8910e169c8b14f047691bc931d016a39b90ace613ab10cc7337a90d48ae4ce78b8bcc76d0f5257a627e258de12836293f4bcf73117ccc1ecaab7fe7325f3f0ab SHA512 87014399e4e166bbacd01d65e6660db80ad6653bd6e69088321b6190e3dca1d9997d9f0567433791380c5af97a58b7414fea2d9190c09954a5861e6da303f25f -EBUILD stress-ng-0.09.37.ebuild 681 BLAKE2B 7d819ff63bae78b55ade23ccf680fad63382ba39f88614c2cfb56d1b871130c0714bcde50848bc8329006c7bd00004e0fac5fb290b6840ed2a2a1fae9a20bf7e SHA512 1a33939cb65405e390a5e96052eef683d879ccd28506d4bca5effbf86de16cc459b0773e70707b310707cb448b2da762cf5411fe4eeed1634b08211c10d89ec2 +AUX stress-ng-0.09.38-makefile.patch 1879 BLAKE2B f037aa43102e7959de1b7ee370e67b63268b758b0989ae70fccb7fbbee029641640a36437af07c141862b6b58a207aeca4eefd44a69fee189aa8d9bcffe4fa2d SHA512 7cee370fedd317c80ff059c8602df57b7809ab51dbfa57b8ee57d25638c010e3b04e92be6a6000788319355951e370f0bc813b8329a11108199c74b9fd842c5a +DIST stress-ng-0.09.38.tar.xz 355252 BLAKE2B 9382d48af5fa7fbb9128887d484688045cf033a2f5997898209f530ef6c27ea27c5271666247a9c650f4dd66bd2add93586dd5beb19f6509f78b9e355791cf27 SHA512 b3f3d03151cd5afaa267eb028ec9f450d8dccec851de0f16fe8d83e81b7a8e9572b7c556e1fab4ecc57c56829e6d30023716708f15b9156af146a0c72ae4ddf8 +EBUILD stress-ng-0.09.38.ebuild 672 BLAKE2B 50466e766076bae87c179f8aa4affa8d3a21ba776790bcc64c07c45f56fe58f92bb4d89197e3000440513cd3a0df4ef9b7ea391b3fa6e2afde17b753b6a1ea74 SHA512 5b04dade5e4e0f92e9f156625a4db6d1a47a914695d85ab30782b8bf87e4a73c7a9917d91e720542f581b97406cb2ddcfe87fa89a3f83d3c1df8230216567af8 MISC metadata.xml 796 BLAKE2B 746809bd51f5512246e29a1e15d9b41f3cf0df968b2e2655dcaef7bb839aff27ce2cefd4818e79fec18b9f12c7902bdd0440c634f9480da2352108950554d636 SHA512 47472bafada342a449ad7d3632c2b0859ee56f2eef31ca3ca9e7af1e106126ec7858862c67baa6b8d16611e2dd3ac166ecd931bab3491c875088e4bd66499aa6 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch deleted file mode 100644 index 633c6db1b3fd..000000000000 --- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- a/Makefile 2018-06-21 15:39:27.000000000 +0200 -+++ b/Makefile 2018-06-24 14:46:41.773596760 +0200 -@@ -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 -@@ -319,12 +319,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: info $(OBJS) -- @echo "LD $@" -- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ - @sync - - .PHONY: info -@@ -344,8 +342,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 - - # -@@ -360,12 +357,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 -@@ -405,10 +400,10 @@ - STRESS_NG=./stress-ng debian/tests/fast-test-all - - .PHONY: install --install: stress-ng stress-ng.1.gz -+install: stress-ng - 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.38-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch new file mode 100644 index 000000000000..6a36bc4adafe --- /dev/null +++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch @@ -0,0 +1,64 @@ +--- a/Makefile 2018-08-23 17:55:27.000000000 +0200 ++++ b/Makefile 2018-09-01 14:46:51.000000000 +0200 +@@ -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 +@@ -337,12 +337,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) -lc -o $@ ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ + @sync + + makeconfig: +@@ -363,8 +361,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 + + # +@@ -379,12 +376,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 +@@ -428,10 +423,10 @@ + ./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics + + .PHONY: install +-install: stress-ng stress-ng.1.gz ++install: stress-ng + 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/stress-ng-0.09.37.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild deleted file mode 100644 index ce7b1343e7dc..000000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.09.37.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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="http://kernel.ubuntu.com/~cking/stress-ng/" -SRC_URI="http://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}/${PN}-0.09.31-makefile.patch" ) diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild new file mode 100644 index 000000000000..66c8efa4f87c --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="http://kernel.ubuntu.com/~cking/stress-ng/" +SRC_URI="http://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" ) -- cgit v1.2.3