Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-auth/libnss-cache/files: libnss-cache-0.10.1-make.patch 0.1-make-install.patch libnss-cache-0.10-make.patch
Date: Sun, 29 May 2011 16:04:00
Message-Id: 20110529160346.318A520057@flycatcher.gentoo.org
1 idl0r 11/05/29 16:03:46
2
3 Added: libnss-cache-0.10.1-make.patch
4 Removed: 0.1-make-install.patch libnss-cache-0.10-make.patch
5 Log:
6 Version bump, also fixes bug 368951. Remove old versions. Add multilib support. Add myself as secondary maintainer.
7
8 (Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-auth/libnss-cache/files/libnss-cache-0.10.1-make.patch?rev=1.1&content-type=text/plain
15
16 Index: libnss-cache-0.10.1-make.patch
17 ===================================================================
18 diff --git a/Makefile b/Makefile
19 index 1e34d3b..563e467 100644
20 --- a/Makefile
21 +++ b/Makefile
22 @@ -1,16 +1,16 @@
23 -CC=gcc
24 +CC?=gcc
25 #CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC -DDEBUG -g -O0
26 -CFLAGS=-Wall -Wstrict-prototypes -Werror -fPIC
27 +CFLAGS+=-Wall -Wstrict-prototypes -fPIC
28 LIBRARY=libnss_cache.so.2.0
29 LINKS=libnss_cache.so.2 libnss_cache.so
30 -DESTDIR=/
31 -PREFIX=$(DESTDIR)/usr
32 +DESTDIR?=
33 +PREFIX?=$(DESTDIR)/usr
34 BUILD=.libs
35 BUILD64=.libs64
36 BUILD32=.libs32
37 -LIBDIR=$(PREFIX)/lib
38 -LIBDIR64=$(PREFIX)/lib64
39 -LIBDIR32=$(PREFIX)/lib32
40 +LIBDIR?=$(PREFIX)/lib
41 +LIBDIR64?=$(PREFIX)/lib64
42 +LIBDIR32?=$(PREFIX)/lib32
43 SONAME=libnss_cache.so.2
44 LD_SONAME=-Wl,-soname,$(SONAME)
45 TESTBIN=.testbin
46 @@ -97,17 +97,17 @@ install_amd64: install32
47 nss_cache:
48 [ -d $(BUILD) ] || mkdir $(BUILD)
49 $(CC) $(CFLAGS) -c nss_cache.c -o $(BUILD)/nss_cache.o
50 - $(CC) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
51 + $(CC) $(LDFLAGS) -shared $(LD_SONAME) -o $(BUILD)/$(LIBRARY) $(BUILD)/nss_cache.o
52
53 nss_cache64: nss_cache
54 [ -d $(BUILD64) ] || mkdir $(BUILD64)
55 $(CC) $(CFLAGS) -m64 -c nss_cache.c -o $(BUILD64)/nss_cache.o
56 - $(CC) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
57 + $(CC) $(LDFLAGS) -m64 -shared $(LD_SONAME) -o $(BUILD64)/$(LIBRARY) $(BUILD64)/nss_cache.o
58
59 nss_cache32: nss_cache
60 [ -d $(BUILD32) ] || mkdir $(BUILD32)
61 $(CC) $(CFLAGS) -m32 -c nss_cache.c -o $(BUILD32)/nss_cache.o
62 - $(CC) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
63 + $(CC) $(LDFLAGS) -m32 -shared $(LD_SONAME) -o $(BUILD32)/$(LIBRARY) $(BUILD32)/nss_cache.o
64
65 clean:
66 rm -rf $(BUILD)