app-benchmarks/i7z: Don't hardcode pkg-config (by Zentaro Kavanagh)

https://github.com/gentoo/gentoo/pull/9261

Package-Manager: Portage-2.3.43, Repoman-2.3.10

diff --git a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
index 72695a951f7ee320b0ff852308a2c025ac5600e8..d521674af6ccb3968c5111d434fb95099dcf469d 100644 (file)
--- a/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
+++ b/app-benchmarks/i7z/files/i7z-0.27.2-ncurses.patch
@@ -7,7 +7,7 @@ Index: Makefile
  CC       ?= gcc
  
 -LIBS  += -lncurses -lpthread -lrt -lm
-+LIBS  += `pkg-config --libs ncurses` -lpthread -lrt -lm
++LIBS  += `$(PKG_CONFIG) --libs ncurses` -lpthread -lrt -lm
  INCLUDEFLAGS = 
  
  BIN   = i7z
@@ -16,7 +16,7 @@ Index: Makefile
  #http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644728 for -ltinfo on debian
  static-bin: message $(OBJ)
 -      $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread -lncurses -lrt -lm -ltinfo
-+      $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `pkg-config --static --libs ncurses` -lrt -lm
++      $(CC) $(CFLAGS) $(LDFLAGS) -o $(BIN) $(OBJ) -static-libgcc -DNCURSES_STATIC -static -lpthread `$(PKG_CONFIG) --static --libs ncurses` -lrt -lm
  
  # perfmon-bin: message $(OBJ)
  #     $(CC) $(CFLAGS) $(LDFLAGS) -o $(PERFMON-BIN) perfmon-i7z.c helper_functions.c $(LIBS)

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
index d555d4c41fa55508fc21e6eb2e1e52049f969e48..20080024b0f3b354f37c52b915a4811a8188573c 100644 (file)
--- a/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,7 +45,7 @@ src_configure() {
        # Looks to work fine for me with -O2 (pacho - 20170530)
 #      filter-flags "-O*"
 
-       tc-export CC
+       tc-export CC PKG_CONFIG
        cd GUI || die
 
        use qt5 && eqmake5 ${PN}_GUI.pro

diff --git a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
index 992080972ba0fec0df417ec08099b1961dde7b2e..b31f97afeca65b8a89004a0560c9577f3390a5dd 100644 (file)
--- a/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
+++ b/app-benchmarks/i7z/i7z-93_p20131012-r2.ebuild
@@ -40,7 +40,7 @@ PATCHES=(
 S="${WORKDIR}/${PN}-${COMMIT}"
 
 src_configure() {
-       tc-export CC
+       tc-export CC PKG_CONFIG
        cd GUI || die
        use qt5 && eqmake5 ${PN}_GUI.pro
 }