Skip to content
Snippets Groups Projects
Commit 837f416c authored by Jeremy Soller's avatar Jeremy Soller Committed by GitHub
Browse files

Merge pull request #74 from ids1024/curl-tar

Use release tarball for curl, with a couple patches
parents 158cdfff 810be8f8
No related branches found
No related tags found
No related merge requests found
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 */
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])
])
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
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment