28ac3c6785
The ./configure script of libcurl includes <arpa_inet.h> instead of <arpa/inet.h> when testing for inet_pton(). The test fails, but it doesn't prevent libcurl to build as it can work without inet_pton(). However, it fills the configure cache with the fact that inet_pton() does not exist. And later, tcpreplay reads this from the configure cache and fails to build, because tcpreplay really need inet_pton(). Unfortunately, just fixing the .m4 file doesn't work because the autoreconfiguration of the package fails. Since the fix for this problem is already upstream, the easiest solution is therefore to bump libcurl. The libcurl-7.19.2-fix-ssl-no-verbose.patch patch is no longer needed. Since we're patching a m4 file, we must autoreconfigure the package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
37 lines
1.2 KiB
Makefile
37 lines
1.2 KiB
Makefile
#############################################################
|
|
#
|
|
# libcurl
|
|
#
|
|
#############################################################
|
|
LIBCURL_VERSION = 7.21.0
|
|
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2
|
|
LIBCURL_SITE = http://curl.haxx.se/download/
|
|
LIBCURL_INSTALL_STAGING = YES
|
|
LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
|
|
LIBCURL_LIBTOOL_PATCH = NO
|
|
|
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
|
LIBCURL_DEPENDENCIES += openssl
|
|
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
|
|
else
|
|
LIBCURL_CONF_OPT += --without-ssl
|
|
endif
|
|
|
|
$(eval $(call AUTOTARGETS,package,libcurl))
|
|
|
|
$(LIBCURL_HOOK_POST_INSTALL):
|
|
rm -rf $(TARGET_DIR)/usr/bin/curl-config \
|
|
$(if $(BR2_PACKAGE_CURL),,$(TARGET_DIR)/usr/bin/curl)
|
|
touch $@
|
|
|
|
curl: libcurl
|
|
curl-clean: libcurl-clean
|
|
curl-dirclean: libcurl-dirclean
|
|
curl-source: libcurl-source
|