Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-board/pokerth/files: pokerth-0.9.5-underlinking.patch
Date: Sat, 01 Sep 2012 00:11:26
Message-Id: 20120901001101.5515D20E17@flycatcher.gentoo.org
1 hasufell 12/09/01 00:11:01
2
3 Modified: pokerth-0.9.5-underlinking.patch
4 Log:
5 fix as-needed
6
7 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 games-board/pokerth/files/pokerth-0.9.5-underlinking.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch?r1=1.1&r2=1.2
15
16 Index: pokerth-0.9.5-underlinking.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- pokerth-0.9.5-underlinking.patch 21 Aug 2012 19:44:10 -0000 1.1
23 +++ pokerth-0.9.5-underlinking.patch 1 Sep 2012 00:11:01 -0000 1.2
24 @@ -3,15 +3,18 @@
25 Subject: build system
26
27 fix compilation for linkers that don't permit underlinking
28 +reorder linker line to fix issues with as-needed
29
30 --- pokerth_server.pro
31 +++ pokerth_server.pro
32 -@@ -114,7 +114,7 @@
33 +@@ -114,8 +114,8 @@
34 LIBS += -lpokerth_lib \
35 -lpokerth_db \
36 -lpokerth_protocol \
37 - -lcurl \
38 -+ $$system(pkg-config --libs --static libcurl) \
39 - -lircclient
40 +- -lircclient
41 ++ -lircclient \
42 ++ $$system(pkg-config --libs --static libcurl)
43
44 win32 {
45 + DEFINES += CURL_STATICLIB