From: | "Michael Sterrett (mr_bones_)" <mr_bones_@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in games-sports/trophy/files: trophy-1.1.5-asneeded.patch |
Date: | Tue, 04 May 2010 23:19:07 |
Message-Id: | 20100504231902.8E0D02C3F1@corvid.gentoo.org |
1 | mr_bones_ 10/05/04 23:19:02 |
2 | |
3 | Added: trophy-1.1.5-asneeded.patch |
4 | Log: |
5 | add patch for --as-needed support submitted by Kacper Kowalik (Xarthisius) via bug #318139 |
6 | (Portage version: 2.1.8.3/cvs/Linux i686) |
7 | |
8 | Revision Changes Path |
9 | 1.1 games-sports/trophy/files/trophy-1.1.5-asneeded.patch |
10 | |
11 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-sports/trophy/files/trophy-1.1.5-asneeded.patch?rev=1.1&view=markup |
12 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-sports/trophy/files/trophy-1.1.5-asneeded.patch?rev=1.1&content-type=text/plain |
13 | |
14 | Index: trophy-1.1.5-asneeded.patch |
15 | =================================================================== |
16 | Fixing as-needed issues |
17 | |
18 | http://bugs.gentoo.org/show_bug.cgi?id=318139 |
19 | |
20 | --- configure.ac |
21 | +++ configure.ac |
22 | @@ -15,5 +15,6 @@ |
23 | # We try to link to clanSignals because this is the only library file that |
24 | # doesn't need another one to be linked with. |
25 | AC_CHECK_LIB(clanSignals, main, , echo "Trophy requires ClanLib to run."; exit 1) |
26 | +PKG_CHECK_MODULES([CLAN], [clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8]) |
27 | |
28 | AC_OUTPUT(Makefile src/Makefile resources/Makefile) |
29 | --- src/Makefile.am |
30 | +++ src/Makefile.am |
31 | @@ -12,7 +12,6 @@ |
32 | caslotselectiondialog.cpp cafogbomb.h caimageview.h camenu.cpp canetclient.h capositiontable.cpp \ |
33 | caslotselectiondialog.h |
34 | |
35 | -CLANLIB_MODULES = clanSignals-0.8 clanGL-0.8 clanCore-0.8 clanSound-0.8 clanDisplay-0.8 clanApp-0.8 |
36 | -AM_LDFLAGS = `pkg-config --libs $(CLANLIB_MODULES)` |
37 | -INCLUDES = `pkg-config --cflags $(CLANLIB_MODULES)` |
38 | AM_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" |
39 | +trophy_CXXFLAGS = @CLAN_CFLAGS@ |
40 | +trophy_LDADD = @CLAN_LIBS@ |