1 |
On 22/06/14 19:25, Bernard Cafarelli (voyageur) wrote: |
2 |
> voyageur 14/06/22 16:25:10 |
3 |
> |
4 |
> Modified: wmfishtime-1.24-gtk.patch |
5 |
> Log: |
6 |
> Link with libm, spotted by patrick in bug #513908 |
7 |
> |
8 |
> (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key C74525F2) |
9 |
> |
10 |
> Revision Changes Path |
11 |
> 1.3 x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch |
12 |
> |
13 |
> file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?rev=1.3&view=markup |
14 |
> plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?rev=1.3&content-type=text/plain |
15 |
> diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch?r1=1.2&r2=1.3 |
16 |
> |
17 |
> Index: wmfishtime-1.24-gtk.patch |
18 |
> =================================================================== |
19 |
> RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmfishtime/files/wmfishtime-1.24-gtk.patch,v |
20 |
> retrieving revision 1.2 |
21 |
> retrieving revision 1.3 |
22 |
> diff -u -r1.2 -r1.3 |
23 |
> --- wmfishtime-1.24-gtk.patch 6 Jun 2011 20:04:49 -0000 1.2 |
24 |
> +++ wmfishtime-1.24-gtk.patch 22 Jun 2014 16:25:10 -0000 1.3 |
25 |
> @@ -48,7 +48,7 @@ |
26 |
> SHELL = sh |
27 |
> OBJS = fishmon.o |
28 |
> -LIBS = `gtk-config --libs | sed "s/-lgtk//g"` |
29 |
> -+LIBS = `pkg-config gtk+-2.0 --libs` -lX11 |
30 |
> ++LIBS = `pkg-config gtk+-2.0 --libs` -lm -lX11 |
31 |
> INSTALL = -m 755 |
32 |
> |
33 |
> all: wmfishtime |
34 |
> |
35 |
> |
36 |
> |
37 |
> |
38 |
> gtk+-2.0 --libs` -lm -lX11 |
39 |
|
40 |
This is wrong, it should be: |
41 |
|
42 |
PKG_CONFIG ?= pkg-config |
43 |
LIBS = `$(PKG_CONFIG) gtk+-2.0 --libs` -lm -X11 |
44 |
|
45 |
And ebuild should have `export PKG_CONFIG="$(tc-getPKG_CONFIG)"` |
46 |
|
47 |
As in, PKG_CONFIG needs to be respected from the environment, it's |
48 |
almost never O.K. to |
49 |
hardcode pkg-config |
50 |
|
51 |
I realize you didn't touch that part of the patch right now, but imho, |
52 |
these should get fixed |
53 |
whereever spotted. |
54 |
|
55 |
Thanks, |
56 |
Samuli |