summaryrefslogtreecommitdiff
path: root/user/r/curl-8-support.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/r/curl-8-support.patch')
-rw-r--r--user/r/curl-8-support.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/user/r/curl-8-support.patch b/user/r/curl-8-support.patch
deleted file mode 100644
index f70960691..000000000
--- a/user/r/curl-8-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-This patch differs from upstream in the following ways:
-
- * it does not modify doc/manual/R-admin.texi
-
-From da6638896413bcbb5970b2335b92582853f94e3c Mon Sep 17 00:00:00 2001
-From: ripley <ripley@00db46b3-68df-0310-9c12-caf00c1e9a41>
-Date: Sat, 25 Mar 2023 09:01:30 +0000
-Subject: [PATCH] allow libcurl 8 as its API/ABI is said to be unchanged
-
-git-svn-id: https://svn.r-project.org/R/trunk@84049 00db46b3-68df-0310-9c12-caf00c1e9a41
----
- configure | 6 +++---
- doc/manual/R-admin.texi | 13 ++++++-------
- m4/R.m4 | 4 ++--
- 3 files changed, 11 insertions(+), 12 deletions(-)
-
-diff --git a/configure b/configure
-index c71e78d5017..f5e8e4992f7 100755
---- a/configure
-+++ b/configure
-@@ -51680,8 +51680,8 @@ fi
- done
-
- if test "x${have_libcurl}" = "xyes"; then
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is version 7 and >= 7.28.0" >&5
--printf %s "checking if libcurl is version 7 and >= 7.28.0... " >&6; }
-+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libcurl is >= 7.28.0" >&5
-+printf %s "checking if libcurl is >= 7.28.0... " >&6; }
- if test ${r_cv_have_curl728+y}
- then :
- printf %s "(cached) " >&6
-@@ -51699,7 +51699,7 @@ int main(void)
- {
- #ifdef LIBCURL_VERSION_MAJOR
- #if LIBCURL_VERSION_MAJOR > 7
-- exit(1);
-+ exit(0);
- #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
- exit(0);
- #else
-diff --git a/m4/R.m4 b/m4/R.m4
-index 214dc1a8c7d..c4b9aa8f1c1 100644
---- a/m4/R.m4
-+++ b/m4/R.m4
-@@ -4620,7 +4620,7 @@ LIBS="${CURL_LIBS} ${LIBS}"
- AC_CHECK_HEADERS(curl/curl.h, [have_libcurl=yes], [have_libcurl=no])
-
- if test "x${have_libcurl}" = "xyes"; then
--AC_CACHE_CHECK([if libcurl is version 7 and >= 7.28.0], [r_cv_have_curl728],
-+AC_CACHE_CHECK([if libcurl is >= 7.28.0], [r_cv_have_curl728],
- [AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdlib.h>
- #include <curl/curl.h>
-@@ -4628,7 +4628,7 @@ int main(void)
- {
- #ifdef LIBCURL_VERSION_MAJOR
- #if LIBCURL_VERSION_MAJOR > 7
-- exit(1);
-+ exit(0);
- #elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
- exit(0);
- #else