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: [PATCH] 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
---
 ....patch => stress-ng-0.09.38-makefile.patch} | 18 +++++++++---------
 .../stress-ng/stress-ng-0.09.38.ebuild         |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename app-benchmarks/stress-ng/files/{stress-ng-0.09.31-makefile.patch => stress-ng-0.09.38-makefile.patch} (84%)

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 633c6db1b3fd..6a36bc4adafe 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 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" )
-- 
2.26.2