diff --git a/recipes/curl/01-no-nonblock.patch b/recipes/curl/01-no-nonblock.patch new file mode 100644 index 0000000000000000000000000000000000000000..a2b4dd4aaef5a5ff189c1ef5ead8b9ed2a4a500e --- /dev/null +++ b/recipes/curl/01-no-nonblock.patch @@ -0,0 +1,12 @@ +diff -ru source/lib/nonblock.c source-new/lib/nonblock.c +--- source/lib/nonblock.c 2017-08-07 15:42:29.000000000 -0700 ++++ source-new/lib/nonblock.c 2017-08-17 10:57:30.123497389 -0700 +@@ -47,7 +47,7 @@ + int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ + int nonblock /* TRUE or FALSE */) + { +-#if defined(USE_BLOCKING_SOCKETS) ++#if 1 + + return 0; /* returns success */ + diff --git a/recipes/curl/02-threaded-resolver-fix.patch b/recipes/curl/02-threaded-resolver-fix.patch new file mode 100644 index 0000000000000000000000000000000000000000..d885ca4e807b9324de9cee08e39095f9bd48f308 --- /dev/null +++ b/recipes/curl/02-threaded-resolver-fix.patch @@ -0,0 +1,31 @@ +commit 3cb4bb6b5fb8a936cb69e2e9ea6a4e692122abb9 +Author: Jakub Zakrzewski <slither.jz@gmail.com> +Date: Tue Aug 15 13:21:33 2017 -0400 + + curl-confopts.m4: fix --disable-threaded-resolver + + Closes https://github.com/curl/curl/issues/1784 + +diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4 +index d77a884d5..6dcd0f1a6 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]) + ]) diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh index cc11e1e63b49d859534f7a4e6117257d0770fd02..9f90242feb74a344031ba42f6d85687fe8bb7919 100644 --- a/recipes/curl/recipe.sh +++ b/recipes/curl/recipe.sh @@ -1,4 +1,4 @@ -GIT=https://github.com/ids1024/curl.git +TAR=https://curl.haxx.se/download/curl-7.55.1.tar.gz BRANCH=redox BUILD_DEPENDS=(openssl) @@ -13,7 +13,9 @@ function recipe_update { } function recipe_build { - ./configure --prefix=/ --host=${HOST} --disable-tftp --disable-ftp --disable-ntlm-wb --with-ssl="$PWD/../sysroot" --with-ca-path=/ssl/certs + wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub + autoreconf + ./configure --prefix=/ --host=${HOST} --disable-tftp --disable-ftp --disable-ntlm-wb --disable-threaded-resolver --with-ssl="$PWD/../sysroot" --with-ca-path=/ssl/certs make skip=1 }