/[gentoo-x86]/net-libs/libnatpmp/files/remove-static-lib-20120821.patch
Gentoo

Contents of /net-libs/libnatpmp/files/remove-static-lib-20120821.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Mon Aug 27 00:41:24 2012 UTC (2 years, 1 month ago) by blueness
Branch: MAIN
Version bump

(Portage version: 2.1.11.9/cvs/Linux x86_64)

1 diff -Naur libnatpmp-20120821.orig/Makefile libnatpmp-20120821/Makefile
2 --- libnatpmp-20120821.orig/Makefile 2012-08-26 20:33:51.000000000 -0400
3 +++ libnatpmp-20120821/Makefile 2012-08-26 20:36:53.000000000 -0400
4 @@ -24,7 +24,6 @@
5
6 OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o
7
8 -STATICLIB = libnatpmp.a
9 ifeq ($(OS), Darwin)
10 SHAREDLIB = libnatpmp.dylib
11 SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib
12 @@ -38,7 +37,7 @@
13
14 HEADERS = natpmp.h
15
16 -EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
17 +EXECUTABLES = testgetgateway natpmpc-shared
18
19 INSTALLPREFIX ?= $(PREFIX)/usr
20 INSTALLDIRINC = $(INSTALLPREFIX)/include
21 @@ -47,9 +46,9 @@
22
23 .PHONY: all clean depend install cleaninstall installpythonmodule
24
25 -all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES)
26 +all: $(SHAREDLIB) $(EXECUTABLES)
27
28 -pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py
29 +pythonmodule: libnatpmpmodule.c setup.py
30 python setup.py build
31 touch $@
32
33 @@ -57,18 +56,17 @@
34 python setup.py install
35
36 clean:
37 - $(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB)
38 + $(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB)
39 $(RM) pythonmodule
40 $(RM) -r build/ dist/
41
42 depend:
43 makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null
44
45 -install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared
46 +install: $(HEADERS) $(SHAREDLIB) natpmpc-shared
47 $(INSTALL) -d $(INSTALLDIRINC)
48 $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC)
49 $(INSTALL) -d $(INSTALLDIRLIB)
50 - $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB)
51 $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME)
52 $(INSTALL) -d $(INSTALLDIRBIN)
53 $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc
54 @@ -78,19 +76,12 @@
55 $(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
56 $(RM) $(INSTALLDIRLIB)/$(SONAME)
57 $(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
58 - $(RM) $(INSTALLDIRLIB)/$(STATICLIB)
59
60 testgetgateway: testgetgateway.o getgateway.o
61
62 -natpmpc-static: natpmpc.o $(STATICLIB)
63 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
64 -
65 natpmpc-shared: natpmpc.o $(SHAREDLIB)
66 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
67
68 -$(STATICLIB): $(LIBOBJS)
69 - $(AR) crs $@ $?
70 -
71 $(SHAREDLIB): $(LIBOBJS)
72 ifeq ($(OS), Darwin)
73 $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^

  ViewVC Help
Powered by ViewVC 1.1.20