From 97d96cb9abc4c281350ada9260dbf36c0141564e Mon Sep 17 00:00:00 2001
From: David Seifert <soap@gentoo.org>
Date: Thu, 28 Dec 2017 13:14:11 +0100
Subject: app-benchmarks/nbench: [QA] Port to EAPI 6

Package-Manager: Portage-2.3.19, Repoman-2.3.6
---
 .../nbench/files/nbench-2.2.3-Makefile.patch       | 61 ++++++++++++++++++++--
 1 file changed, 57 insertions(+), 4 deletions(-)

(limited to 'app-benchmarks/nbench/files')

diff --git a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
index c41fd07557b..b853fc7b65a 100644
--- a/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
+++ b/app-benchmarks/nbench/files/nbench-2.2.3-Makefile.patch
@@ -1,5 +1,5 @@
---- Makefile.org	2004-12-30 03:23:30.000000000 +0100
-+++ Makefile	2009-12-14 13:31:18.000000000 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -19,10 +19,10 @@
  # You should leave -static in the CFLAGS so that your sysinfo can be
  # compiled into the executable.
@@ -13,12 +13,65 @@
  
  # if your gcc lets you do it, then try this one
  #CFLAGS = -s -static -Wall -O3 -fomit-frame-pointer -funroll-loops
-@@ -126,7 +126,7 @@
+@@ -96,10 +96,10 @@
+ ##########################################################################
+ # For LINUX-like systems with gcc
+ sysinfoc.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ sysinfo.c: Makefile
+-	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS)
++	./sysinfo.sh $(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)
+ 
+ ##########################################################################
+ # For non-LINUX systems
+@@ -107,39 +107,39 @@
+ # and take sysinfo.c and sysinfoc.c out of the dependencies for nbench0.o
+ 
+ hardware.o: hardware.c hardware.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c hardware.c
+ 
+ nbench0.o: nbench0.h nbench0.c nmglobal.h pointer.h hardware.h\
+ 	   Makefile sysinfo.c sysinfoc.c
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench0.c
+ 
+ emfloat.o: emfloat.h emfloat.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c emfloat.c
+ 
+ pointer.h: pointer Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-o pointer pointer.c
+ 	rm -f pointer.h
  	if [ "4" = `./pointer` ] ; then touch pointer.h ;\
  	else echo "#define LONG64" >pointer.h ; fi
  
 -misc.o: misc.h misc.c Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
 +misc.o: misc.h misc.c pointer.h Makefile
- 	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
  		-c misc.c
  
+ nbench1.o: nbench1.h nbench1.c wordcat.h nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c nbench1.c
+ 
+ sysspec.o: sysspec.h sysspec.c nmglobal.h pointer.h Makefile
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS)\
+ 		-c sysspec.c
+ 
+ nbench: emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o
+-	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(LINKFLAGS)\
++	$(CC) $(MACHINE) $(DEFINES) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)\
+ 		emfloat.o misc.o nbench0.o nbench1.o sysspec.o hardware.o\
+ 		-o nbench -lm
+ 
-- 
cgit v1.2.3