From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-benchmarks/stress-ng/Manifest | 6 +-- .../files/stress-ng-0.11.17-makefile.patch | 61 ---------------------- .../files/stress-ng-0.11.23-makefile.patch | 60 +++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild | 41 --------------- app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild | 41 +++++++++++++++ 5 files changed, 104 insertions(+), 105 deletions(-) delete mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch create mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild create mode 100644 app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild (limited to 'app-benchmarks/stress-ng') diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index 1b0cb3e38946..e99db4ddbaa4 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1,4 +1,4 @@ -AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d -DIST stress-ng-0.11.21.tar.xz 485764 BLAKE2B 69ab6ac25c66ee903820e6936a467d0802be32fd2eeec762d11979eeddcbee37e1a2b19b68408553173226ae3493f700fbb92f7d6707e372cfe5d59bbc9d6e94 SHA512 ec41d57f1d58150efc5db5cf96d8b2d8f6f2453cce2f5b2275b8cacb68fad6acfe7fe3004326413ab4ee02098a340938a3cf04404141f1310a05e07abaf7b500 -EBUILD stress-ng-0.11.21.ebuild 856 BLAKE2B e233b69680e269bab98b3dcb9abb8b68990235f0ac6a8b199a1c68132eaa68fa0e5baa98588a300d1c1beb16bed7e27365baa1dd6e4f1c76372591807dc39ce0 SHA512 ce1a5efbf92221048451b3fda8a32c8216f40af5c79b9e0ba216efb1e81fa037ac0f4ebb269a61753d8bbbc0cb82a1fc5abd50d27ce2ef47a59118ca77023cbf +AUX stress-ng-0.11.23-makefile.patch 1635 BLAKE2B 6fd6b90ea16080d5f131724dd9f7128c712e7d6e912d2c8d420fa5c4ff6840e5fffddc18db4977133b0f36f34c5f67e35f106adaef685c0b428d97d37c0e3291 SHA512 15f28bf02fb36e08bdef49b75e413577d226d2e3287560f19c3ce9bb807b3923d7832166156627f5557ca0a1e8e67b9a42177042ad9f1909ec5364e72544d3d3 +DIST stress-ng-0.11.24.tar.xz 502772 BLAKE2B 33d96dec17238c2633811702cc613774f1a203628be7718a97f93f8d281749039a5121175554593bc4fef6ff6f39d404d8333ad1d2e0e5227bd248775c81511c SHA512 2546ac1d17304e61c21b52003a93e5f7c32b746d2ed4088e1af24ed151072b7965c3a4be50058c36637ec0d2e5eccc4daace2d4113e5655f3520a7392f393f44 +EBUILD stress-ng-0.11.24.ebuild 856 BLAKE2B f601d8aeaddf9b3cf3ca007056105d0904df24ec19080b899e7f070437a1ff79b6181bf24b385c67bfe7a2f4f3c0df83909988719131278c3fba211c992bc61e SHA512 95489828b73f7ff2b175817cdd7face6cb46a59ff593fb2e93dd74405188ee7a56ff910a05cfbd3d3e4a6db357c7a21fd7d7a53f8d75b454518235913d23c912 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1 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 deleted file mode 100644 index d3c5e93b0074..000000000000 --- a/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 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/files/stress-ng-0.11.23-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch new file mode 100644 index 000000000000..77687d2a1141 --- /dev/null +++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch @@ -0,0 +1,60 @@ +--- a/Makefile ++++ b/Makefile +@@ -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 +@@ -364,12 +364,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: +@@ -390,8 +388,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 + + # +@@ -419,12 +416,10 @@ + @$(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 $@ $< ++ $(CC) $(CFLAGS) -c -o $@ $< + + stress-vecmath.o: stress-vecmath.c +- @echo CC $< +- @$(CC) $(CFLAGS) -fno-builtin -c -o $@ $< ++ $(CC) $(CFLAGS) -fno-builtin -c -o $@ $< + + $(OBJS): stress-ng.h Makefile + +@@ -478,7 +473,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.21.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild deleted file mode 100644 index 3985c5e05705..000000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.11.21.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature 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 ~ppc64 ~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 -} diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild new file mode 100644 index 000000000000..a01d58d2dda5 --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.11.24.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature 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 ~ppc64 ~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.23-makefile.patch" ) + +src_compile() { + tc-export CC + + default +} + +pkg_postinst() { + optfeature "AppArmor support" sys-libs/libapparmor + optfeature "SCTP support" net-misc/lksctp-tools +} -- cgit v1.2.3