miniupnpc: update to 2.2.3.
This commit is contained in:
parent
f36d6e2bb7
commit
dbc6bf87cd
|
@ -0,0 +1,54 @@
|
||||||
|
From ed1dc4bb5cdc4a53963f3eb01089289e30acc5a3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||||
|
Date: Wed, 29 Sep 2021 08:28:27 +0200
|
||||||
|
Subject: [PATCH] Makefile: fix install rules to account for $(BUILD)
|
||||||
|
|
||||||
|
Fix missing references to $(BUILD) in the install rules, as well
|
||||||
|
as incorrect shared library symlink name. Otherwise, the 'install'
|
||||||
|
phase fails either being unable to find files:
|
||||||
|
|
||||||
|
make: *** No rule to make target 'miniupnpc.pc', needed by 'install'. Stop.
|
||||||
|
|
||||||
|
or trying to create the symlink in the wrong subdirectory:
|
||||||
|
|
||||||
|
ln: failed to create symbolic link '/tmp/z/usr/lib/build/libminiupnpc.so': No such file or directory
|
||||||
|
---
|
||||||
|
miniupnpc/Makefile | 10 +++++-----
|
||||||
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/miniupnpc/Makefile b/miniupnpc/Makefile
|
||||||
|
index 4563b28..11a17f9 100644
|
||||||
|
--- a/Makefile
|
||||||
|
+++ b/Makefile
|
||||||
|
@@ -162,7 +162,7 @@ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
|
||||||
|
|
||||||
|
FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
|
||||||
|
ifeq (, $(findstring amiga, $(OS)))
|
||||||
|
-FILESTOINSTALL += $(SHAREDLIBRARY) miniupnpc.pc
|
||||||
|
+FILESTOINSTALL += $(SHAREDLIBRARY) $(BUILD)/miniupnpc.pc
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
@@ -251,15 +251,15 @@ install: updateversion $(FILESTOINSTALL)
|
||||||
|
$(INSTALL) -m 644 $(LIBRARY) $(DESTDIR)$(INSTALLDIRLIB)
|
||||||
|
ifeq (, $(findstring amiga, $(OS)))
|
||||||
|
$(INSTALL) -m 644 $(SHAREDLIBRARY) $(DESTDIR)$(INSTALLDIRLIB)/$(SONAME)
|
||||||
|
- ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(SHAREDLIBRARY)
|
||||||
|
+ ln -fs $(SONAME) $(DESTDIR)$(INSTALLDIRLIB)/$(notdir $(SHAREDLIBRARY))
|
||||||
|
$(INSTALL) -d $(DESTDIR)$(PKGCONFIGDIR)
|
||||||
|
- $(INSTALL) -m 644 miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||||||
|
+ $(INSTALL) -m 644 $(BUILD)/miniupnpc.pc $(DESTDIR)$(PKGCONFIGDIR)
|
||||||
|
endif
|
||||||
|
$(INSTALL) -d $(DESTDIR)$(INSTALLDIRBIN)
|
||||||
|
ifneq (, $(findstring amiga, $(OS)))
|
||||||
|
- $(INSTALL) -m 755 upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||||||
|
+ $(INSTALL) -m 755 $(BUILD)/upnpc-static $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||||||
|
else
|
||||||
|
- $(INSTALL) -m 755 upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||||||
|
+ $(INSTALL) -m 755 $(BUILD)/upnpc-shared $(DESTDIR)$(INSTALLDIRBIN)/upnpc
|
||||||
|
endif
|
||||||
|
$(INSTALL) -m 755 external-ip.sh $(DESTDIR)$(INSTALLDIRBIN)/external-ip
|
||||||
|
ifeq (, $(findstring amiga, $(OS)))
|
||||||
|
--
|
||||||
|
2.35.1
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
# Template file for 'miniupnpc'
|
# Template file for 'miniupnpc'
|
||||||
pkgname=miniupnpc
|
pkgname=miniupnpc
|
||||||
version=2.2.2
|
version=2.2.3
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
|
make_use_env=y
|
||||||
hostmakedepends="which"
|
hostmakedepends="which"
|
||||||
checkdepends="inetutils-ifconfig"
|
checkdepends="inetutils-ifconfig"
|
||||||
short_desc="Small UPnP client library/tool to access Internet Gateway Devices"
|
short_desc="Small UPnP client library/tool to access Internet Gateway Devices"
|
||||||
|
@ -11,9 +12,7 @@ license="BSD-3-Clause"
|
||||||
#changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-${version}.tar.gz"
|
#changelog="http://miniupnp.free.fr/files/changelog.php?file=miniupnpc-${version}.tar.gz"
|
||||||
homepage="http://miniupnp.free.fr"
|
homepage="http://miniupnp.free.fr"
|
||||||
distfiles="http://miniupnp.free.fr/files/${pkgname}-${version}.tar.gz"
|
distfiles="http://miniupnp.free.fr/files/${pkgname}-${version}.tar.gz"
|
||||||
checksum=888fb0976ba61518276fe1eda988589c700a3f2a69d71089260d75562afd3687
|
checksum=dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24
|
||||||
|
|
||||||
CFLAGS="-fPIC"
|
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense LICENSE
|
vlicense LICENSE
|
||||||
|
|
Loading…
Reference in New Issue