Date: Wed, 5 Apr 2023 17:43:26 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 57d5d4910701 - main - math/R: Allow build with curl 8.0.0+ Message-ID: <202304051743.335HhQhA010067@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=57d5d49107010fddf9ac7ff86fbbe1dbc50810e4 commit 57d5d49107010fddf9ac7ff86fbbe1dbc50810e4 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-04-05 17:26:18 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-04-05 17:31:58 +0000 math/R: Allow build with curl 8.0.0+ Approved by: portmgr (blanket) --- math/R/files/patch-configure | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/math/R/files/patch-configure b/math/R/files/patch-configure index d29a9b4258a4..831a10096951 100644 --- a/math/R/files/patch-configure +++ b/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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304051743.335HhQhA010067>