From f1a7ff4db7b5358cb30e5735bf444cc66f77adb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Tue, 26 Mar 2024 00:53:30 -0400 Subject: [PATCH] natpmp: avoid building shared library, executables Change-Id: I7a58d02e324f6c3579f3348187c03c03e78279c5 --- .../0001-remove-shared-libs-executables.patch | 42 +++++++++++++++++++ contrib/src/natpmp/rules.mak | 1 + 2 files changed, 43 insertions(+) create mode 100644 contrib/src/natpmp/0001-remove-shared-libs-executables.patch diff --git a/contrib/src/natpmp/0001-remove-shared-libs-executables.patch b/contrib/src/natpmp/0001-remove-shared-libs-executables.patch new file mode 100644 index 0000000000..cc66c7b424 --- /dev/null +++ b/contrib/src/natpmp/0001-remove-shared-libs-executables.patch @@ -0,0 +1,42 @@ +From 0d495d7dc385f8e6a957be9a1e0f9306c62b6788 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> +Date: Tue, 26 Mar 2024 00:04:58 -0400 +Subject: [PATCH] remove shared libs, executables + +--- + Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index b67b3e8..483c537 100644 +--- a/Makefile ++++ b/Makefile +@@ -74,7 +74,7 @@ JNIHEADERS = fr_free_miniupnp_libnatpmp_NatPmp.h + + .PHONY: all clean depend install cleaninstall installpythonmodule + +-all: $(STATICLIB) $(SHAREDLIB) $(EXECUTABLES) ++all: $(STATICLIB) + + pythonmodule: $(STATICLIB) libnatpmpmodule.c setup.py + python setup.py build +@@ -91,15 +91,12 @@ clean: + depend: + makedepend -f$(MAKEFILE_LIST) -Y $(OBJS:.o=.c) 2>/dev/null + +-install: $(HEADERS) $(STATICLIB) $(SHAREDLIB) natpmpc-shared ++install: $(HEADERS) $(STATICLIB) + $(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 +- ln -s -f $(SONAME) $(INSTALLDIRLIB)/$(SHAREDLIB) + + $(JNIHEADERS): fr/free/miniupnp/libnatpmp/NatPmp.class + $(JAVAH) -jni fr.free.miniupnp.libnatpmp.NatPmp +-- +2.39.3 (Apple Git-146) + diff --git a/contrib/src/natpmp/rules.mak b/contrib/src/natpmp/rules.mak index d4e399953e..9ee1adbbe9 100644 --- a/contrib/src/natpmp/rules.mak +++ b/contrib/src/natpmp/rules.mak @@ -21,6 +21,7 @@ $(TARBALLS)/libnatpmp-$(NATPMP_VERSION).tar.gz: natpmp: libnatpmp-$(NATPMP_VERSION).tar.gz .sum-natpmp $(UNPACK) + $(APPLY) $(SRC)/natpmp/0001-remove-shared-libs-executables.patch $(MOVE) .natpmp: natpmp -- GitLab