[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2018-05-15 16:26 Michał Górny
  0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-05-15 16:26 UTC (permalink / raw
  To: gentoo-commits

commit:     baed68221030b4fe96e31ba2dc74702eb43b27b2
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat May  5 00:04:56 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 15 16:26:08 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baed6822

app-benchmarks/stress-ng: Bump to version 0.09.26

Closes: https://bugs.gentoo.org/650140
Closes: https://github.com/gentoo/gentoo/pull/8264
Package-Manager: Portage-2.3.35, Repoman-2.3.9

 app-benchmarks/stress-ng/Manifest                 |  1 +
 app-benchmarks/stress-ng/files/makefile.patch     | 81 +++++++++++++++++++++++
 app-benchmarks/stress-ng/metadata.xml             | 17 ++++-
 app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild | 30 +++++++++
 4 files changed, 128 insertions(+), 1 deletion(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index b126cefbbce..7c1932c99a0 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1,3 @@
 DIST stress-ng-0.05.12.tar.gz 280758 BLAKE2B 0d25a0ecddf75cfd19a0bd26c2ca7390d8d999d8e0de4735e71dcda52de9fbce33800475a8137985469eeadad21f57d14530f69bdd2284f82e6df487b5f8ec32 SHA512 ee622b1d8fd1b3ddee6119f5a43cedb427e3524bb6ef10f7ac96c305567c9919574e9103949825e2bea3391c302b6e2b5871667bc8f8609844765b64ec760bc8
 DIST stress-ng-0.06.00.tar.gz 311761 BLAKE2B 725e902344602a9922b2d39a247a7b6c4d88cd69506addb9b8910221a5d6aa438b69cc1f3ac5c8265de2be7e0973b9dfbc4f93493f4437ee23d4f84c8712cd5d SHA512 a23a3f020e1fa777c6141db8f9d91833b9758172974be0db341c757eb7b407520b80bc9889eb7b6348cfa64d8f8976ba6ad8761a5fbc31055accd8fbceb8de66
+DIST stress-ng-0.09.27.tar.xz 344456 BLAKE2B 4609f438372c6d52e0e7e7f5ed1a29e1a32282c8cd2c978e9599d396fbb3c9da0fde6c3814f13ec4519e8d3d9c020171757d66cec12257195b5436598223493c SHA512 15295a7e2dbd2fc89d66fae57902b182ae4f84dac8a4aa5c0f80a81789ca2e04459aa9adba6f9b6735e05d687fedef1bc0d77ff9269044a46c8dca612bff883a

diff --git a/app-benchmarks/stress-ng/files/makefile.patch b/app-benchmarks/stress-ng/files/makefile.patch
new file mode 100644
index 00000000000..eecb12cad5b
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/makefile.patch
@@ -0,0 +1,81 @@
+--- a/Makefile	2018-04-27 17:02:16.000000000 +0200
++++ b/Makefile	2018-05-13 20:54:08.741008488 +0200
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"'
+ 
+ #
+ # Pedantic flags
+@@ -314,12 +314,9 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(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
+@@ -339,8 +336,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) $(CFLAGS) $(CPPFLAGS) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c
+ 
+ #
+@@ -353,20 +349,15 @@
+ stress-personality.c: personality.h
+ 
+ perf.o: perf.c perf-event.c
+-	@$(CC) -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) $(CPPFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
++	$(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) $(CPPFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+ 
+-stress-ng.1.gz: stress-ng.1
+-	gzip -c $< > $@
+-
+ .PHONY: dist
+ dist:
+ 	rm -rf stress-ng-$(VERSION)
+@@ -386,7 +377,7 @@
+ 
+ .PHONY: clean
+ clean:
+-	@rm -f stress-ng $(OBJS) stress-ng.1.gz stress-ng.pdf
++	@rm -f stress-ng $(OBJS) stress-ng.pdf
+ 	@rm -f stress-ng-$(VERSION).tar.xz
+ 	@rm -f personality.h
+ 	@rm -f perf-event.h
+@@ -398,10 +389,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/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index 6f49eba8f49..2fbf8ab0900 100644
--- a/app-benchmarks/stress-ng/metadata.xml
+++ b/app-benchmarks/stress-ng/metadata.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Stress-ng will stress test a computer system in various selectable ways.
+		It was designed to exercise various physical subsystems of a computer
+		as well as the various operating system kernel interfaces.
+		It features 200 stress tests, 70 CPU specific stress tests,
+		that exercise floating point, integer, bit manipulation and control flow
+		and over 20 virtual memory stress tests.
+	</longdescription>
 </pkgmetadata>

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild
new file mode 100644
index 00000000000..125fd0edb3e
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.27.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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}/makefile.patch" )
+
+QA_WX_LOAD="usr/bin/stress-ng"


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2018-09-04 22:32 Patrice Clement
  0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2018-09-04 22:32 UTC (permalink / raw
  To: gentoo-commits

commit:     84b5be12bbc52f89716f812937d0e5525de18629
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sat Sep  1 12:56:47 2018 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Sep  4 22:31:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b5be12

app-benchmarks/stress-ng: update makefile patch.

Closes: https://bugs.gentoo.org/665010
Package-Manager: Portage-2.3.48, Repoman-2.3.10
Closes: https://github.com/gentoo/gentoo/pull/9751

 ...makefile.patch => stress-ng-0.09.38-makefile.patch} | 18 +++++++++---------
 app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

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.38-makefile.patch
similarity index 84%
rename from app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
rename to app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
index 633c6db1b3f..6a36bc4adaf 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2018-06-21 15:39:27.000000000 +0200
-+++ b/Makefile	2018-06-24 14:46:41.773596760 +0200
+--- 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"
  #
@@ -9,7 +9,7 @@
  
  #
  # Pedantic flags
-@@ -319,12 +319,10 @@
+@@ -337,12 +337,10 @@
  .o: stress-ng.h Makefile
  
  .c.o: stress-ng.h Makefile $(SRC)
@@ -17,14 +17,14 @@
 -	@$(CC) $(CFLAGS) -c -o $@ $<
 +	$(CC) $(CFLAGS) -c -o $@ $<
  
- stress-ng: info $(OBJS)
+ stress-ng: $(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 @@
+ 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
@@ -34,7 +34,7 @@
  	@rm -rf apparmor-data.c apparmor-data.bin
  
  #
-@@ -360,12 +357,10 @@
+@@ -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
@@ -49,8 +49,8 @@
  	@touch stress-ng.c
  
  $(OBJS): stress-ng.h Makefile
-@@ -405,10 +400,10 @@
- 	STRESS_NG=./stress-ng debian/tests/fast-test-all
+@@ -428,10 +423,10 @@
+ 	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
  
  .PHONY: install
 -install: stress-ng stress-ng.1.gz

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
index ce7b1343e7d..66c8efa4f87 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2018-11-03  9:13 Michał Górny
  0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-11-03  9:13 UTC (permalink / raw
  To: gentoo-commits

commit:     febf0df98fff29a727f1984d0a3df92946bfcbae
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Oct 28 18:39:00 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov  3 09:07:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=febf0df9

app-benchmarks/stress-ng: drop old version

Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10247
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 .../files/stress-ng-0.09.40-makefile.patch         | 64 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild  | 28 ----------
 3 files changed, 93 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index ffa5ad81f71..46673cd5a28 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,2 @@
-DIST stress-ng-0.09.41.tar.xz 359760 BLAKE2B d57d9350744db29d3e61201f146cd6569efae599743cf3e5971d645beba5de99b4162ec735e0f143c1c3cd8cc9e318441bfd97dfcf5db1b26cd7e4543bfcc918 SHA512 d1e2a6442c208d5d32ab688460475a59a2edd73220e44402632650eee022faf5728d282a374f22bcb86ce83662122823a7ba72f9824058d86d9b22a3c1791524
 DIST stress-ng-0.09.42.tar.xz 360452 BLAKE2B fa5ad15f066d8e762fb08cdcd4fe58ea6604890edf2384e0676e6c35645a6fd84c568369dc966d23527820630a0b44ab9b8969f3e170c876b03a194ea72384af SHA512 e209a8777331f91b3ec5fca9f6f664513498b21b5b31338e0882cc6c79674524906e8d0d4a8931ab5b382feac65e15639989fc0672e408aaa2eb84c72a059258
 DIST stress-ng-0.09.43.tar.xz 361116 BLAKE2B bba3d136146bfb55f23cb40f85e7e133f96d7fa7f2a55e7b7fb70ef23197c082f89b35fbf11129eaaf3d1c1b7306d1a5ac5ebd55a96c37c6fa9533a84a3d4684 SHA512 bceec4263916b370fc35f6178c2048c3d8317dfc77363f4ec7e9f0111243495d405314af6d467aa5a56db03e1c8c9a2f7aa3c733afe1f3f6f45f6c074ad3ac4c

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
deleted file mode 100644
index e3478e8ced8..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile	2018-09-12 18:12:22.000000000 +0200
-+++ b/Makefile	2018-09-16 02:06:13.000000000 +0200
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -pipe
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -338,12 +338,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:
-@@ -364,8 +362,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
- 
- #
-@@ -380,12 +377,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
-@@ -429,10 +424,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.41.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.41.ebuild
deleted file mode 100644
index 3e47f3a64c7..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.41.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.40-makefile.patch" )


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2018-12-16 19:30 Andreas Sturmlechner
  0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2018-12-16 19:30 UTC (permalink / raw
  To: gentoo-commits

commit:     1d7bbfff8ccb74134e8462c52ae94b18c8ec0b33
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Nov 27 22:54:07 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 16 19:29:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d7bbfff

app-benchmarks/stress-ng: bump to version 0.09.47

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/10503
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.09.47-makefile.patch         | 59 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.47.ebuild  | 30 +++++++++++
 3 files changed, 90 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index f71feb8ae0e..1c2b22f4f1d 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.09.44.tar.xz 361396 BLAKE2B 28458eeb9b1f8b296242d42af682537f2018dfedd3faea299e04b3e5141bb52bedd09452802ec5459130a6e5791d4f3383f2a8a338c289c51f306cfb722bf780 SHA512 74d1ffff789e96e9d38481abaa06f1232cdd6b92fd792abb078d690cfb5fbff188c738b1cc1c342b9d9e729dc97a6218641464eac4ab90f51e1e801a54b0767a
+DIST stress-ng-0.09.47.tar.xz 366308 BLAKE2B 3f75cb8c807fb1ba834fff3fab467483a6d4135f9cdd191a0b093b470b6d5dd385f994daa78aa8de29d230effbbbab48e48cc100e021092bf71975adc423ea8a SHA512 a9c04e7d75bd4d45326992e675e6a3d51c4fb7bbe61377795096dc1e803e63a51867917f3af58e8d8b5395d8e3f907594a37bb270caf9a38be5122eea1621efd

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
new file mode 100644
index 00000000000..9458a005c31
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.47-makefile.patch
@@ -0,0 +1,59 @@
+--- 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/stress-ng-0.09.47.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.47.ebuild
new file mode 100644
index 00000000000..2cba4610eba
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.47.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 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="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" )


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2019-02-21 22:31 Andreas Sturmlechner
  0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2019-02-21 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     2dd44e5f69c52a1d54282c511419b83e676df61f
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Feb 19 20:47:01 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 22:31:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd44e5f

app-benchmarks/stress-ng: bump to version 0.09.53

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/11111
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.09.53-makefile.patch         | 60 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild  | 30 +++++++++++
 3 files changed, 91 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index e3e47304d0a..bec288ac491 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1,3 @@
 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
+DIST stress-ng-0.09.53.tar.xz 383408 BLAKE2B 3893bd4683c0b7b57c2a8809ca0889d4a06131465e099609e96954b6fd980fb9dcd1a2c517de3a70100815c5493a61fdb166cc5c493bcbd0c5b0d622b2a18e79 SHA512 fb83a849259aa0e376c2ae8d51bd018e3fbdd7beadf2770471039b4cf34f7827cdcf2492ad7ef79359de5750fffcc78bfc18171e429d2cb38d5bbde82e0e70f2

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
new file mode 100644
index 00000000000..cf08858d361
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
@@ -0,0 +1,60 @@
+--- 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
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -347,12 +347,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:
+@@ -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
+-	@echo "CC $<"
++	echo "CC $<"
+ 	@$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+@@ -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 $<
++	$(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
+@@ -442,6 +440,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/stress-ng-0.09.53.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
new file mode 100644
index 00000000000..0eb983a1b75
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.53.ebuild
@@ -0,0 +1,30 @@
+# 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" )


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2019-02-21 22:31 Andreas Sturmlechner
  0 siblings, 0 replies; 17+ messages in thread
From: Andreas Sturmlechner @ 2019-02-21 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     10c09af1cfc0cafabf3fd344d09df0c9cf9aea7f
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Feb 19 20:47:46 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 22:31:17 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c09af1

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  2 -
 .../files/stress-ng-0.09.47-makefile.patch         | 59 ---------------------
 .../files/stress-ng-0.09.50-makefile.patch         | 60 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild  | 30 -----------
 app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild  | 35 -------------
 5 files changed, 186 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index bec288ac491..253d8e8cac6 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1 @@
-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
 DIST stress-ng-0.09.53.tar.xz 383408 BLAKE2B 3893bd4683c0b7b57c2a8809ca0889d4a06131465e099609e96954b6fd980fb9dcd1a2c517de3a70100815c5493a61fdb166cc5c493bcbd0c5b0d622b2a18e79 SHA512 fb83a849259aa0e376c2ae8d51bd018e3fbdd7beadf2770471039b4cf34f7827cdcf2492ad7ef79359de5750fffcc78bfc18171e429d2cb38d5bbde82e0e70f2

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 9458a005c31..00000000000
--- 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.50-makefile.patch
deleted file mode 100644
index 791f599118b..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/Makefile	2019-01-02 18:19:15.000000000 +0100
-+++ b/Makefile	2019-01-27 15:09:56.000000000 +0100
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99 -g
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -344,12 +344,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:
-@@ -370,7 +368,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
- 
-@@ -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
--	@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
-@@ -439,6 +437,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/stress-ng-0.09.49.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild
deleted file mode 100644
index 6cd26a16422..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.49.ebuild
+++ /dev/null
@@ -1,30 +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}/${PN}-0.09.47-makefile.patch" )

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 0dd8c5303f6..00000000000
--- 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" )


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2019-12-14  0:00 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2019-12-14  0:00 UTC (permalink / raw
  To: gentoo-commits

commit:     5455341cf9948ce3cbeefcdeabe4adc559216169
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 23:56:44 2019 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 23:59:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5455341c

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 .../files/stress-ng-0.09.53-makefile.patch         | 60 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild  | 38 --------------
 3 files changed, 99 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 9015dc1f9eb..5629dd3ca1c 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.10.12.tar.xz 408952 BLAKE2B f0894073c651f0defe35af0e916db4d60c211ea0b485cb574bf79ceaaa2794eada28dcf8e8cbee3747a6991d61ec829b0a3e5049e5cad540fc95e63ba33a38cc SHA512 d8b169adcea823113165ba3beabddd72cbd9e6780d39a52e459508ca088c50a5102eeca344e16f4e40d72d77f8135e3c5b973b07d55246ccb2a252806217e529
 DIST stress-ng-0.10.13.tar.xz 409940 BLAKE2B fffeaedd999a0887955674f3883f65124eb13814cf284ab1bd7c7dec34380cd381026d9217c9f949a7c0c2227c8b9558409153d0feff01473a6c9f49730f89b4 SHA512 97e8a7ce5dc5e428c26b0d4eeb1350c43c1043aa7dbf591112768c33e208bafe9df7fe737c9a912f0b4296d64e4b27b81131b459c356aca95bc8856e8b939639

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
deleted file mode 100644
index cf08858d361..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.53-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -347,12 +347,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:
-@@ -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
--	@echo "CC $<"
-+	echo "CC $<"
- 	@$(CC) -c apparmor-data.c -o apparmor-data.o
- 	@rm -rf apparmor-data.c apparmor-data.bin
- 
-@@ -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 $<
-+	$(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
-@@ -442,6 +440,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/stress-ng-0.10.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild
deleted file mode 100644
index 041c048472d..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.10.12.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 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 ~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.53-makefile.patch" )
-
-src_compile() {
-	tc-export CC
-
-	default
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-03-12 22:48 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-03-12 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     c934df136913677141b7cf8b6daa9e87c9037f3a
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 21:45:48 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 22:46:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c934df13

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 .../files/stress-ng-0.10.13-makefile.patch         | 64 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.10.18.ebuild  | 38 -------------
 3 files changed, 103 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 5d60252734c..3993ad108d0 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.10.18.tar.xz 417592 BLAKE2B 806a6b1bdd49e5f0ab7f91f0b381b74c47df43e896ee2bbb1f7b8e78a9604443615fd13f331806e6fbaf360f9088a3e8c80d51deadd0dd56ffe92f821b8a3bb5 SHA512 ee2980c28479e50fed90a697e4cbd60732934b0488bb18733d7df8e3e04c32d5f0c5458d536f836a1f8160a60b9d2aa0d99bd2d2de03e1cc94d2c60a250c2daa
 DIST stress-ng-0.11.02.tar.xz 421596 BLAKE2B 3f6eb0d6a17cdbedf66c3efdbaec73760e6f6dfedb8fb1c59f759c31dd5d471c0687e0fe7d1f578c630b0a38499c3e7bf37799571dfdab3c6d47965dc39967d6 SHA512 115812728bc26af6ce32e78fa8008fe5fb8a08d8fbb5d82ac96b49572e4c451c0f4affdbad86ce15b5f77106d0e50bdd209eeae4c84fe0e0547161f2f3064140

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
deleted file mode 100644
index f49988768d5..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.10.13-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 "systematic system smasher"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -359,12 +359,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:
-@@ -385,7 +383,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 @@
- 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
-@@ -455,7 +453,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.10.18.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.18.ebuild
deleted file mode 100644
index c7323260487..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.10.18.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 ~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.10.13-makefile.patch" )
-
-src_compile() {
-	tc-export CC
-
-	default
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-03-12 22:48 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-03-12 22:48 UTC (permalink / raw
  To: gentoo-commits

commit:     db5fa11ef69957741fcd21b08910b2dcf5e167bd
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 12 21:45:22 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Mar 12 22:46:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5fa11e

app-benchmarks/stress-ng: bump to version 0.11.02

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.11.02-makefile.patch         | 64 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild  | 38 +++++++++++++
 3 files changed, 103 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 0df4f687390..5d60252734c 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.10.18.tar.xz 417592 BLAKE2B 806a6b1bdd49e5f0ab7f91f0b381b74c47df43e896ee2bbb1f7b8e78a9604443615fd13f331806e6fbaf360f9088a3e8c80d51deadd0dd56ffe92f821b8a3bb5 SHA512 ee2980c28479e50fed90a697e4cbd60732934b0488bb18733d7df8e3e04c32d5f0c5458d536f836a1f8160a60b9d2aa0d99bd2d2de03e1cc94d2c60a250c2daa
+DIST stress-ng-0.11.02.tar.xz 421596 BLAKE2B 3f6eb0d6a17cdbedf66c3efdbaec73760e6f6dfedb8fb1c59f759c31dd5d471c0687e0fe7d1f578c630b0a38499c3e7bf37799571dfdab3c6d47965dc39967d6 SHA512 115812728bc26af6ce32e78fa8008fe5fb8a08d8fbb5d82ac96b49572e4c451c0f4affdbad86ce15b5f77106d0e50bdd209eeae4c84fe0e0547161f2f3064140

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
new file mode 100644
index 00000000000..bce1907d139
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
@@ -0,0 +1,64 @@
+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/stress-ng-0.11.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild
new file mode 100644
index 00000000000..d50be0f6a38
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.02.ebuild
@@ -0,0 +1,38 @@
+# 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 ~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
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-08-09 11:58 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-08-09 11:58 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-08-09 11:58 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-08-09 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     11f765a8afe5b2180942c70d2a11cbe5ecbb9588
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  9 11:57:28 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Aug  9 11:57:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11f765a8

app-benchmarks/stress-ng: drop old version

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.02-makefile.patch         | 64 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild  | 38 -------------
 3 files changed, 103 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 08ce915e76a..db5c9e05193 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-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.02-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.02-makefile.patch
deleted file mode 100644
index bce1907d139..00000000000
--- 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/stress-ng-0.11.10.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.10.ebuild
deleted file mode 100644
index b2cfc3fbc76..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-09-02 12:39 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-09-02 12:39 UTC (permalink / raw
  To: gentoo-commits

commit:     285d1df0bf8f3e4208def7b36974e72b9b929f7e
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 12:38:17 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 12:38:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285d1df0

app-benchmarks/stress-ng: fix compilation due optimization

Closes: https://bugs.gentoo.org/739830
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../stress-ng-0.11.19-optimization-checks.patch    | 87 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild  |  5 +-
 2 files changed, 91 insertions(+), 1 deletion(-)

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
new file mode 100644
index 00000000000..18bd02ae9d5
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
@@ -0,0 +1,87 @@
+From 70acc386b6afb726d4576a3d4368b51114e92530 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 1 Sep 2020 12:54:19 +0100
+Subject: [PATCH] stress-ng.h: build in target clone types if gcc supports the
+ feature
+
+Add in more build time optimization checks, try to build smarter with
+various gcc compatibility support checks.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ stress-ng.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 61 insertions(+), 1 deletion(-)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 3803bc71..6ce7d72e 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -1686,7 +1686,67 @@ extern void pr_dbg_lock(bool *locked, const char *fmt, ...)  FORMAT(printf, 2, 3
+ 
+ /* GCC5.0+ target_clones attribute */
+ #if defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_X86)
+-#define TARGET_CLONES	__attribute__((target_clones("mmx","sse","sse2","ssse3", "sse4.1", "sse4a", "avx", "avx2", "arch=skylake-avx512", "default")))
++#if defined(__MMX_WITH_SSE__)
++#define TARGET_CLONE_MMX	"mmx",
++#else
++#define TARGET_CLONE_MMX
++#endif
++
++#if defined(__AVX__)
++#define TARGET_CLONE_AVX	"avx",
++#else
++#define TARGET_CLONE_AVX
++#endif
++
++#if defined(__AVX2__)
++#define TARGET_CLONE_AVX2	"avx2",
++#else
++#define TARGET_CLONE_AVX2
++#endif
++
++#if defined(__SSE__)
++#define TARGET_CLONE_SSE	"sse",
++#else
++#define TARGET_CLONE_SSE
++#endif
++
++#if defined(__SSE2__)
++#define TARGET_CLONE_SSE2	"sse2",
++#else
++#define TARGET_CLONE_SSE2
++#endif
++
++#if defined(__SSE3__)
++#define TARGET_CLONE_SSE3	"sse3",
++#else
++#define TARGET_CLONE_SSE3
++#endif
++
++#if defined(__SSSE3__)
++#define TARGET_CLONE_SSSE3	"ssse3",
++#else
++#define TARGET_CLONE_SSSE3
++#endif
++
++#if defined(__SSE4_1__)
++#define TARGET_CLONE_SSE4_1	"sse4.1",
++#else
++#define TARGET_CLONE_SSE4_1
++#endif
++
++#if defined(__SSE4_2__)
++#define TARGET_CLONE_SSE4_2	"sse4.2",
++#else
++#define TARGET_CLONE_SSE4_2
++#endif
++
++#if defined(__AVX512F__)
++#define TARGET_CLONE_SKYLAKE_AVX512	"arch=skylake-avx512",
++#else
++#define TARGET_CLONE_SKYLAKE_AVX512
++#endif
++
++#define TARGET_CLONES	__attribute__((target_clones(TARGET_CLONE_AVX TARGET_CLONE_AVX2 TARGET_CLONE_MMX TARGET_CLONE_SSE TARGET_CLONE_SSE2 TARGET_CLONE_SSE3 TARGET_CLONE_SSSE3 TARGET_CLONE_SSE4_1 TARGET_CLONE_SSE4_2 TARGET_CLONE_SKYLAKE_AVX512 "default")))
+ #elif defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_PPC64)
+ #define TARGET_CLONES	__attribute__((target_clones("cpu=power9,default")))
+ #else

diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
index 4c88cc73a96..cadf668aef4 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.17-makefile.patch"
+	"${FILESDIR}/${PN}-0.11.19-optimization-checks.patch"
+)
 
 src_compile() {
 	tc-export CC


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-09-10 21:57 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-09-10 21:57 UTC (permalink / raw
  To: gentoo-commits

commit:     d4e293f30f2c4c62c2e467807872fe45348f02e7
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 21:55:03 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 21:57:25 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e293f3

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 .../stress-ng-0.11.19-optimization-checks.patch    | 87 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild  | 44 -----------
 3 files changed, 132 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index badb00724f8..8765c676141 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.11.19.tar.xz 475692 BLAKE2B 711e9532655e8b76c44d06a86c773e2a2d5c19cf08dec693f7aacf100060ed492fc7ace8244897d4b342a3f1cae8e3f81314cb5b792253957c1622621bd1f6c0 SHA512 eefb331699faccaaa98775e14e4f33f5cc99b86ec8feb8f1c34b6cb7d20f061c576f8fcd683e51740fa662fb54d987bed36b9d87ad13a1b39b4fe66e60177ab1
 DIST stress-ng-0.11.20.tar.xz 480540 BLAKE2B 97ef2726ae5882c405ac752b56fa14e1a08a428b2ff2685b2d513438394b86184aa412ce97ea428a6ab4ec42c29c6bd4f5c28da9331c27c477d29a8fbe070a74 SHA512 08dda9ec44d9bde873b0186c4dbf3b15090c261316f0ec0ceed5378d31780b85038f898957c892393fef593ad5c913d044c1db8e2b60c68d88f5678d0209b6ac

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
deleted file mode 100644
index 18bd02ae9d5..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 70acc386b6afb726d4576a3d4368b51114e92530 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Tue, 1 Sep 2020 12:54:19 +0100
-Subject: [PATCH] stress-ng.h: build in target clone types if gcc supports the
- feature
-
-Add in more build time optimization checks, try to build smarter with
-various gcc compatibility support checks.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
----
- stress-ng.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 61 insertions(+), 1 deletion(-)
-
-diff --git a/stress-ng.h b/stress-ng.h
-index 3803bc71..6ce7d72e 100644
---- a/stress-ng.h
-+++ b/stress-ng.h
-@@ -1686,7 +1686,67 @@ extern void pr_dbg_lock(bool *locked, const char *fmt, ...)  FORMAT(printf, 2, 3
- 
- /* GCC5.0+ target_clones attribute */
- #if defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_X86)
--#define TARGET_CLONES	__attribute__((target_clones("mmx","sse","sse2","ssse3", "sse4.1", "sse4a", "avx", "avx2", "arch=skylake-avx512", "default")))
-+#if defined(__MMX_WITH_SSE__)
-+#define TARGET_CLONE_MMX	"mmx",
-+#else
-+#define TARGET_CLONE_MMX
-+#endif
-+
-+#if defined(__AVX__)
-+#define TARGET_CLONE_AVX	"avx",
-+#else
-+#define TARGET_CLONE_AVX
-+#endif
-+
-+#if defined(__AVX2__)
-+#define TARGET_CLONE_AVX2	"avx2",
-+#else
-+#define TARGET_CLONE_AVX2
-+#endif
-+
-+#if defined(__SSE__)
-+#define TARGET_CLONE_SSE	"sse",
-+#else
-+#define TARGET_CLONE_SSE
-+#endif
-+
-+#if defined(__SSE2__)
-+#define TARGET_CLONE_SSE2	"sse2",
-+#else
-+#define TARGET_CLONE_SSE2
-+#endif
-+
-+#if defined(__SSE3__)
-+#define TARGET_CLONE_SSE3	"sse3",
-+#else
-+#define TARGET_CLONE_SSE3
-+#endif
-+
-+#if defined(__SSSE3__)
-+#define TARGET_CLONE_SSSE3	"ssse3",
-+#else
-+#define TARGET_CLONE_SSSE3
-+#endif
-+
-+#if defined(__SSE4_1__)
-+#define TARGET_CLONE_SSE4_1	"sse4.1",
-+#else
-+#define TARGET_CLONE_SSE4_1
-+#endif
-+
-+#if defined(__SSE4_2__)
-+#define TARGET_CLONE_SSE4_2	"sse4.2",
-+#else
-+#define TARGET_CLONE_SSE4_2
-+#endif
-+
-+#if defined(__AVX512F__)
-+#define TARGET_CLONE_SKYLAKE_AVX512	"arch=skylake-avx512",
-+#else
-+#define TARGET_CLONE_SKYLAKE_AVX512
-+#endif
-+
-+#define TARGET_CLONES	__attribute__((target_clones(TARGET_CLONE_AVX TARGET_CLONE_AVX2 TARGET_CLONE_MMX TARGET_CLONE_SSE TARGET_CLONE_SSE2 TARGET_CLONE_SSE3 TARGET_CLONE_SSSE3 TARGET_CLONE_SSE4_1 TARGET_CLONE_SSE4_2 TARGET_CLONE_SKYLAKE_AVX512 "default")))
- #elif defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_PPC64)
- #define TARGET_CLONES	__attribute__((target_clones("cpu=power9,default")))
- #else

diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
deleted file mode 100644
index 45fa78dbb29..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
+++ /dev/null
@@ -1,44 +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"
-	"${FILESDIR}/${PN}-0.11.19-optimization-checks.patch"
-)
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2020-10-30 22:43 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2020-10-30 22:43 UTC (permalink / raw
  To: gentoo-commits

commit:     5413fb9b87df58ec7bcf4922d9049f7c666d131a
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 22:25:17 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:43:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5413fb9b

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-3.0.8, Repoman-3.0.2
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.22.ebuild  | 41 ---------------
 3 files changed, 103 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 5aa29283411..f7ed2493196 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.11.22.tar.xz 495692 BLAKE2B 738883d59f4054d650de33f67ddf1e4a27625631e22295e3df00ba115d229a1f747e1b2948313beca55af160010683c20f4acad02eb2231c0a908af6534b266e SHA512 1685c7eb675bae1f751d8dbeb20dcd4ce753c564524d773dd6a396ace83bd94558425a3557d7d8cb86b87fb9a477069f85b81aec41649db3ccee2a32422b2546
 DIST stress-ng-0.11.23.tar.xz 499540 BLAKE2B ccba08bdb756737e782f896fe364869e4f939f7c8e9d5a02f8138d85f3d1922740100a58d9652169735eab994ab89df331b97bb08b588a721a6b1a8511fab937 SHA512 1642e6ea8ee75e400d5ea4e40d61384f9a895cd489715be1107d6cd06eea2274ac0b32320cabe806d0f919efbea8061848d9c9c4bdc5980704e7a2db45c9be70

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 d3c5e93b007..00000000000
--- 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/stress-ng-0.11.22.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.22.ebuild
deleted file mode 100644
index 3985c5e0570..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.11.22.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
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2021-02-11 16:41 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-02-11 16:41 UTC (permalink / raw
  To: gentoo-commits

commit:     1942d7760fa239b4a94620045fc4320a1fe362d8
Author:     Adrian Ratiu <adrian.ratiu <AT> collabora <DOT> com>
AuthorDate: Thu Feb 11 11:53:03 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Feb 11 16:40:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1942d776

app-benchmarks/stress-ng: backport newer glibc ustat.h fix

Newer glibc has removed ustat.h and stress-ng has a workaround
which unfortunately fails due to a minor bug. This backports
the fix from upstream because there is no stress-ng release yet
containing it.

Upstream commit:
https://github.com/ColinIanKing/stress-ng/commit/ce1fb7978c836281dd91558f2b4ab3ecee0c253c

Closes: https://github.com/gentoo/gentoo/pull/19413
Signed-off-by: Adrian Ratiu <adrian.ratiu <AT> collabora.com>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ....12.02-fix-build-breaking-HAVE_USTAT-typo.patch | 46 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild  |  5 ++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
new file mode 100644
index 00000000000..14498b49449
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
@@ -0,0 +1,46 @@
+From ce1fb7978c836281dd91558f2b4ab3ecee0c253c Mon Sep 17 00:00:00 2001
+From: Adrian Ratiu <adrian.ratiu@collabora.com>
+Date: Wed, 10 Feb 2021 14:28:00 +0200
+Subject: [PATCH] stress-ng.h: fix build-breaking HAVE_USTAT typo
+
+This minor typo fails builds on newer glibc because ustat.h does
+not exist anymore.
+
+Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
+---
+Backported from stress-ng master commit ce1fb7978c836281d.
+---
+ core-shim.c | 3 ++-
+ stress-ng.h | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/core-shim.c b/core-shim.c
+index e4e6189d..8af7bcc5 100644
+--- a/core-shim.c
++++ b/core-shim.c
+@@ -1390,7 +1390,8 @@ int sys_clone3(struct shim_clone_args *cl_args, size_t size)
+ 
+ int shim_ustat(dev_t dev, struct shim_ustat *ubuf)
+ {
+-#if defined(HAVE_USTAT)
++#if defined(HAVE_USTAT) &&	\
++     defined(HAVE_USTAT_H)
+ 	return ustat(dev, (void *)ubuf);
+ #elif defined(__NR_ustat)
+ 	return syscall(__NR_ustat, dev, ubuf);
+diff --git a/stress-ng.h b/stress-ng.h
+index e16a08f0..9d964059 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -219,7 +219,7 @@
+ #include <ucontext.h>
+ #endif
+ 
+-#if defined(HAVE_USTAT)
++#if defined(HAVE_USTAT_H)
+ #include <ustat.h>
+ #endif
+ 
+-- 
+2.30.0
+

diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
index 01aaca45b7b..ec872d653bd 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
 
-PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.11.23-makefile.patch"
+	"${FILESDIR}/${PN}-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch"
+)
 
 src_compile() {
 	tc-export CC


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2021-03-25 22:00 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-03-25 22:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2c152f411d10ddd6a758dec42467469640ff92f5
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 21:59:40 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 21:59:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c152f41

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 -
 .../files/stress-ng-0.11.23-makefile.patch         | 60 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild  | 41 ---------------
 3 files changed, 102 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 3c08401932f..6d545aab212 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.12.05.tar.xz 529660 BLAKE2B 3ba32dceddeae0910a20fe2a6dda783845059a8d022c372ffef9fc2908ef8b724eb9ce9fef111102f4a07c6f3f05e80560d74285c15a6f82f665a716163b4f1e SHA512 c7be3bfbded5e0d953a02d59fdd983af46e9588b21c4858b26a9432b72f4c6bd5710f5294372746adcb52aeb8d0e9800c99c3256d269b25458af31591f63a758
 DIST stress-ng-0.12.06.tar.xz 530940 BLAKE2B dcf1c97df38cdfd15c88fa71497477d83a0ab8e18ca506717f360b8a1f284be00163f6de956d686cdd6d479bd6fb2075ec2dc4dea55b4af4c623caf4a412e7a0 SHA512 bdfbee6c1d339dc4d288aa28b08bdaf158f49bb023b527c653e7956d80607690fe4aab763acc8c6659e822f2e225ee2be39ff60effa972b05c4c5e0fe067d6fc

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
deleted file mode 100644
index 77687d2a114..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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.12.05.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild
deleted file mode 100644
index 01aaca45b7b..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.05.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
@ 2021-08-07 22:49 Conrad Kostecki
  0 siblings, 0 replies; 17+ messages in thread
From: Conrad Kostecki @ 2021-08-07 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     1e6dab027917e201726e4d850cd64679f467f207
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  7 22:42:13 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Aug  7 22:42:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6dab02

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |   1 -
 .../files/stress-ng-0.12.12-glibc-2.34.patch       | 101 ---------------------
 app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild  |  44 ---------
 3 files changed, 146 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 0a20da10672..69c66bd1fde 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.12.12.tar.xz 558492 BLAKE2B ccd805a2f50306b50f95d98cdf766a82a511a03e2728cdcb70c51e6df75280c42195ed71b5a27bb4b70049ab1d18a6e47d7a1549a49601fc4f6fe3d0330db1b2 SHA512 1061618a44b2cb399cb845abf7de88009376dd186f259f7d91cdc6fb7102b2d869806d4c76c113c2355da426c066e41f7ee2e3d229fa499b16d993ec1cd5b278
 DIST stress-ng-0.13.00.tar.xz 566324 BLAKE2B 62a075f2945127f1e730c46c596cbfdd407826ec2e5f1c3000dbf47000ecd4a136463ef2cb13cb736fc2db12ae215d87fc28c757e4d7d292fcce73b676fdc729 SHA512 c3d5dd7d27d538f148837bf8be0a9a9f4713bfb44c6ea203647b87b1a033757cb61599781ce95ea8b06943dcc1ed7762dec8c9859ad77673b5d44f3380741d6e

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch b/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch
deleted file mode 100644
index b2f93f21cba..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From f839de283c44ffe46a2d14bfdf854c145abd8ed6 Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Mon, 19 Jul 2021 20:49:34 +0100
-Subject: [PATCH] Detemine minimal stack size via sysconf, then
- PTHREAD_STACK_MIN then guess
-
-Don't rely on PTHREAD_STACK_MIN being defined, use sysconf, then
-PTHREAD_STACK_MIN if it is defined, then 8K default.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
----
- core-helper.c    | 31 +++++++++++++++++++++++++++++++
- stress-ng.h      |  1 +
- stress-pthread.c | 13 ++-----------
- 3 files changed, 34 insertions(+), 11 deletions(-)
-
-diff --git a/core-helper.c b/core-helper.c
-index 508627f2..97a3b869 100644
---- a/core-helper.c
-+++ b/core-helper.c
-@@ -2494,6 +2494,37 @@ size_t stress_min_sig_stack_size(void)
- 	return (size_t)sz;
- }
- 
-+size_t stress_min_pthread_stack_size(void)
-+{
-+	static long sz = -1, min;
-+
-+	/* return cached copy */
-+	if (sz > 0)
-+		return sz;
-+
-+	min = stress_min_aux_sig_stack_size();
-+#if defined(__SC_THREAD_STACK_MIN_VALUE)
-+	sz = sysconf(__SC_THREAD_STACK_MIN_VALUE);
-+	if (sz > min)
-+		min = sz;
-+#endif
-+#if defined(_SC_THREAD_STACK_MIN_VALUE)
-+	sz = sysconf(_SC_THREAD_STACK_MIN_VALUE);
-+	if (sz > min)
-+		min = sz;
-+#endif
-+#if defined(PTHREAD_STACK_MIN)
-+	if (PTHREAD_STACK_MIN > min)
-+		min = PTHREAD_STACK_MIN;
-+#endif
-+	if (8192 > min)
-+		min = 8192;
-+
-+	sz = min;
-+
-+	return (size_t)sz;
-+}
-+
- /*
-  *  stress_sig_handler_exit()
-  *	signal handler that exits a process via _exit(0) for
-diff --git a/stress-ng.h b/stress-ng.h
-index 8a8b17ae..cd744756 100644
---- a/stress-ng.h
-+++ b/stress-ng.h
-@@ -4056,6 +4056,7 @@ extern WARN_UNUSED int32_t  stress_get_opt_ionice_class(const char *const str);
- /* Misc helper funcs */
- extern WARN_UNUSED size_t stress_sig_stack_size(void);
- extern WARN_UNUSED size_t stress_min_sig_stack_size(void);
-+extern WARN_UNUSED size_t stress_min_pthread_stack_size(void);
- 
- #define STRESS_SIGSTKSZ		(stress_sig_stack_size())
- #define STRESS_MINSIGSTKSZ	(stress_min_sig_stack_size())
-diff --git a/stress-pthread.c b/stress-pthread.c
-index 0da3aeec..27777af8 100644
---- a/stress-pthread.c
-+++ b/stress-pthread.c
-@@ -69,12 +69,7 @@ static const stress_opt_set_func_t opt_set_funcs[] = {
- 
- #if defined(HAVE_LIB_PTHREAD)
- 
--/* Some systems such as GNU/HURD don't define PTHREAD_STACK_MIN */
--#if !defined(PTHREAD_STACK_MIN)
--#define PTHREAD_STACK_MIN		(16 * KB)
--#endif
--
--#define DEFAULT_STACK_MIN		(16 * KB)
-+#define DEFAULT_STACK_MIN		(8 * KB)
- 
- #if defined(HAVE_GET_ROBUST_LIST) &&	\
-     defined(HAVE_LINUX_FUTEX_H)
-@@ -404,11 +399,7 @@ static int stress_pthread(const stress_args_t *args)
- 	stress_pthread_args_t pargs = { args, NULL, 0 };
- 	sigset_t set;
- #if defined(HAVE_PTHREAD_ATTR_SETSTACK)
--#if DEFAULT_STACK_MIN == PTHREAD_STACK_MIN
--	const size_t stack_size = PTHREAD_STACK_MIN;
--#else
--	const size_t stack_size = STRESS_MAXIMUM(DEFAULT_STACK_MIN, PTHREAD_STACK_MIN);
--#endif
-+	const size_t stack_size = STRESS_MAXIMUM(DEFAULT_STACK_MIN, stress_min_pthread_stack_size());
- #endif
- 
- 	keep_running_flag = true;

diff --git a/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild b/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
deleted file mode 100644
index 4269478b747..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 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
-	virtual/libcrypt:=
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-PATCHES=( "${FILESDIR}/${PN}-0.12.12-glibc-2.34.patch" )
-
-src_compile() {
-	export MAN_COMPRESS=0
-	export VERBOSE=1
-	tc-export CC
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}


^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2021-08-07 22:49 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-15 16:26 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2018-09-04 22:32 Patrice Clement
2018-11-03  9:13 Michał Górny
2018-12-16 19:30 Andreas Sturmlechner
2019-02-21 22:31 Andreas Sturmlechner
2019-02-21 22:31 Andreas Sturmlechner
2019-12-14  0:00 Conrad Kostecki
2020-03-12 22:48 Conrad Kostecki
2020-03-12 22:48 Conrad Kostecki
2020-08-09 11:58 Conrad Kostecki
2020-08-09 11:58 Conrad Kostecki
2020-09-02 12:39 Conrad Kostecki
2020-09-10 21:57 Conrad Kostecki
2020-10-30 22:43 Conrad Kostecki
2021-02-11 16:41 Conrad Kostecki
2021-03-25 22:00 Conrad Kostecki
2021-08-07 22:49 Conrad Kostecki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox