openldap: fix static link with openssl
authorBaruch Siach <baruch@tkos.co.il>
Wed, 13 May 2015 18:22:07 +0000 (21:22 +0300)
committerPeter Korsgaard <peter@korsgaard.com>
Wed, 13 May 2015 20:21:32 +0000 (22:21 +0200)
Use pkg-config to get openssl link dependencies.

Fixes:
http://autobuild.buildroot.net/results/dd3/dd3821e713b7da7cde0f059409fba46371c8bc40/
http://autobuild.buildroot.net/results/d60/d60c8b4522e99cf385ee41aa20a1d49deb59c5fb/
http://autobuild.buildroot.net/results/b41/b41c043fb3b2fad1d9cea0a95b512fb4942b5b19/

and more.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/openldap/openldap.mk

index 991d36953f3e4dccf2c170825db456539b324e00..68464abcea2c873bca7ff928b682d94c988610e6 100644 (file)
@@ -10,6 +10,7 @@ OPENLDAP_SITE = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release
 OPENLDAP_LICENSE = OpenLDAP Public License
 OPENLDAP_LICENSE_FILES = LICENSE
 OPENLDAP_INSTALL_STAGING = YES
+OPENLDAP_DEPENDENCIES = host-pkgconf
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 OPENLDAP_TLS = openssl
@@ -30,6 +31,7 @@ endif
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 OPENLDAP_MP = bignum
 OPENLDAP_DEPENDENCIES += openssl
+OPENLDAP_CONF_ENV = LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto)"
 else ifeq ($(BR2_PACKAGE_GMP),y)
 OPENLDAP_MP = gmp
 OPENLDAP_DEPENDENCIES += gmp
@@ -37,7 +39,7 @@ else
 OPENLDAP_MP = longlong
 endif
 
-OPENLDAP_CONF_ENV = ac_cv_func_memcmp_working=yes
+OPENLDAP_CONF_ENV += ac_cv_func_memcmp_working=yes
 
 OPENLDAP_CONF_OPTS += \
        --enable-syslog \