Explorar el Código

libcurl: fix configure with openssl when target == host.

Peter Korsgaard hace 16 años
padre
commit
a51ce31949
Se han modificado 1 ficheros con 5 adiciones y 0 borrados
  1. 5 0
      package/libcurl/libcurl.mk

+ 5 - 0
package/libcurl/libcurl.mk

@@ -13,6 +13,11 @@ LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols \
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBCURL_DEPENDENCIES += openssl
 LIBCURL_DEPENDENCIES += openssl
 LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
 LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes
+# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up
+# native stuff during the rest of configure when target == host.
+# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs
+# are found first.
+LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib
 LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
 LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr --with-random=/dev/urandom
 endif
 endif