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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Fri Sep 13 11:06:31 2013 UTC (5 years, 1 month ago) by blueness
Branch: MAIN
CVS Tags: HEAD
Fix USE=-static-libs, bug #484692

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

1 diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
2 --- libnatpmp-20130911.orig/Makefile 2013-09-13 07:00:55.874343916 -0400
3 +++ libnatpmp-20130911/Makefile 2013-09-13 07:03:33.733351101 -0400
4 @@ -35,7 +35,6 @@
5
6 OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o natpmp-jni.o
7
8 -STATICLIB = libnatpmp.a
9 ifeq ($(OS), Darwin)
10 SHAREDLIB = libnatpmp.dylib
11 JNISHAREDLIB = libjninatpmp.dylib
12 @@ -58,7 +57,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 @@ -72,9 +71,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 @@ -82,18 +81,17 @@
34 python setup.py install
35
36 clean:
37 - $(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
38 + $(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB) $(JAVACLASSES) $(JNISHAREDLIB)
39 $(RM) pythonmodule
40 $(RM) -r build/ dist/ libraries/
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 @@ -142,20 +140,13 @@
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 $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
62
63 -natpmpc-static: natpmpc.o $(STATICLIB)
64 - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
65 -
66 natpmpc-shared: natpmpc.o $(SHAREDLIB)
67 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
68
69 -$(STATICLIB): $(LIBOBJS)
70 - $(AR) crs $@ $?
71 -
72 $(SHAREDLIB): $(LIBOBJS)
73 ifeq ($(OS), Darwin)
74 $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^

  ViewVC Help
Powered by ViewVC 1.1.20