From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-benchmarks/stress-ng/Manifest | 6 +- .../files/stress-ng-0.11.02-makefile.patch | 64 ---------------------- .../files/stress-ng-0.11.17-makefile.patch | 61 +++++++++++++++++++++ app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild | 38 ------------- app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild | 41 ++++++++++++++ 5 files changed, 105 insertions(+), 105 deletions(-) delete mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch create mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild create mode 100644 app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild (limited to 'app-benchmarks/stress-ng') diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index fe5636dc2a4b..5e06f0ac6587 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1,4 +1,4 @@ -AUX stress-ng-0.11.02-makefile.patch 1802 BLAKE2B 1fa9fb57e31a8f0ff60e9a60140e8e85064840f215ba00e82d292737ec37889c3c3bb92cefd94a56104a5e80df69468e3ad7b38cbebed3f8c009dcf23932194b SHA512 7a697fc4c1dfc8e462362e0d3fe99d5432afbf921f2de91963f623163bbcbc0642e61444bb053e673661659d11c22f5a6932668b8a25d9d7564b19eb87467554 -DIST stress-ng-0.11.10.tar.xz 443208 BLAKE2B 273d98c8e8a7664e2ecd6431f0988b417980d9faf05550a80a0a90505907eec24eae5f717f4bd813f128f22870343861472bc1157373deb0aaef365b85de44fa SHA512 ae83fa107d17fe55c27429d4b0763db2b56c83d5ab88f4738f9b0be74a34c8adbb6d1dd7a5417ff1399c394c9a18c900265705f21c1cf123e0cc8361cb8214fe -EBUILD stress-ng-0.11.10.ebuild 762 BLAKE2B 0ae9493eb2c03f913c6115f54608a43eaba6370296a2a824ff6040b236e118645c7a7344b23b873b414f56ba625cc752eb260e38387104720f72401d59f55746 SHA512 c3fcadf84d8a0ec0e37bf568e0920bb1f24b12eec08f544a1383ec2503c1472d56b27829ee017d813f0ffc3f1c4ef0ea64954839362642219a0db9320f098191 +AUX stress-ng-0.11.17-makefile.patch 1752 BLAKE2B 999a2bd729c0b3d3184010ffe5ffb5d59cf82fead7a16199c2ce1abd37dcfd3a665f4644b8d740ece4b92fa2f543e84d57952b13bac728a78ed0f749d106459c SHA512 affe4f5a324e009f10f0ed26dd8dc6d1ab7938da8574392c2514f307c1e4a46a85b0fcf7c3820e6f147f1150483f811b314d82b73ca7f605167ffa8d50c4691d +DIST stress-ng-0.11.18.tar.xz 473268 BLAKE2B 1a10fab7fc98dad72f59f871e148980b3a7ea29d62badcc7a41ae72598cd99b880da10927a8809b5785040aaaf93a4776801304a43bf3d7bcfbbf19d5b488cd2 SHA512 c6871cfb6b72fae83ad2d8a4877363b81e5674d1670faa24c7a54951020f177f9a81033506207032a0b2bf39269fb09c6d8a6842d41285ee75135a37ad8e781c +EBUILD stress-ng-0.11.18.ebuild 845 BLAKE2B 4b9188d58644d0746355fab936e7553a2d8ebd3d2279793cd5c1abc4cc0096c920f2bea11039a22d6e6b10068ccb2468a947956c8039f1ca807cae3c7301acaf SHA512 a8870c9880a3acf73d8914b4668cdb2ccc37ecb64e9bb2006a0f59bb9b0eb2059be53ca6e1924daa99eaea5384e842219a07550e1e48d8c9ad522e72a74febb8 MISC metadata.xml 834 BLAKE2B 01f0258893808f35495d063d634b3fecbb47e94cc6915ea605eedd6565e860bd42cbf181afa25e6e2faba396aa4c6da5d4e489af40bf5b11bd2ebb4e363e6994 SHA512 17c422c00bae52d5305ec4c34452c2bf86f280f2fcfa8c26710356023115828092d1d6f321e8ee194801b2d31413e07416041632ef692ad4128f8f99e389efb1 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch deleted file mode 100644 index bce1907d139d..000000000000 --- a/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch +++ /dev/null @@ -1,64 +0,0 @@ -Always respect users CFLAGS, enable verbose output when compiling -and don't install compressed man pages. - ---- 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 -@@ -357,12 +357,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: -@@ -383,7 +381,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 - -@@ -399,12 +397,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 $< -+ $(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 -@@ -453,7 +451,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.17-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.17-makefile.patch new file mode 100644 index 000000000000..d3c5e93b0074 --- /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.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild deleted file mode 100644 index b2cfc3fbc768..000000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit 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= - 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.11.02-makefile.patch" ) - -src_compile() { - tc-export CC - - default -} diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.18.ebuild new file mode 100644 index 000000000000..4c88cc73a967 --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.11.18.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 +} -- cgit v1.2.3