[gentoo-commits] repo/gentoo:master commit in: games-util/higan-purify/, games-util/higan-purify/files/

[gentoo-commits] repo/gentoo:master commit in: games-util/higan-purify/, games-util/higan-purify/files/

[Sam James]

commit:     86b8974c15ef6d688fe729a3d8bb810bd50eae70
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 20:44:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 20:54:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b8974c

games-util/higan-purify: pass PKG_CONFIG to make

Closes: https://bugs.gentoo.org/784236
Closes: https://bugs.gentoo.org/784239
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-util/higan-purify/files/higan-purify-03-QA.patch | 2 +-
 games-util/higan-purify/higan-purify-03.ebuild         | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
index 6178259a466..5b2d1e6c3d3 100644
--- a/games-util/higan-purify/files/higan-purify-03-QA.patch
+++ b/games-util/higan-purify/files/higan-purify-03-QA.patch
@@ -28,7 +28,7 @@
    ifeq ($(phoenix),gtk)
 -    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
 -    phoenixlink := `pkg-config --libs gtk+-2.0`
-+    phoenixflags := -DPHOENIX_GTK `${PKG_COFNIG} --cflags gtk+-2.0 x11`
++    phoenixflags := -DPHOENIX_GTK `${PKG_CONFIG} --cflags gtk+-2.0 x11`
 +    phoenixlink := `${PKG_CONFIG} --libs gtk+-2.0 x11` -ldl
    endif
  

diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
index 913ba7dbd5d..deb6d07b9d6 100644
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -35,9 +35,8 @@ src_prepare() {
 }
 
 src_compile() {
-	tc-export PKG_CONFIG
-
 	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		platform="x" \
 		compiler="$(tc-getCXX)" \
 		phoenix="gtk"

[gentoo-commits] repo/gentoo:master commit in: games-util/higan-purify/, games-util/higan-purify/files/

[Sam James]

commit:     2a49d8d7b538ab37cd76fafd933201f2fffd9bb2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 20 11:56:01 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 20 11:56:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a49d8d7

games-util/higan-purify: respect CXX

Closes: https://bugs.gentoo.org/784308
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/higan-purify-03-respect-CXX.patch        | 28 ++++++++++++++++++++++
 games-util/higan-purify/higan-purify-03.ebuild     |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
new file mode 100644
index 00000000000..00a6a1e4c69
--- /dev/null
+++ b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
@@ -0,0 +1,28 @@
+diff --git a/Makefile b/Makefile
+index 2a56366..59a3795 100755
+--- a/Makefile
++++ b/Makefile
+@@ -15,18 +15,18 @@ endif
+ all: build;
+ 
+ obj/phoenix.o: phoenix/phoenix.cpp
+-	$(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
++	$(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
+ 
+ obj/purify.o: purify.cpp
+-	$(cpp) $(flags) -o obj/purify.o -c purify.cpp
++	$(CXX) $(flags) -o obj/purify.o -c purify.cpp
+ 
+ build: $(objects)
+ ifeq ($(platform),x)
+-	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
++	$(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
+ else ifeq ($(platform),win)
+ 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
+-	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
+-	$(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
++	$(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
++	$(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
+ endif
+ 
+ resource: force

diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
index deb6d07b9d6..7f5fcaa1f83 100644
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ b/games-util/higan-purify/higan-purify-03.ebuild
@@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-QA.patch
+	"${FILESDIR}"/${PN}-03-respect-CXX.patch
 )
 
 src_prepare() {
@@ -35,6 +36,8 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export CXX
+
 	emake \
 		PKG_CONFIG="$(tc-getPKG_CONFIG)"
 		platform="x" \