<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8d0713da2f104635dc9335f746b269920c908b11">https://github.com/macports/macports-ports/commit/8d0713da2f104635dc9335f746b269920c908b11</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 8d0713da2f1 jq: better patch, that should hopefully work on 10.7
</span>8d0713da2f1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8d0713da2f104635dc9335f746b269920c908b11
</span>Author: Dan Villiom Podlaski Christiansen <danchr@macports.org>
AuthorDate: Tue Oct 27 21:16:12 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> jq: better patch, that should hopefully work on 10.7
</span>---
sysutils/jq/Portfile | 2 +-
sysutils/jq/files/patch-autoconf-builtins.diff | 93 ++++++++++++++------------
2 files changed, 52 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/jq/Portfile b/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9502de2205a..7669d1001ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/jq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup stedolan jq 1.6 jq-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories sysutils
platforms darwin
maintainers {raimue @raimue} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/jq/files/patch-autoconf-builtins.diff b/sysutils/jq/files/patch-autoconf-builtins.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a4fbbee64d..7b58167f8f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/jq/files/patch-autoconf-builtins.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/jq/files/patch-autoconf-builtins.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 0e841cf57d1c329d290a0bfcfa2398c3ced0fe39 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 8e1a4c0405e555943ea78df4b57b423d705b078c Mon Sep 17 00:00:00 2001
</span> From: Dan Villiom Podlaski Christiansen <danchr@gmail.com>
Date: Wed, 21 Oct 2020 16:48:38 +0200
Subject: [PATCH] Fix Autoconf checks on Darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,60 +6,69 @@ Subject: [PATCH] Fix Autoconf checks on Darwin
</span> The Autoconf checks merely verify that the symbol is available and
linkable, but not that it's actually defined and usable. This breaks
compilation on recent versions of macOS, where `lgamma_r()` is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-unavailable unless `_REENTRANT` is defined.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unavailable unless `_REENTRANT` is defined. Since this is rather
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+difficult to detect, I strengthened the check so that it simple omits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+lgamma_r on macOS.
</span>
While at it, I added support for `exp10()` on macOS, which is
available, but named `__exp10` due to its nonstandard nature.
---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- config/m4/check-math-func.m4 | 6 ++++--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.ac | 20 ++++++++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 24 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ config/m4/check-math-func.m4 | 12 +++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/libm.h | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 17 insertions(+), 2 deletions(-)
</span>
diff --git a/config/m4/check-math-func.m4 b/config/m4/check-math-func.m4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5677cede..a8aee81f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5677cede..739da671 100644
</span> --- a/config/m4/check-math-func.m4
+++ b/config/m4/check-math-func.m4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,8 +2,10 @@ dnl AC_CHECK_MATH_FUNC(func)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl AC_CHECK_MATH_FUNC(func)
</span> AC_DEFUN([AC_CHECK_MATH_FUNC], [
AC_LANG(C)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_LIB([m],[$1],[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- eval "ac_tr_func=HAVE_[]upcase($1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE_UNQUOTED($ac_tr_func)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_DECL([$1], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ eval "ac_tr_func=HAVE_[]upcase($1)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE_UNQUOTED($ac_tr_func)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],[], [[#include <math.h>]])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_LIB([m],[$1],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_CHECKING(for $1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LINK_IFELSE([AC_LANG_SOURCE([
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <math.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void *x = $1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return !x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ])], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT(yes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval "ac_tr_func=HAVE_[]upcase($1)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE_UNQUOTED($ac_tr_func)
</span> ],[
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_MSG_RESULT(no)
</span> ])
])
diff --git a/configure.ac b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0441d4a2..0c5056cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0441d4a2..ad784a54 100644
</span> --- a/configure.ac
+++ b/configure.ac
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -214,6 +214,26 @@ AC_CHECK_MATH_FUNC(y0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(y1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_CHECK_MATH_FUNC(yn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# exp10 is nonstandard, but available as __exp10 on Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test $ac_cv_lib_m_exp10 = no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_DECL([__exp10], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE_UNQUOTED([HAVE_EXP10])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE_UNQUOTED([exp10], [__exp10])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],[], [[#include <math.h>]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# check whether _REENTRANT is required for lgamma_r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$ac_cv_have_decl_lgamma_r" = xno; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unset ac_cv_have_decl_lgamma_r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_CHECK_DECL([lgamma_r], [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE_UNQUOTED([_REENTRANT])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ AC_DEFINE_UNQUOTED([HAVE_LGAMMA_R])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ],[], [[
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #define _REENTRANT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include <math.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Thread local storage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have___thread=no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(for thread-local storage)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,7 +166,8 @@ AC_CHECK_MATH_FUNC(cosh)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(drem)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(erf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(erfc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-AC_CHECK_MATH_FUNC(exp10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_MATH_FUNC(exp10) # nonstandard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_MATH_FUNC(__exp10) # available on darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(exp2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(exp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_MATH_FUNC(expm1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libm.h b/src/libm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b1db7882..4812947e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libm.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,6 +176,10 @@ LIBM_DD_NO(erfc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(HAVE_EXP10) && !defined(WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBM_DD(exp10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(HAVE___EXP10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define exp10 __exp10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBM_DD(exp10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef exp10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBM_DD_NO(exp10)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>