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

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

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

commit:     f7d3837805951a76cb5c2252b9fed98eac22383e
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Jun 24 12:52:49 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 14:11:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d38378

app-benchmarks/stress-ng: drop old version

Closes: https://github.com/gentoo/gentoo/pull/8932
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-benchmarks/stress-ng/Manifest                 |  1 -
 app-benchmarks/stress-ng/files/makefile.patch     | 81 -----------------------
 app-benchmarks/stress-ng/stress-ng-0.09.30.ebuild | 28 --------
 3 files changed, 110 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index b5a7861dcd6..cf52f61dd84 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.09.30.tar.xz 350520 BLAKE2B 24d4b92947aa00549905166f58408e4c3d90945c7dc4f0e4bb1d143eea80cc7ef641547611c68f80d45c77a2b552937b6426c3162c54137435ceb578fa5da5a7 SHA512 3bab686e9a251e9f693987cf90554687acc3a4ea06712adc4c90ff45e6fbf650077017ecde49871aa1806ef9c874fd819f9ae65baea04bdf576da2abbf273f9c
 DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1 SHA512 01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac

diff --git a/app-benchmarks/stress-ng/files/makefile.patch b/app-benchmarks/stress-ng/files/makefile.patch
deleted file mode 100644
index eecb12cad5b..00000000000
--- a/app-benchmarks/stress-ng/files/makefile.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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/stress-ng-0.09.30.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.30.ebuild
deleted file mode 100644
index 22522e099dc..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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" )


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

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

commit:     e404ead5ff23f0b1197a75abcf5e64c326fa8ce7
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Jun 24 12:51:49 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 24 14:11:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e404ead5

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

Closes: https://bugs.gentoo.org/598040
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.09.31-makefile.patch         | 64 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild  | 28 ++++++++++
 3 files changed, 93 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index bdbe1b90270..b5a7861dcd6 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.09.30.tar.xz 350520 BLAKE2B 24d4b92947aa00549905166f58408e4c3d90945c7dc4f0e4bb1d143eea80cc7ef641547611c68f80d45c77a2b552937b6426c3162c54137435ceb578fa5da5a7 SHA512 3bab686e9a251e9f693987cf90554687acc3a4ea06712adc4c90ff45e6fbf650077017ecde49871aa1806ef9c874fd819f9ae65baea04bdf576da2abbf273f9c
+DIST stress-ng-0.09.31.tar.xz 350760 BLAKE2B 5f839b4a4020cb3f1c5cfeafafefc576dd36f4d6c600f4cce917837ddf3f2e70349b0b76037dc2ee0e3d96fca172d65b01629559f705bdbf6f975978a79f58b1 SHA512 01fc32bac51adcbf98907c73bfc0c54ec9d04355d3959e7dcba208dbd85c314310cf6c5b4fe092dad53bfca54d7dfe6d292b75845bc0b0998e43f9907dbc50ac

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
new file mode 100644
index 00000000000..633c6db1b3f
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
@@ -0,0 +1,64 @@
+--- a/Makefile	2018-06-21 15:39:27.000000000 +0200
++++ b/Makefile	2018-06-24 14:46:41.773596760 +0200
+@@ -21,7 +21,7 @@
+ # Codename "portable pressure producer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -319,12 +319,10 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o: stress-ng.h Makefile $(SRC)
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: info $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
+ 	@sync
+ 
+ .PHONY: info
+@@ -344,8 +342,7 @@
+ 		sed '$$ s/.$$//' >> apparmor-data.c
+ 	@echo "};" >> apparmor-data.c
+ 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+-	@echo "CC $<"
+-	@$(CC) -c apparmor-data.c -o apparmor-data.o
++	$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+ #
+@@ -360,12 +357,10 @@
+ perf.o: perf.c perf-event.c
+ 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ 	@touch stress-ng.c
+ 
+ $(OBJS): stress-ng.h Makefile
+@@ -405,10 +400,10 @@
+ 	STRESS_NG=./stress-ng debian/tests/fast-test-all
+ 
+ .PHONY: install
+-install: stress-ng stress-ng.1.gz
++install: stress-ng
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp stress-ng ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++	cp stress-ng.1 ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+ 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
new file mode 100644
index 00000000000..7652a40c8cf
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.31.ebuild
@@ -0,0 +1,28 @@
+# 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}/${P}-makefile.patch" )


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

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

commit:     7be75249c9928f71c55109fc87667e5c72f3e33a
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Sep 16 19:57:08 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 16:05:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be75249

app-benchmarks/stress-ng: drop old version

Bug: https://bugs.gentoo.org/666320
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/9890

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

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 881a0ee24e7..fc17a7ac2fd 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.09.38.tar.xz 355252 BLAKE2B 9382d48af5fa7fbb9128887d484688045cf033a2f5997898209f530ef6c27ea27c5271666247a9c650f4dd66bd2add93586dd5beb19f6509f78b9e355791cf27 SHA512 b3f3d03151cd5afaa267eb028ec9f450d8dccec851de0f16fe8d83e81b7a8e9572b7c556e1fab4ecc57c56829e6d30023716708f15b9156af146a0c72ae4ddf8
 DIST stress-ng-0.09.40.tar.xz 358268 BLAKE2B 4c52af04ea4579c53ac2e44a32322f2b4a962e78a44fea088ae1046e6e4d9e77c3b8110864d02088c99379d12f0f4edab29bc8be5102c6a8dd0f27ff4ed20c31 SHA512 f60057596e80488d3160e984c547471fb7874e76bb13d5d57407336d2770ed480902c05b013c7e27e682ca84954daa7fd9a4bbe2b45b3307ba3361ec747a21d6

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
deleted file mode 100644
index 6a36bc4adaf..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile	2018-08-23 17:55:27.000000000 +0200
-+++ b/Makefile	2018-09-01 14:46:51.000000000 +0200
-@@ -21,7 +21,7 @@
- # Codename "portable pressure producer"
- #
- 
--CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
-+CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
- 
- #
- # Pedantic flags
-@@ -337,12 +337,10 @@
- .o: stress-ng.h Makefile
- 
- .c.o: stress-ng.h Makefile $(SRC)
--	@echo "CC $<"
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-ng: $(OBJS)
--	@echo "LD $@"
--	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
-+	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
- 	@sync
- 
- makeconfig:
-@@ -363,8 +361,7 @@
- 		sed '$$ s/.$$//' >> apparmor-data.c
- 	@echo "};" >> apparmor-data.c
- 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
--	@echo "CC $<"
--	@$(CC) -c apparmor-data.c -o apparmor-data.o
-+	$(CC) -c apparmor-data.c -o apparmor-data.o
- 	@rm -rf apparmor-data.c apparmor-data.bin
- 
- #
-@@ -379,12 +376,10 @@
- perf.o: perf.c perf-event.c
- 	@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
- 	awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
--	@echo CC $<
--	@$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) -c -o $@ $<
- 
- stress-vecmath.o: stress-vecmath.c
--	@echo CC $<
--	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
-+	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
- 	@touch stress-ng.c
- 
- $(OBJS): stress-ng.h Makefile
-@@ -428,10 +423,10 @@
- 	./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
- 
- .PHONY: install
--install: stress-ng stress-ng.1.gz
-+install: stress-ng
- 	mkdir -p ${DESTDIR}${BINDIR}
- 	cp stress-ng ${DESTDIR}${BINDIR}
- 	mkdir -p ${DESTDIR}${MANDIR}
--	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
-+	cp stress-ng.1 ${DESTDIR}${MANDIR}
- 	mkdir -p ${DESTDIR}${JOBDIR}
- 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}

diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
deleted file mode 100644
index 66c8efa4f87..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.38.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}/${P}-makefile.patch" )


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

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

commit:     3d51453c0c2e175c64d70249023295c60c13387d
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Sep 16 19:55:59 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 19 16:05:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d51453c

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

Closes: https://bugs.gentoo.org/666320
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
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.40.ebuild  | 28 ++++++++++
 3 files changed, 93 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 1a8470dac5e..881a0ee24e7 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.09.38.tar.xz 355252 BLAKE2B 9382d48af5fa7fbb9128887d484688045cf033a2f5997898209f530ef6c27ea27c5271666247a9c650f4dd66bd2add93586dd5beb19f6509f78b9e355791cf27 SHA512 b3f3d03151cd5afaa267eb028ec9f450d8dccec851de0f16fe8d83e81b7a8e9572b7c556e1fab4ecc57c56829e6d30023716708f15b9156af146a0c72ae4ddf8
+DIST stress-ng-0.09.40.tar.xz 358268 BLAKE2B 4c52af04ea4579c53ac2e44a32322f2b4a962e78a44fea088ae1046e6e4d9e77c3b8110864d02088c99379d12f0f4edab29bc8be5102c6a8dd0f27ff4ed20c31 SHA512 f60057596e80488d3160e984c547471fb7874e76bb13d5d57407336d2770ed480902c05b013c7e27e682ca84954daa7fd9a4bbe2b45b3307ba3361ec747a21d6

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
new file mode 100644
index 00000000000..e3478e8ced8
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.40-makefile.patch
@@ -0,0 +1,64 @@
+--- 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.40.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.40.ebuild
new file mode 100644
index 00000000000..66c8efa4f87
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.40.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="http://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="http://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	net-misc/lksctp-tools
+	sys-apps/attr
+	sys-apps/keyutils
+	sys-libs/libapparmor
+	sys-libs/libcap
+	sys-libs/zlib:="
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )


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

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/
@ 2018-10-05 21:39 Andreas Sturmlechner
  0 siblings, 0 replies; 13+ messages in thread
From: Andreas Sturmlechner @ 2018-10-05 21:39 UTC (permalink / raw
  To: gentoo-commits

commit:     5e9db7bc5fb91a63f1392c1a52decd096aa54757
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Fri Oct  5 15:33:30 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct  5 21:39:28 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9db7bc

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

Closes: https://bugs.gentoo.org/667824
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
Closes: https://github.com/gentoo/gentoo/pull/10079
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.09.42-makefile.patch         | 64 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild  | 28 ++++++++++
 3 files changed, 93 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index e63724e2a46..b9bca146eb2 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +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

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
new file mode 100644
index 00000000000..66c07acf679
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
@@ -0,0 +1,64 @@
+--- a/Makefile	2018-10-05 11:49:55.000000000 +0200
++++ b/Makefile	2018-10-05 17:28:38.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
+@@ -339,12 +339,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:
+@@ -365,8 +363,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
+ 
+ #
+@@ -381,12 +378,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
+@@ -430,10 +425,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.42.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild
new file mode 100644
index 00000000000..59b29c72c00
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.42.ebuild
@@ -0,0 +1,28 @@
+# 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] 13+ messages in thread

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

commit:     0fa26d7f579e478eec8b42a9ef27c41eca89e57f
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Tue Nov 27 22:54:56 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=0fa26d7f

app-benchmarks/stress-ng: drop old version

Package-Manager: Portage-2.3.52, 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                  |  1 -
 .../files/stress-ng-0.09.42-makefile.patch         | 64 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.09.44.ebuild  | 30 ----------
 3 files changed, 95 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 1c2b22f4f1d..9e84dcd836b 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-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.42-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
deleted file mode 100644
index 66c07acf679..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.42-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile	2018-10-05 11:49:55.000000000 +0200
-+++ b/Makefile	2018-10-05 17:28:38.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
-@@ -339,12 +339,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:
-@@ -365,8 +363,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
- 
- #
-@@ -381,12 +378,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
-@@ -430,10 +425,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.44.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.44.ebuild
deleted file mode 100644
index 70abac3e8dc..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.09.44.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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}/${PN}-0.09.42-makefile.patch" )


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

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/
@ 2019-01-29 23:00 Patrice Clement
  0 siblings, 0 replies; 13+ messages in thread
From: Patrice Clement @ 2019-01-29 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     a459bc1e7564c6529c49b71c2570d0e290378294
Author:     Conrad Kostecki <conrad <AT> kostecki <DOT> com>
AuthorDate: Sun Jan 27 14:12:31 2019 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jan 29 23:00:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a459bc1e

app-benchmarks/stress-ng: bump to version 0.09.50.

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Conrad Kostecki <conrad <AT> kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/10911
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 app-benchmarks/stress-ng/Manifest                  |  1 +
 .../files/stress-ng-0.09.50-makefile.patch         | 60 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild  | 35 +++++++++++++
 3 files changed, 96 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index d4e01fb45db..e3e47304d0a 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 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

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
new file mode 100644
index 00000000000..791f599118b
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.50-makefile.patch
@@ -0,0 +1,60 @@
+--- 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.50.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
new file mode 100644
index 00000000000..13f9d61038e
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.50.ebuild
@@ -0,0 +1,35 @@
+# 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="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] 13+ messages in thread

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

commit:     68fe4382f23d4f5937721b06ca47179cb4989880
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 23:56:07 2019 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 23:59:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fe4382

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

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.10.13-makefile.patch         | 61 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild  | 38 ++++++++++++++
 3 files changed, 100 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 592135dc508..9015dc1f9eb 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 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.10.13-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
new file mode 100644
index 00000000000..b6a8554cdde
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.10.13-makefile.patch
@@ -0,0 +1,61 @@
+--- stress-ng-0.10.13.orig/Makefile	2019-12-09 13:42:13.000000000 +0100
++++ stress-ng-0.10.13/Makefile	2019-12-14 00:51:33.390034647 +0100
+@@ -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.13.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
new file mode 100644
index 00000000000..342e1b2caa4
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.13.ebuild
@@ -0,0 +1,38 @@
+# 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}/${P}-makefile.patch" )
+
+src_compile() {
+	tc-export CC
+
+	default
+}


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

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

commit:     94609f14db5f51c454afc7684ffb8ec7112a02c7
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 00:55:12 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 01:02:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94609f14

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

Also slightly updated patch, to make it look more clean,
as recommended by https://dev.gentoo.org/~vapier/clean-patches.

Package-Manager: Portage-2.3.84, 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         |  7 ++--
 app-benchmarks/stress-ng/stress-ng-0.10.16.ebuild  | 38 ++++++++++++++++++++++
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 0152f1ab2f7..648b25e0874 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 DIST stress-ng-0.10.14.tar.xz 410204 BLAKE2B 347a8e5eed70b23022de7bf6af53547e25e704647f6d37f328a60e3023b40a44f627f146199d847641ef5493e167cdcce11d1b945b851bbc4c84cf67b449d1f8 SHA512 f2c2f46c72f7d5a10f2522be775821d6f199253eac4e9a1f0ecdb3c7007a0ab4eb0c671b35abbff34601fcf71f4c8ea60c8bdca9a5a7986c9e9c0e2e009f462a
+DIST stress-ng-0.10.16.tar.xz 415740 BLAKE2B c2a169455c3c975757d811148cf564f937d2109c4551e1308e92b6422e843d2b7e764de75e2ba54523802bbae7fe944f7d19eb44c36d5821af60fd047a999330 SHA512 b61ffff1dec7a2d2b2c3dc12a5e6c4945955777d2e218b5bbe291872911e982eed1df2d2b98dd3068f99ec920a070dd3287caa376feeca41d6cee2ff56d552d5

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
index b6a8554cdde..f49988768d5 100644
--- 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
@@ -1,5 +1,8 @@
---- stress-ng-0.10.13.orig/Makefile	2019-12-09 13:42:13.000000000 +0100
-+++ stress-ng-0.10.13/Makefile	2019-12-14 00:51:33.390034647 +0100
+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"
  #

diff --git a/app-benchmarks/stress-ng/stress-ng-0.10.16.ebuild b/app-benchmarks/stress-ng/stress-ng-0.10.16.ebuild
new file mode 100644
index 00000000000..c7323260487
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.10.16.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.10.13-makefile.patch" )
+
+src_compile() {
+	tc-export CC
+
+	default
+}


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

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

commit:     52bc9443c8e57b964a8325a9209d851461bc8b69
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 22:24:13 2020 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 22:43:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52bc9443

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

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.23-makefile.patch         | 60 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild  | 41 +++++++++++++++
 3 files changed, 102 insertions(+)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 1e292ca6e33..5aa29283411 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1 +1,2 @@
 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.23-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
new file mode 100644
index 00000000000..77687d2a114
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.23-makefile.patch
@@ -0,0 +1,60 @@
+--- a/Makefile
++++ b/Makefile
+@@ -21,7 +21,7 @@
+ # Codename "synthetic system strainer"
+ #
+ 
+-CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -O2 -std=gnu99
++CFLAGS += -Wall -Wextra -DVERSION='"$(VERSION)"' -std=gnu99
+ 
+ #
+ # Pedantic flags
+@@ -364,12 +364,10 @@
+ .o: stress-ng.h Makefile
+ 
+ .c.o:
+-	@echo "CC $<"
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-ng: $(OBJS)
+-	@echo "LD $@"
+-	@$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -o $@
+ 	@sync
+ 
+ makeconfig:
+@@ -390,8 +388,7 @@
+ 		sed '$$ s/.$$//' >> apparmor-data.c
+ 	@echo "};" >> apparmor-data.c
+ 	@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
+-	@echo "CC $<"
+-	@$(CC) -c apparmor-data.c -o apparmor-data.o
++	$(CC) -c apparmor-data.c -o apparmor-data.o
+ 	@rm -rf apparmor-data.c apparmor-data.bin
+ 
+ #
+@@ -419,12 +416,10 @@
+ 	@$(CC) $(CFLAGS) -E core-perf-event.c | $(GREP) "PERF_COUNT" | \
+ 	sed 's/,/ /' | sed s/'^ *//' | \
+ 	awk {'print "#define _SNG_" $$1 " (1)"'} > core-perf-event.h
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) -c -o $@ $<
+ 
+ stress-vecmath.o: stress-vecmath.c
+-	@echo CC $<
+-	@$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
++	$(CC) $(CFLAGS) -fno-builtin -c -o $@ $<
+ 
+ $(OBJS): stress-ng.h Makefile
+ 
+@@ -478,7 +473,7 @@
+ 	mkdir -p ${DESTDIR}${BINDIR}
+ 	cp stress-ng ${DESTDIR}${BINDIR}
+ 	mkdir -p ${DESTDIR}${MANDIR}
+-	cp stress-ng.1.gz ${DESTDIR}${MANDIR}
++	cp stress-ng.1 ${DESTDIR}${MANDIR}
+ 	mkdir -p ${DESTDIR}${JOBDIR}
+ 	cp -rp example-jobs/*.job ${DESTDIR}${JOBDIR}
+ 	mkdir -p ${DESTDIR}${BASHDIR}

diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild
new file mode 100644
index 00000000000..a01d58d2dda
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.23.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature toolchain-funcs
+
+DESCRIPTION="Stress test for a computer system with various selectable ways"
+HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
+SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-apps/keyutils:=
+	sys-libs/libcap
+	sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}"
+
+DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
+
+PATCHES=( "${FILESDIR}/${PN}-0.11.23-makefile.patch" )
+
+src_compile() {
+	tc-export CC
+
+	default
+}
+
+pkg_postinst() {
+	optfeature "AppArmor support" sys-libs/libapparmor
+	optfeature "SCTP support" net-misc/lksctp-tools
+}


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

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

commit:     e8bcbfd1e258a80c3437f4b198728e049ae45d68
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 14 19:53:05 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Feb 14 19:53:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8bcbfd1

app-benchmarks/stress-ng: drop old version

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

 app-benchmarks/stress-ng/Manifest                  |  1 -
 ....12.02-fix-build-breaking-HAVE_USTAT-typo.patch | 46 ----------------------
 app-benchmarks/stress-ng/stress-ng-0.12.02.ebuild  | 44 ---------------------
 3 files changed, 91 deletions(-)

diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 115c7ce3290..39ed89124c2 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,2 +1 @@
-DIST stress-ng-0.12.02.tar.xz 519476 BLAKE2B a56f5e186083fdd2675a13c8ed0e128cb30f0c16787f24dff5db484dbf318d00fe2d9887947b54122e83e8aee3c203c2c8fda4adf6c7c28d0e68b357acb58641 SHA512 074baa898cce4dad898e628e86d7cf29eeef4226bdceddd7e3b05a68327f8fa98df5875434599985049e280f649d2df9a2e0fa7ff32482a800a9fb0ff0c91b7c
 DIST stress-ng-0.12.03.tar.xz 525156 BLAKE2B 76b56f01670e553acef9caef3c9aea5fb2a0594d9a26694de9aff8d3243494269c82af6d0259cb759dc4763f3faae28f1f06ce797ec07c08a2b8a9516caf7365 SHA512 372de29089645fe80d4b9c17779b7dd0f724d910c898cb181791476e64906cf7713b0cc78d33bb9d4485b02928122590d76f3af731e24923f6b26ce65f862114

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
deleted file mode 100644
index 14498b49449..00000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.12.02-fix-build-breaking-HAVE_USTAT-typo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index ec872d653bd..00000000000
--- a/app-benchmarks/stress-ng/stress-ng-0.12.02.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
-"
-
-RDEPEND="${DEPEND}"
-
-DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-
-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
-
-	default
-}
-
-pkg_postinst() {
-	optfeature "AppArmor support" sys-libs/libapparmor
-	optfeature "SCTP support" net-misc/lksctp-tools
-}


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

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

commit:     e847dd35728834c0dc61729774119782d83b0899
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 26 20:04:15 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jul 26 20:04:15 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e847dd35

app-benchmarks/stress-ng: fix compilation with glibc-2.34

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

 .../files/stress-ng-0.12.12-glibc-2.34.patch       | 101 +++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild  |   2 +
 2 files changed, 103 insertions(+)

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
new file mode 100644
index 00000000000..b2f93f21cba
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.12.12-glibc-2.34.patch
@@ -0,0 +1,101 @@
+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
index 309cd350a1c..4269478b747 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.12.12.ebuild
@@ -28,6 +28,8 @@ 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


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

* [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/
@ 2023-06-05 11:05 Conrad Kostecki
  0 siblings, 0 replies; 13+ messages in thread
From: Conrad Kostecki @ 2023-06-05 11:05 UTC (permalink / raw
  To: gentoo-commits

commit:     cc7c8229481e752e3a79095931f0823f04ad7e14
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  5 11:03:32 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Jun  5 11:04:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc7c8229

app-benchmarks/stress-ng: dont redefine fortify source

Closes: https://bugs.gentoo.org/906005
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/stress-ng-0.15.08-fortify-source.patch   | 29 ++++++++++++++++++++++
 ...-0.15.08.ebuild => stress-ng-0.15.08-r1.ebuild} |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch b/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch
new file mode 100644
index 000000000000..7b8a75c44766
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.15.08-fortify-source.patch
@@ -0,0 +1,29 @@
+From 967f8f4ff467e7d15b7cdf12f3e2f786e5e19375 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.i.king@gmail.com>
+Date: Wed, 31 May 2023 20:15:54 +0100
+Subject: [PATCH] Makefile: always undefine _FORTIFY_SOURCE before defining it
+
+Gentoo seems to define _FORTIFY_SOURCE in the build environment for
+some specific build options and we end up with duplicated define
+warnings. Undefine it before defining it.
+
+Closes https://github.com/ColinIanKing/stress-ng/issues/291
+
+Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index e08d60ea..693010e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -59,7 +59,7 @@ CFLAGS += -Werror=format-security
+ endif
+ ifneq ($(findstring pcc,$(CC)),pcc)
+ ifeq ($(shell $(CC) $(CFLAGS) -D_FORTIFY_SOURCE=2 -E -xc /dev/null > /dev/null 2>& 1 && echo 1),1)
+-CFLAGS += -D_FORTIFY_SOURCE=2
++CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+ endif
+ endif
+ endif

diff --git a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild
similarity index 94%
rename from app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild
rename to app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild
index 12a6f5017085..28539472ec24 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.15.08.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.15.08-r1.ebuild
@@ -34,6 +34,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" )
 
+PATCHES=( "${FILESDIR}/${PN}-0.15.08-fortify-source.patch" )
+
 pkg_pretend() {
 	if use apparmor; then
 		CONFIG_CHECK="SECURITY_APPARMOR"


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

end of thread, other threads:[~2023-06-05 11:05 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-19 16:05 [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/, app-benchmarks/stress-ng/files/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-06-05 11:05 Conrad Kostecki
2021-07-26 20:05 Conrad Kostecki
2021-02-14 19:53 Conrad Kostecki
2020-10-30 22:43 Conrad Kostecki
2020-01-12  1:03 Conrad Kostecki
2019-12-14  0:00 Conrad Kostecki
2019-01-29 23:00 Patrice Clement
2018-12-16 19:30 Andreas Sturmlechner
2018-10-05 21:39 Andreas Sturmlechner
2018-09-19 16:05 Michał Górny
2018-06-24 14:21 Michał Górny
2018-06-24 14:21 Michał Górny

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