diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2011-07-23 10:33:26 +0000 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2011-07-23 10:33:26 +0000 |
commit | f60b9802ff658fd34086911854b3e48779eedea1 (patch) | |
tree | f307ae386efb487b7275790d8c1d63b1c393d62a /net-libs/libnatpmp/files | |
parent | Fix DESCRIPTION, bug #376039 by Alexandre Rostovtsev. (diff) | |
download | historical-f60b9802ff658fd34086911854b3e48779eedea1.tar.gz historical-f60b9802ff658fd34086911854b3e48779eedea1.tar.bz2 historical-f60b9802ff658fd34086911854b3e48779eedea1.zip |
Added Use='static-libs'
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'net-libs/libnatpmp/files')
-rw-r--r-- | net-libs/libnatpmp/files/remove-static-lib.patch | 73 |
1 files changed, 73 insertions, 0 deletions
diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch new file mode 100644 index 000000000000..b24aae4c3962 --- /dev/null +++ b/net-libs/libnatpmp/files/remove-static-lib.patch @@ -0,0 +1,73 @@ +diff -Naur libnatpmp-20110715.orig//Makefile libnatpmp-20110715/Makefile +--- libnatpmp-20110715.orig//Makefile 2011-07-22 14:57:49.000000000 -0400 ++++ libnatpmp-20110715/Makefile 2011-07-22 14:59:41.000000000 -0400 +@@ -21,7 +21,6 @@ + + OBJS = $(LIBOBJS) testgetgateway.o natpmpc.o + +-STATICLIB = libnatpmp.a + ifeq ($(OS), Darwin) + SHAREDLIB = libnatpmp.dylib + SONAME = $(basename $(SHAREDLIB)).$(APIVERSION).dylib +@@ -33,7 +32,7 @@ + + HEADERS = natpmp.h + +-EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static ++EXECUTABLES = testgetgateway natpmpc-shared + + INSTALLPREFIX ?= $(PREFIX)/usr + INSTALLDIRINC = $(INSTALLPREFIX)/include +@@ -45,9 +44,9 @@ + + .PHONY: all clean depend install cleaninstall installpythonmodule + +-all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES) ++all: $(SHAREDLIB) $(EXECUTABLES) + +-pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py ++pythonmodule: libnatpmpmodule.c setup.py + python setup.py build + touch $@ + +@@ -55,18 +54,17 @@ + python setup.py install + + clean: +- $(RM) $(OBJS) $(EXECUTABLES) $(STATICLIB) $(SHAREDLIB) ++ $(RM) $(OBJS) $(EXECUTABLES) $(SHAREDLIB) + $(RM) pythonmodule + $(RM) -r build/ dist/ + + depend: + makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null + +-install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared ++install: $(HEADERS) $(SHAREDLIB) natpmpc-shared + $(INSTALL) -d $(INSTALLDIRINC) + $(INSTALL) -m 644 $(HEADERS) $(INSTALLDIRINC) + $(INSTALL) -d $(INSTALLDIRLIB) +- $(INSTALL) -m 644 $(STATICLIB) $(INSTALLDIRLIB) + $(INSTALL) -m 644 $(SHAREDLIB) $(INSTALLDIRLIB)/$(SONAME) + $(INSTALL) -d $(INSTALLDIRBIN) + $(INSTALL) -m 755 natpmpc-shared $(INSTALLDIRBIN)/natpmpc +@@ -76,19 +74,12 @@ + $(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS)) + $(RM) $(INSTALLDIRLIB)/$(SONAME) + $(RM) $(INSTALLDIRLIB)/$(SHAREDLIB) +- $(RM) $(INSTALLDIRLIB)/$(STATICLIB) + + testgetgateway: testgetgateway.o getgateway.o + +-natpmpc-static: natpmpc.o $(STATICLIB) +- $(CC) $(LDFLAGS) -o $@ $^ +- + natpmpc-shared: natpmpc.o $(SHAREDLIB) + $(CC) $(LDFLAGS) -o $@ $^ + +-$(STATICLIB): $(LIBOBJS) +- $(AR) crs $@ $? +- + $(SHAREDLIB): $(LIBOBJS) + ifeq ($(OS), Darwin) + $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^ |