1 |
commit: 84b5be12bbc52f89716f812937d0e5525de18629 |
2 |
Author: Conrad Kostecki <conrad <AT> kostecki <DOT> com> |
3 |
AuthorDate: Sat Sep 1 12:56:47 2018 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 4 22:31:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b5be12 |
7 |
|
8 |
app-benchmarks/stress-ng: update makefile patch. |
9 |
|
10 |
Closes: https://bugs.gentoo.org/665010 |
11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/9751 |
13 |
|
14 |
...makefile.patch => stress-ng-0.09.38-makefile.patch} | 18 +++++++++--------- |
15 |
app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild | 2 +- |
16 |
2 files changed, 10 insertions(+), 10 deletions(-) |
17 |
|
18 |
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 |
19 |
similarity index 84% |
20 |
rename from app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch |
21 |
rename to app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch |
22 |
index 633c6db1b3f..6a36bc4adaf 100644 |
23 |
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch |
24 |
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch |
25 |
@@ -1,5 +1,5 @@ |
26 |
---- a/Makefile 2018-06-21 15:39:27.000000000 +0200 |
27 |
-+++ b/Makefile 2018-06-24 14:46:41.773596760 +0200 |
28 |
+--- a/Makefile 2018-08-23 17:55:27.000000000 +0200 |
29 |
++++ b/Makefile 2018-09-01 14:46:51.000000000 +0200 |
30 |
@@ -21,7 +21,7 @@ |
31 |
# Codename "portable pressure producer" |
32 |
# |
33 |
@@ -9,7 +9,7 @@ |
34 |
|
35 |
# |
36 |
# Pedantic flags |
37 |
-@@ -319,12 +319,10 @@ |
38 |
+@@ -337,12 +337,10 @@ |
39 |
.o: stress-ng.h Makefile |
40 |
|
41 |
.c.o: stress-ng.h Makefile $(SRC) |
42 |
@@ -17,14 +17,14 @@ |
43 |
- @$(CC) $(CFLAGS) -c -o $@ $< |
44 |
+ $(CC) $(CFLAGS) -c -o $@ $< |
45 |
|
46 |
- stress-ng: info $(OBJS) |
47 |
+ stress-ng: $(OBJS) |
48 |
- @echo "LD $@" |
49 |
- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ |
50 |
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@ |
51 |
@sync |
52 |
|
53 |
- .PHONY: info |
54 |
-@@ -344,8 +342,7 @@ |
55 |
+ makeconfig: |
56 |
+@@ -363,8 +361,7 @@ |
57 |
sed '$$ s/.$$//' >> apparmor-data.c |
58 |
@echo "};" >> apparmor-data.c |
59 |
@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c |
60 |
@@ -34,7 +34,7 @@ |
61 |
@rm -rf apparmor-data.c apparmor-data.bin |
62 |
|
63 |
# |
64 |
-@@ -360,12 +357,10 @@ |
65 |
+@@ -379,12 +376,10 @@ |
66 |
perf.o: perf.c perf-event.c |
67 |
@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \ |
68 |
awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h |
69 |
@@ -49,8 +49,8 @@ |
70 |
@touch stress-ng.c |
71 |
|
72 |
$(OBJS): stress-ng.h Makefile |
73 |
-@@ -405,10 +400,10 @@ |
74 |
- STRESS_NG=./stress-ng debian/tests/fast-test-all |
75 |
+@@ -428,10 +423,10 @@ |
76 |
+ ./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics |
77 |
|
78 |
.PHONY: install |
79 |
-install: stress-ng stress-ng.1.gz |
80 |
|
81 |
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild |
82 |
index ce7b1343e7d..66c8efa4f87 100644 |
83 |
--- a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild |
84 |
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild |
85 |
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}" |
86 |
|
87 |
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" ) |
88 |
|
89 |
-PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" ) |
90 |
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) |