Skip to contentSkip to conversation

libupnpp: fix libupnp dependency

PATCH New Fabrice Fontaine 2 participants 4 messages Jan 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 libupnpp: fix libupnp dependency

Commit 9b551dacf74445d58aaefef349e2817e009c9d5d added support for libupnp18 but without updating LIBUPNPP_DEPENDENCIES

Fixes:
- http://autobuild.buildroot.org/results/aa734318b9ad318d25e772585c8794429cc0f489

---
 package/libupnpp/libupnpp.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/libupnpp/libupnpp.mk +2 -1
index 69ce0768a9..31a066a648 100644
@@ -9,7 +9,8 @@ LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
 LIBUPNPP_LICENSE = LGPL-2.1+
 LIBUPNPP_LICENSE_FILES = COPYING
 LIBUPNPP_INSTALL_STAGING = YES
-LIBUPNPP_DEPENDENCIES = expat libcurl libupnp
+LIBUPNPP_DEPENDENCIES = expat libcurl \
+	$(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
 # We're patching configure.ac
 LIBUPNPP_AUTORECONF = YES
 
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/2 libupnpp: remove AUTORECONF

Commit 9b551dacf74445d58aaefef349e2817e009c9d5d removed patch on configure.ac so remove uneeded LIBUPNPP_AUTORECONF

---
 package/libupnpp/libupnpp.mk | 2 --
 1 file changed, 2 deletions(-)
package/libupnpp/libupnpp.mk +0 -2
index 31a066a648..3619050f10 100644
@@ -11,8 +11,6 @@ LIBUPNPP_LICENSE_FILES = COPYING
 LIBUPNPP_INSTALL_STAGING = YES
 LIBUPNPP_DEPENDENCIES = expat libcurl \
 	$(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
-# We're patching configure.ac
-LIBUPNPP_AUTORECONF = YES
 
 # configure script fails to link against the dependencies of libupnp
 # and libcurl causing detection to fail when statically linking
Signature · 1 line
2.14.1
#2 lore raw

PATCH 2/2 libupnpp: remove AUTORECONF

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Commit 9b551dacf74445d58aaefef349e2817e009c9d5d removed patch on configure.ac so remove uneeded LIBUPNPP_AUTORECONF

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/2 libupnpp: fix libupnp dependency

In reply to Fabrice Fontaine
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Commit 9b551dacf74445d58aaefef349e2817e009c9d5d added support for libupnp18 but without updating LIBUPNPP_DEPENDENCIES

Fixes:
- http://autobuild.buildroot.org/results/aa734318b9ad318d25e772585c8794429cc0f489

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard