Gentoo Archives: gentoo-commits

From: "Michael Weber (xmw)" <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-wm/spectrwm/files: spectrwm-1.1.1-makefile.patch
Date: Mon, 09 Jul 2012 16:28:28
Message-Id: 20120709162818.3992B20065@flycatcher.gentoo.org
1 xmw 12/07/09 16:28:18
2
3 Added: spectrwm-1.1.1-makefile.patch
4 Log:
5 Version bump (bug 425510 by Timothy Messier)
6
7 (Portage version: 2.1.11.5/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/spectrwm/files/spectrwm-1.1.1-makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: spectrwm-1.1.1-makefile.patch
16 ===================================================================
17 --- spectrwm-1.1.1/linux/Makefile
18 +++ spectrwm-1.1.1/linux/Makefile
19 @@ -1,5 +1,5 @@
20 -CFLAGS+= -Wall -g -D_GNU_SOURCE -I.
21 -CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
22 +CFLAGS+= -Wall -D_GNU_SOURCE -I.
23 +CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
24 LDADD+= -lX11 -lXrandr -lXtst
25
26 PREFIX?= /usr/local
27 @@ -7,7 +7,7 @@
28 LIBDIR?= $(PREFIX)/lib
29 MANDIR?= $(PREFIX)/share/man
30
31 -CC= gcc
32 +CC ?= gcc
33
34 LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
35
36 @@ -29,10 +29,10 @@
37 $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
38
39 %.so: %.c
40 - $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
41 + $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
42
43 libswmhack.so.$(LVERS): swm_hack.so
44 - $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
45 + $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
46
47 install: all
48 install -m 755 -d $(DESTDIR)$(BINDIR)