summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2013-02-14 03:50:18 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-02-17 22:02:01 (GMT)
commite32c29a09849b71cb20c964880b9be671132b7b5 (patch)
treefc843a2a883804d7969043a802397bb78d5cbf4e
parenta32a55d87e4a2476fcc0dc3edc27e0a7f2dc4350 (diff)
downloadbuildroot-e32c29a09849b71cb20c964880b9be671132b7b5.tar.gz
buildroot-e32c29a09849b71cb20c964880b9be671132b7b5.tar.bz2
libcurl: re-enable on non-MMU platforms
In 9229b82d6326ea425a258b91a9f0157ef6b223b7 ('libcurl: needs MMU'), the libcurl package was disabled on non-MMU systems, due to the usage of the fork() function in the library. However, a deeper inspection reveals that fork() is only used in the implementation of NTLM, an obscure, undocumented, Microsoft specific authentication method that apparently isn't common anymore. See http://curl.haxx.se/docs/manpage.html#--ntlm. Therefore, this commit re-enables libcurl on non-MMU systems by explicitly disabling the NTLM support. If someone ever needs NTLM support in Buildroot's libcurl package, it will always be time to add a libcurl sub-option to enable it. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/libcurl/Config.in1
-rw-r--r--package/libcurl/libcurl.mk8
2 files changed, 7 insertions, 2 deletions
diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in
index 10ee0e4..1d6d08e 100644
--- a/package/libcurl/Config.in
+++ b/package/libcurl/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_LIBCURL
bool "libcurl"
- depends on BR2_USE_MMU # Uses fork()
help
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet,
and Dict servers, using any of the supported protocols.
diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk
index 38ca854..a631953 100644
--- a/package/libcurl/libcurl.mk
+++ b/package/libcurl/libcurl.mk
@@ -10,7 +10,13 @@ LIBCURL_SITE = http://curl.haxx.se/download
LIBCURL_LICENSE = ICS
LIBCURL_LICENSE_FILES = COPYING
LIBCURL_INSTALL_STAGING = YES
-LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols
+
+# We disable NTLM support because it uses fork(), which doesn't work
+# on non-MMU platforms. Moreover, this authentication method is
+# probably almost never used. See
+# http://curl.haxx.se/docs/manpage.html#--ntlm.
+LIBCURL_CONF_OPT = --disable-verbose --disable-manual \
+ --enable-hidden-symbols --disable-ntlm-wb
LIBCURL_CONFIG_SCRIPTS = curl-config
ifeq ($(BR2_PACKAGE_OPENSSL),y)