summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-20 11:56:01 +0000
committerSam James <sam@gentoo.org>2021-04-20 11:56:01 +0000
commit2a49d8d7b538ab37cd76fafd933201f2fffd9bb2 (patch)
treeaf894869b92fe23420debc5ea0b33429ad05e811 /games-util/higan-purify
parentx11-misc/openbox-menu: fix patch (diff)
downloadgentoo-2a49d8d7b538ab37cd76fafd933201f2fffd9bb2.tar.gz
gentoo-2a49d8d7b538ab37cd76fafd933201f2fffd9bb2.tar.bz2
gentoo-2a49d8d7b538ab37cd76fafd933201f2fffd9bb2.zip
games-util/higan-purify: respect CXX
Closes: https://bugs.gentoo.org/784308 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'games-util/higan-purify')
-rw-r--r--games-util/higan-purify/files/higan-purify-03-respect-CXX.patch28
-rw-r--r--games-util/higan-purify/higan-purify-03.ebuild3
2 files changed, 31 insertions, 0 deletions
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 000000000000..00a6a1e4c69b
--- /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 deb6d07b9d6e..7f5fcaa1f834 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" \