[150224] trunk/dports/databases/couchdb/files
ciserlohn at macports.org
ciserlohn at macports.org
Wed Jul 13 01:31:30 PDT 2016
Revision: 150224
https://trac.macports.org/changeset/150224
Author: ciserlohn at macports.org
Date: 2016-07-13 01:31:30 -0700 (Wed, 13 Jul 2016)
Log Message:
-----------
couchdb: fix build failure with erlang 19.0
Modified Paths:
--------------
trunk/dports/databases/couchdb/files/patch-configure.ac.diff
trunk/dports/databases/couchdb/files/patch-configure.diff
Modified: trunk/dports/databases/couchdb/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-configure.ac.diff 2016-07-13 08:07:31 UTC (rev 150223)
+++ trunk/dports/databases/couchdb/files/patch-configure.ac.diff 2016-07-13 08:31:30 UTC (rev 150224)
@@ -5,7 +5,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
$as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
version="`${ERL} -version 2>&1 | ${SED} 's/[[^0-9]]/ /g'` 0 0 0"
major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -14,7 +14,7 @@
echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
-if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 7; then
++if test $major_version -lt 5 -o $major_version -gt 8; then
as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
fi
@@ -23,7 +23,7 @@
AC_MSG_RESULT(compatible)
-# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
-+# returns 17/18 for erts-6.0/7.0, and R14B03 or similar for earlier releases
++# returns 17/18/19 for erts-6.0/7.0/8.0, and R14B03 or similar for earlier releases
otp_release="`\
${ERL} -noshell \
-eval 'io:put_chars(erlang:system_info(otp_release)).' \
@@ -32,10 +32,10 @@
AM_CONDITIONAL([USE_OTP_NIFS],
- [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)")])
-+ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)")])
++ [can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)")])
AM_CONDITIONAL([USE_EJSON_COMPARE_NIF],
- [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)")])
-+ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)")])
++ [can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)")])
has_crypto=`\
${ERL} -eval "\
Modified: trunk/dports/databases/couchdb/files/patch-configure.diff
===================================================================
--- trunk/dports/databases/couchdb/files/patch-configure.diff 2016-07-13 08:07:31 UTC (rev 150223)
+++ trunk/dports/databases/couchdb/files/patch-configure.diff 2016-07-13 08:31:30 UTC (rev 150224)
@@ -5,7 +5,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Erlang version compatibility" >&5
$as_echo_n "checking Erlang version compatibility... " >&6; }
-erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 17 (erts-6.0)"
-+erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 18 (erts-7.0)"
++erlang_version_error="The installed Erlang version must be >= R14B (erts-5.8.1) and =< 19 (erts-8.0)"
version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0"
major_version=`echo $version | ${AWK} "{print \\$1}"`
@@ -14,7 +14,7 @@
echo -n "detected Erlang version: $major_version.$minor_version.$patch_version..."
-if test $major_version -lt 5 -o $major_version -gt 6; then
-+if test $major_version -lt 5 -o $major_version -gt 7; then
++if test $major_version -lt 5 -o $major_version -gt 8; then
as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5
fi
@@ -23,7 +23,7 @@
$as_echo "compatible" >&6; }
-# returns 17 for erts-6.0, and R14B03 or similar for earlier releases
-+# returns 17/18 for erts-6.0/7.0, and R14B03 or similar for earlier releases
++# returns 17/18 for erts-6.0/7.0/8.0, and R14B03 or similar for earlier releases
otp_release="`\
${ERL} -noshell \
-eval 'io:put_chars(erlang:system_info(otp_release)).' \
@@ -32,7 +32,7 @@
- if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17)"); then
-+ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18)"); then
++ if can_use_nifs=$(echo $otp_release | grep -E "^(R14B|R15|R16|17|18|19)"); then
USE_OTP_NIFS_TRUE=
USE_OTP_NIFS_FALSE='#'
else
@@ -41,7 +41,7 @@
fi
- if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17)"); then
-+ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18)"); then
++ if can_use_ejson=$(echo $otp_release | grep -E "^(R14B03|R15|R16|17|18|19)"); then
USE_EJSON_COMPARE_NIF_TRUE=
USE_EJSON_COMPARE_NIF_FALSE='#'
else
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160713/49ce85a7/attachment-0001.html>
More information about the macports-changes
mailing list