Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: games-fps/assaultcube/files/, games-fps/assaultcube/
Date: Fri, 08 Apr 2022 02:43:54
Message-Id: 1649319291.822934a79b7413392669e9d4ce936a879a2f7c8b.tastytea@gentoo
1 commit: 822934a79b7413392669e9d4ce936a879a2f7c8b
2 Author: Duje Mihanović <duje.mihanovic <AT> skole <DOT> hr>
3 AuthorDate: Thu Apr 7 07:44:37 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Thu Apr 7 08:14:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=822934a7
7
8 games-fps/assaultcube: respect LDFLAGS
9
10 Signed-off-by: Duje Mihanović <duje.mihanovic <AT> skole.hr>
11
12 games-fps/assaultcube/assaultcube-1.3.0.2.ebuild | 4 ++++
13 .../files/assaultcube-1.3.0.2-respect-ldflags.patch | 20 ++++++++++++++++++++
14 2 files changed, 24 insertions(+)
15
16 diff --git a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
17 index 305b968c2..7676be084 100644
18 --- a/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
19 +++ b/games-fps/assaultcube/assaultcube-1.3.0.2.ebuild
20 @@ -15,8 +15,12 @@ KEYWORDS="~amd64"
21 RDEPEND="sys-libs/zlib media-libs/libsdl2 media-libs/sdl2-image x11-libs/libX11 media-libs/libogg media-libs/libvorbis media-libs/openal"
22 DEPEND="${RDEPEND}"
23 BDEPEND="sys-devel/clang"
24 +PATCHES=(
25 + "${FILESDIR}/assaultcube-1.3.0.2-respect-ldflags.patch"
26 +)
27
28 src_prepare() {
29 + eapply ${PATCHES}
30 eapply_user
31 sed -i 's|//#define PRODUCTION|#define PRODUCTION|' "${S}/source/src/cube.h"
32 }
33
34 diff --git a/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch b/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch
35 new file mode 100644
36 index 000000000..9a9a8b460
37 --- /dev/null
38 +++ b/games-fps/assaultcube/files/assaultcube-1.3.0.2-respect-ldflags.patch
39 @@ -0,0 +1,20 @@
40 +diff --git a/source/src/Makefile b/source/src/Makefile
41 +index bf06195..61da2b7 100644
42 +--- a/source/src/Makefile
43 ++++ b/source/src/Makefile
44 +@@ -202,12 +202,12 @@ server_install: server
45 +
46 + else
47 + client: libenet $(CLIENT_OBJS)
48 +- $(CXX) $(CXXFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
49 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_client $(CLIENT_OBJS) $(CLIENT_LIBS)
50 +
51 + server: libenet $(SERVER_OBJS)
52 +- $(CXX) $(CXXFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
53 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_server $(SERVER_OBJS) $(SERVER_LIBS)
54 + master: libenet $(MASTER_OBJS)
55 +- $(CXX) $(CXXFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
56 ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o ac_master $(MASTER_OBJS) $(SERVER_LIBS)
57 +
58 + client_install: client
59 + install -d ../../bin_unix/