aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Dedecker <dedeckeh@gmail.com>2017-09-27 17:22:44 +0200
committerHans Dedecker <dedeckeh@gmail.com>2017-09-27 17:33:48 +0200
commit754659ddb55eacb87e1c4bbd7925348e55846809 (patch)
tree3af66a25ee3c1fafbb89eba8fc0663e82bb6fea7
parent456de2129727cdbeb0552f9a593518eb5452eef8 (diff)
downloadupstream-754659ddb55eacb87e1c4bbd7925348e55846809.tar.gz
upstream-754659ddb55eacb87e1c4bbd7925348e55846809.tar.bz2
upstream-754659ddb55eacb87e1c4bbd7925348e55846809.zip
curl: fix disable threaded resolver
Bump to 7.55.1 broke the disable threaded resolver feature as reported in https://github.com/curl/curl/issues/1784. As a result curl is always compiled with the threaded resolver feature enabled which causes a dependency issue on pthread for uclibc. Fix this issue by backporting the upstream curl commit which fixes disable threaded resolver. Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
-rw-r--r--package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch b/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch
new file mode 100644
index 0000000000..b08d765308
--- /dev/null
+++ b/package/network/utils/curl/patches/320-curl-confopts.m4-fix-disable-threaded-resolver.patch
@@ -0,0 +1,36 @@
+From 3cb4bb6b5fb8a936cb69e2e9ea6a4e692122abb9 Mon Sep 17 00:00:00 2001
+From: Jakub Zakrzewski <slither.jz@gmail.com>
+Date: Tue, 15 Aug 2017 13:21:33 -0400
+Subject: [PATCH] curl-confopts.m4: fix --disable-threaded-resolver
+
+Closes https://github.com/curl/curl/issues/1784
+---
+ m4/curl-confopts.m4 | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
+index d77a884..6dcd0f1 100644
+--- a/m4/curl-confopts.m4
++++ b/m4/curl-confopts.m4
+@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
+ AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
+ OPT_THRES=$enableval)
+ case "$OPT_THRES" in
+- *)
+- dnl configure option not specified
+- want_thres="yes"
+- ;;
+ no)
+ dnl --disable-threaded-resolver option used
+ want_thres="no"
+ ;;
++ *)
++ dnl configure option not specified
++ want_thres="yes"
++ ;;
+ esac
+ AC_MSG_RESULT([$want_thres])
+ ])
+--
+1.9.1
+