Gentoo Archives: gentoo-commits

From: "Kacper Kowalik (xarthisius)" <xarthisius@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/suxpanel/files: suxpanel-0.4b-makefile.patch
Date: Fri, 27 Aug 2010 15:48:51
Message-Id: 20100827154846.7005F20054@flycatcher.gentoo.org
1 xarthisius 10/08/27 15:48:46
2
3 Added: suxpanel-0.4b-makefile.patch
4 Log:
5 Respect LDFLAGS wrt bug 333979. Thanks to Diego for the report.
6 (Portage version: 2.1.8.3/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/suxpanel/files/suxpanel-0.4b-makefile.patch?rev=1.1&content-type=text/plain
13
14 Index: suxpanel-0.4b-makefile.patch
15 ===================================================================
16 --- Makefile.in
17 +++ Makefile.in
18 @@ -1,7 +1,7 @@
19 # ----------------------------------------------------------------------------
20
21 -CC = gcc
22 -CFLAGS = -Wall $(GTK_CFLAGS) -O2 -g
23 +CC ?= gcc
24 +CFLAGS ?= -Wall $(GTK_CFLAGS) -O2 -g
25
26 # ----------------------------------------------------------------------------
27
28 @@ -11,13 +11,16 @@
29 mount.so mail.so showdesktop.so
30
31 all: $(OBJECTS) $(MODULES)
32 - $(CC) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS) $(GTK_FLAGS)
33 + $(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -o suxpanel -Wl,-export-dynamic $(OBJECTS) $(GTK_LIBS)
34
35 %.so: %.c
36 @echo "compile module: $< ($@)"
37 - $(CC) $(CFLAGS) -o $@ -shared $< $(GTK_CFLAGS) $(GTK_LIBS) \
38 + $(CC) $(LDFLAGS) $(GTK_CFLAGS) $(CFLAGS) -fPIC -o $@ -shared $< $(GTK_LIBS) \
39 $(WNCK_LIBS) $(WNCK_CFLAGS)
40
41 +%.o: %.c
42 + $(CC) $(GTK_CFLAGS) $(WNCK_CFLAGS) $(CFLAGS) -c $< -o $@
43 +
44 clean:
45 rm -rf *~ *.o *.so suxpanel