From 84b5be12bbc52f89716f812937d0e5525de18629 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conrad@kostecki.com>
Date: Sat, 1 Sep 2018 14:56:47 +0200
Subject: 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
---
 .../files/stress-ng-0.09.31-makefile.patch         | 64 ----------------------
 .../files/stress-ng-0.09.38-makefile.patch         | 64 ++++++++++++++++++++++
 app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild  |  2 +-
 3 files changed, 65 insertions(+), 65 deletions(-)
 delete mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
 create mode 100644 app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch

(limited to 'app-benchmarks')

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
deleted file mode 100644
index 633c6db1b3fd..000000000000
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- 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/files/stress-ng-0.09.38-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
new file mode 100644
index 000000000000..6a36bc4adafe
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
@@ -0,0 +1,64 @@
+--- 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
index ce7b1343e7dc..66c8efa4f87c 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" )
-- 
cgit v1.2.3-18-g5258