Skip to contentSkip to conversation

package/libupnp18: add optional dependency to openssl/libressl

PATCH New Bernd Kuhls 2 participants 2 messages Apr 2, 2018 – Apr 4, 2018

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH v2 1/1 package/libupnp18: add optional dependency to openssl/libressl

Signed-off-by Bernd Kuhls <[email protected]>

---
v2: Added and build-tested support for LibreSSL (Thomas)

 package/libupnp18/libupnp18.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/libupnp18/libupnp18.mk +8 -0
index a75558e92b..07ef4382f0 100644
@@ -12,4 +12,12 @@ LIBUPNP18_INSTALL_STAGING = YES
 LIBUPNP18_LICENSE = BSD-3-Clause
 LIBUPNP18_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUPNP18_CONF_OPTS += --enable-open-ssl
+LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
+LIBUPNP18_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
+else
+LIBUPNP18_CONF_OPTS += --disable-open-ssl
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.14.2
#1 lore raw

PATCH v2 1/1 package/libupnp18: add optional dependency to openssl/libressl

Hello,

Quoted 12 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>

---
v2: Added and build-tested support for LibreSSL (Thomas)

 package/libupnp18/libupnp18.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/libupnp18/libupnp18.mk +0 -0
index a75558e92b..07ef4382f0 100644

package/libupnp18/libupnp18.mk LIBUPNP18_INSTALL_STAGING = YES · line 18

Quoted 7 lines
package/libupnp18/libupnp18.mk +4 -0
@@ -12,4 +12,12 @@ LIBUPNP18_INSTALL_STAGING = YES
 LIBUPNP18_LICENSE = BSD-3-Clause
 LIBUPNP18_LICENSE_FILES = LICENSE
 
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+LIBUPNP18_CONF_OPTS += --enable-open-ssl
+LIBUPNP18_DEPENDENCIES += host-pkgconf openssl
+LIBUPNP18_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"

Weird that the configure.ac script doesn't have any logic to link against OpenSSL, but that's indeed the case.

Therefore: applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com