commit: 4b833df7426f2c94fcd079b53cdaa2ace4f338c4 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Sun Aug 9 11:55:22 2020 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Aug 9 11:57:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b833df7
app-benchmarks/stress-ng: bump to version 0.11.17 Closes: https://bugs.gentoo.org/728728 Closes: https://github.com/gentoo/gentoo/pull/16321 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> app-benchmarks/stress-ng/Manifest | 1 + .../files/stress-ng-0.11.17-makefile.patch | 61 ++++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild | 41 +++++++++++++++ 3 files changed, 103 insertions(+) diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index c797b3b3e02..08ce915e76a 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1 +1,2 @@ DIST stress-ng-0.11.10.tar.xz 443208 BLAKE2B 273d98c8e8a7664e2ecd6431f0988b417980d9faf05550a80a0a90505907eec24eae5f717f4bd813f128f22870343861472bc1157373deb0aaef365b85de44fa SHA512 ae83fa107d17fe55c27429d4b0763db2b56c83d5ab88f4738f9b0be74a34c8adbb6d1dd7a5417ff1399c394c9a18c900265705f21c1cf123e0cc8361cb8214fe +DIST stress-ng-0.11.17.tar.xz 467156 BLAKE2B fab734e0dcd7633e6a47a3b6a41111dd900a2dfb2e3666d8fbf439d2d40ea6b7f5f25763aba5d774cf20ce43598e0bce2229e321c2a9512d5f26d8a795d70ce8 SHA512 8320e10fb2a2f224b23efe72af7d84e6beb73bbd54eff0a6c04afee14de5cbbf6584e1a6d936f52651467138e9647dfb0ff092aa7e73a9f8304627a603546f79 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch new file mode 100644 index 00000000000..d3c5e93b007 --- /dev/null +++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch @@ -0,0 +1,61 @@ +--- stress-ng-0.11.17.orig/Makefile 2020-07-27 13:38:23.000000000 +0200 ++++ stress-ng-0.11.17/Makefile 2020-08-09 13:43:30.919796477 +0200 +@@ -21,7 +21,7 @@ + # Codename "synthetic system strainer" + # + +-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 ++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99 + + # + # Pedantic flags +@@ -358,12 +358,10 @@ + .o: stress-ng.h Makefile + + .c.o: +- @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: +@@ -384,7 +382,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 $<" ++ echo "CC $<" + @$(CC) -c apparmor-data.c -o apparmor-data.o + @rm -rf apparmor-data.c apparmor-data.bin + +@@ -401,12 +399,12 @@ + @$(CC) $(CFLAGS) -E core-perf-event.c | grep "PERF_COUNT" | \ + sed 's/,/ /' | sed s/'^ *//' | \ + awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h +- @echo CC $< +- @$(CC) $(CFLAGS) -c -o $@ $< ++ echo CC $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + stress-vecmath.o: stress-vecmath.c +- @echo CC $< +- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $< ++ echo CC $< ++ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $< + @touch stress-ng.c + + $(OBJS): stress-ng.h Makefile +@@ -459,7 +457,7 @@ + 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} + mkdir -p ${DESTDIR}${BASHDIR} diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild new file mode 100644 index 00000000000..4c88cc73a96 --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.11.17.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils toolchain-funcs + +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 ~arm ~arm64 ~x86" + +DEPEND=" + dev-libs/libaio + dev-libs/libbsd + dev-libs/libgcrypt:0= + sys-apps/attr + sys-apps/keyutils:= + sys-libs/libcap + sys-libs/zlib +" + +RDEPEND="${DEPEND}" + +DOCS=( "README" "README.Android" "TODO" "syscalls.txt" ) + +PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" ) + +src_compile() { + tc-export CC + + default +} + +pkg_postinst() { + optfeature "AppArmor support" sys-libs/libapparmor + optfeature "SCTP support" net-misc/lksctp-tools +}
