From 0da45130ab3a23a4875b1fc103f5f8ef7ed288e1 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Mon, 7 Oct 2019 13:40:05 +0200 Subject: [PATCH] update curl and remove obsolete patch --- third_party/curl/CMakeLists.txt | 4 +--- third_party/curl/sizeof.patch | 22 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 third_party/curl/sizeof.patch diff --git a/third_party/curl/CMakeLists.txt b/third_party/curl/CMakeLists.txt index 3d139c425e..42dfe790c5 100644 --- a/third_party/curl/CMakeLists.txt +++ b/third_party/curl/CMakeLists.txt @@ -39,9 +39,7 @@ endforeach() ExternalProject_add( curl - GIT_REPOSITORY https://github.com/curl/curl - GIT_TAG curl-7_65_0 + URL https://github.com/curl/curl/archive/curl-7_66_0.zip PREFIX curl - PATCH_COMMAND git apply ${PROJECT_SOURCE_DIR}/sizeof.patch CMAKE_ARGS "${CMAKE_ARGS}" ) diff --git a/third_party/curl/sizeof.patch b/third_party/curl/sizeof.patch deleted file mode 100644 index 17d83c97de..0000000000 --- a/third_party/curl/sizeof.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake -index 5308eb579..0aa68f056 100644 ---- a/lib/curl_config.h.cmake -+++ b/lib/curl_config.h.cmake -@@ -889,7 +889,7 @@ - #cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT} - - /* The size of `long', as computed by sizeof. */ --#cmakedefine SIZEOF_LONG ${SIZEOF_LONG} -+${SIZEOF_LONG_CODE} - - /* The size of `off_t', as computed by sizeof. */ - #cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T} -@@ -898,7 +898,7 @@ - #cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T} - - /* The size of `size_t', as computed by sizeof. */ --#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T} -+${SIZEOF_SIZE_T_CODE} - - /* The size of `time_t', as computed by sizeof. */ - #cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T}