Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/higan-purify/, games-util/higan-purify/files/
Date: Tue, 20 Apr 2021 11:56:50
Message-Id: 1618919761.2a49d8d7b538ab37cd76fafd933201f2fffd9bb2.sam@gentoo
1 commit: 2a49d8d7b538ab37cd76fafd933201f2fffd9bb2
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 20 11:56:01 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 20 11:56:01 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a49d8d7
7
8 games-util/higan-purify: respect CXX
9
10 Closes: https://bugs.gentoo.org/784308
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 .../files/higan-purify-03-respect-CXX.patch | 28 ++++++++++++++++++++++
14 games-util/higan-purify/higan-purify-03.ebuild | 3 +++
15 2 files changed, 31 insertions(+)
16
17 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
18 new file mode 100644
19 index 00000000000..00a6a1e4c69
20 --- /dev/null
21 +++ b/games-util/higan-purify/files/higan-purify-03-respect-CXX.patch
22 @@ -0,0 +1,28 @@
23 +diff --git a/Makefile b/Makefile
24 +index 2a56366..59a3795 100755
25 +--- a/Makefile
26 ++++ b/Makefile
27 +@@ -15,18 +15,18 @@ endif
28 + all: build;
29 +
30 + obj/phoenix.o: phoenix/phoenix.cpp
31 +- $(cpp) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
32 ++ $(CXX) $(flags) -o obj/phoenix.o -c phoenix/phoenix.cpp $(phoenixflags)
33 +
34 + obj/purify.o: purify.cpp
35 +- $(cpp) $(flags) -o obj/purify.o -c purify.cpp
36 ++ $(CXX) $(flags) -o obj/purify.o -c purify.cpp
37 +
38 + build: $(objects)
39 + ifeq ($(platform),x)
40 +- $(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
41 ++ $(CXX) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
42 + else ifeq ($(platform),win)
43 + windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
44 +- $(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
45 +- $(cpp) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
46 ++ $(CXX) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
47 ++ $(CXX) -o purify obj/purify.o obj/phoenix-resource.o $(link) -L. -lphoenix
48 + endif
49 +
50 + resource: force
51
52 diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
53 index deb6d07b9d6..7f5fcaa1f83 100644
54 --- a/games-util/higan-purify/higan-purify-03.ebuild
55 +++ b/games-util/higan-purify/higan-purify-03.ebuild
56 @@ -24,6 +24,7 @@ BDEPEND="virtual/pkgconfig"
57
58 PATCHES=(
59 "${FILESDIR}"/${P}-QA.patch
60 + "${FILESDIR}"/${PN}-03-respect-CXX.patch
61 )
62
63 src_prepare() {
64 @@ -35,6 +36,8 @@ src_prepare() {
65 }
66
67 src_compile() {
68 + tc-export CXX
69 +
70 emake \
71 PKG_CONFIG="$(tc-getPKG_CONFIG)"
72 platform="x" \