Skip to contentSkip to conversation

package/libssh2: fix build with openssl and atomic

PATCH New Fabrice Fontaine 3 participants 3 messages May 18, 2019 – Jun 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/libssh2: fix build with openssl and atomic

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

---
 package/libssh2/libssh2.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
package/libssh2/libssh2.mk +4 -1
index ed0dd40bec..abee1f8c77 100644
@@ -26,9 +26,12 @@ LIBSSH2_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr \
 # linking
 LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`"
 else ifeq ($(BR2_PACKAGE_LIBSSH2_OPENSSL),y)
-LIBSSH2_DEPENDENCIES += openssl
+LIBSSH2_DEPENDENCIES += host-pkgconf openssl
 LIBSSH2_CONF_OPTS += --with-libssl-prefix=$(STAGING_DIR)/usr \
 	--with-crypto=openssl
+# configure.ac forgets to link to dependent libraries of openssl breaking static
+# linking
+LIBSSH2_CONF_ENV += LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl`
 endif
 
 # Add zlib support if enabled
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/libssh2: fix build with openssl and atomic

Quoted 7 lines · On Sat, 18 May 2019 11:53:23 +0200 Fabrice Fontaine…

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

---
 package/libssh2/libssh2.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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