Skip to content

Commit

Permalink
math/R: Allow build with curl 8.0.0+
Browse files Browse the repository at this point in the history
Approved by:	portmgr (blanket)
  • Loading branch information
sunpoet committed Apr 5, 2023
1 parent 73ce71d commit 57d5d49
Showing 1 changed file with 23 additions and 3 deletions.
26 changes: 23 additions & 3 deletions math/R/files/patch-configure
@@ -1,10 +1,30 @@
--- configure.orig 2017-04-19 21:38:22 UTC
--- configure.orig 2023-03-07 23:16:14 UTC
+++ configure
@@ -7528,6 +7528,7 @@ if test $ac_compiler_gnu = yes; then
@@ -8529,6 +8529,7 @@ if test $ac_compiler_gnu = yes; then
else
G77=
GFC=
fi
+G77=yes
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -47587,8 +47588,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
@@ -47606,7 +47607,7 @@ int main(int argc, const char * argv[])
{
#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

0 comments on commit 57d5d49

Please sign in to comment.