summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2020-02-11 12:50:35 +0100
committerDavid Seifert <soap@gentoo.org>2020-02-11 12:50:35 +0100
commitc421b0d9db8603cc18aa108d8135aba47ced77e2 (patch)
treeee42c9c5d35c26bf17cf600791f034842c0ddaae /net-libs/libnatpmp/files
parentnet-libs/libnatpmp: ppc64 stable wrt bug #708868 (diff)
downloadgentoo-c421b0d9db8603cc18aa108d8135aba47ced77e2.tar.gz
gentoo-c421b0d9db8603cc18aa108d8135aba47ced77e2.tar.bz2
gentoo-c421b0d9db8603cc18aa108d8135aba47ced77e2.zip
net-libs/libnatpmp: Remove old
Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-libs/libnatpmp/files')
-rw-r--r--net-libs/libnatpmp/files/remove-static-lib.patch44
-rw-r--r--net-libs/libnatpmp/files/respect-FLAGS-20130911.patch53
-rw-r--r--net-libs/libnatpmp/files/respect-FLAGS.patch40
-rw-r--r--net-libs/libnatpmp/files/respect-libdir.patch19
4 files changed, 0 insertions, 156 deletions
diff --git a/net-libs/libnatpmp/files/remove-static-lib.patch b/net-libs/libnatpmp/files/remove-static-lib.patch
deleted file mode 100644
index dae64601b9cb..000000000000
--- a/net-libs/libnatpmp/files/remove-static-lib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- libnatpmp-20110715/Makefile
-+++ libnatpmp-20110715/Makefile
-@@ -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,11 +54,10 @@
- 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,7 +74,6 @@
- $(RM) $(addprefix $(INSTALLDIRINC), $(HEADERS))
- $(RM) $(INSTALLDIRLIB)/$(SONAME)
- $(RM) $(INSTALLDIRLIB)/$(SHAREDLIB)
-- $(RM) $(INSTALLDIRLIB)/$(STATICLIB)
-
- testgetgateway: testgetgateway.o getgateway.o
-
diff --git a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch b/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
deleted file mode 100644
index df36e2d4a4a0..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS-20130911.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur libnatpmp-20130911.orig/Makefile libnatpmp-20130911/Makefile
---- libnatpmp-20130911.orig/Makefile 2013-09-10 16:15:06.000000000 -0400
-+++ libnatpmp-20130911/Makefile 2013-09-12 13:20:29.191447842 -0400
-@@ -5,7 +5,7 @@
- # http://miniupnp.free.fr/libnatpmp.html
-
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- VERSION = $(shell cat VERSION)
-
-@@ -22,6 +22,7 @@
- # APIVERSION is used in soname
- APIVERSION = 1
- #LDFLAGS = -Wl,--no-undefined
-+GENTOO_CFLAGS := $(CFLAGS)
- CFLAGS = -Os
- #CFLAGS = -g -O0
- CFLAGS += -fPIC
-@@ -52,6 +53,8 @@
- endif
- endif
-
-+CFLAGS := $(CFLAGS) $(GENTOO_CFLAGS)
-+
- HEADERS = natpmp.h
-
- EXECUTABLES = testgetgateway natpmpc-shared natpmpc-static
-@@ -144,19 +147,19 @@
- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-
- natpmpc-static: natpmpc.o $(STATICLIB)
-- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-
- natpmpc-shared: natpmpc.o $(SHAREDLIB)
-- $(CC) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRA_LD)
-
- $(STATICLIB): $(LIBOBJS)
- $(AR) crs $@ $?
-
- $(SHAREDLIB): $(LIBOBJS)
- ifeq ($(OS), Darwin)
-- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
- else
-- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(EXTRA_LD)
- endif
-
-
diff --git a/net-libs/libnatpmp/files/respect-FLAGS.patch b/net-libs/libnatpmp/files/respect-FLAGS.patch
deleted file mode 100644
index 0338d1810e67..000000000000
--- a/net-libs/libnatpmp/files/respect-FLAGS.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -4,13 +4,12 @@
- # http://miniupnp.free.fr/libnatpmp.html
-
- OS = $(shell uname -s)
--CC = gcc
-+CC ?= gcc
- INSTALL = install
-
- # APIVERSION is used in soname
- APIVERSION = 1
--#LDFLAGS = -Wl,--no-undefined
--CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR
-+CFLAGS := -Wall -DENABLE_STRNATPMPERR $(CFLAGS)
-
- LIBOBJS = natpmp.o getgateway.o
-
-@@ -75,16 +75,18 @@
- testgetgateway: testgetgateway.o getgateway.o
-
- natpmpc-shared: natpmpc.o $(SHAREDLIB)
-- $(CC) $(LDFLAGS) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-+
-+getgateway.o natpmp.o: CFLAGS += -fPIC
-
- $(STATICLIB): $(LIBOBJS)
- $(AR) crs $@ $?
-
- $(SHAREDLIB): $(LIBOBJS)
- ifeq ($(OS), Darwin)
-- $(CC) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -dynamiclib -Wl,-install_name,$(SONAME) -o $@ $^
- else
-- $(CC) -shared -Wl,-soname,$(SONAME) -o $@ $^
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^
- endif
-
- # DO NOT DELETE
diff --git a/net-libs/libnatpmp/files/respect-libdir.patch b/net-libs/libnatpmp/files/respect-libdir.patch
deleted file mode 100644
index 07f5d87ddf98..000000000000
--- a/net-libs/libnatpmp/files/respect-libdir.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libnatpmp-20110808/Makefile
-+++ libnatpmp-20110808/Makefile
-@@ -6,6 +6,7 @@
- # (c) 2007-2011 Thomas Bernard
- # http://miniupnp.free.fr/libnatpmp.html
-
-+GENTOO_LIBDIR ?= lib
- OS = $(shell uname -s)
- CC ?= gcc
- INSTALL = install
-@@ -36,7 +37,7 @@
-
- INSTALLPREFIX ?= $(PREFIX)/usr
- INSTALLDIRINC = $(INSTALLPREFIX)/include
--INSTALLDIRLIB = $(INSTALLPREFIX)/lib
-+INSTALLDIRLIB = $(INSTALLPREFIX)/$(GENTOO_LIBDIR)
- INSTALLDIRBIN = $(INSTALLPREFIX)/bin
-
- .PHONY: all clean depend install cleaninstall installpythonmodule