From e8b6055fb93b2773ac18a62915a307894f53f91c Mon Sep 17 00:00:00 2001 From: Jeremy Soller <jeremy@system76.com> Date: Tue, 19 Feb 2019 20:19:31 -0700 Subject: [PATCH] Use patched git for curl --- recipes/curl/recipe.sh | 4 +++- recipes/curl/redox.patch | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 recipes/curl/redox.patch diff --git a/recipes/curl/recipe.sh b/recipes/curl/recipe.sh index 968a51c7d..7ba99bd13 100644 --- a/recipes/curl/recipe.sh +++ b/recipes/curl/recipe.sh @@ -1,5 +1,7 @@ VERSION="7.62.0" -TAR=https://curl.haxx.se/download/curl-$VERSION.tar.gz +#TAR=https://curl.haxx.se/download/curl-$VERSION.tar.gz +GIT=https://gitlab.redox-os.org/redox-os/curl.git +GIT_BRANCH=redox BUILD_DEPENDS=(openssl zlib) DEPENDS="ca-certificates" diff --git a/recipes/curl/redox.patch b/recipes/curl/redox.patch deleted file mode 100644 index 71602628e..000000000 --- a/recipes/curl/redox.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruw source/include/curl/curl.h source-new/include/curl/curl.h ---- source/include/curl/curl.h 2018-10-30 10:53:59.000000000 -0600 -+++ source-new/include/curl/curl.h 2018-12-10 12:42:52.504393368 -0700 -@@ -74,7 +74,7 @@ - #if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \ - defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \ - defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \ -- defined(__CYGWIN__) || \ -+ defined(__CYGWIN__) || defined(__redox__) || \ - (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) - #include <sys/select.h> - #endif -- GitLab