diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-06-26 09:34:11 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2015-06-26 09:34:11 +0000 |
| commit | 78c062d82a143c7d51cc6dc0cf5c63f3c653355d (patch) | |
| tree | d2cfd62f181c991d318be8e7d5dca6ac2a0fdf50 /databases/couchdb/files/patch-configure | |
| parent | dns/powerdns-recursor: update 3.7.2 -> 3.7.3 (diff) | |
Compatibility fix for R18.
- pkg-plist cleanup
- Remove DOCS from OPTIONS_DEFINE
Notes
Notes:
svn path=/head/; revision=390623
Diffstat (limited to 'databases/couchdb/files/patch-configure')
| -rw-r--r-- | databases/couchdb/files/patch-configure | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/databases/couchdb/files/patch-configure b/databases/couchdb/files/patch-configure new file mode 100644 index 000000000000..c994b52f09c8 --- /dev/null +++ b/databases/couchdb/files/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig 2015-06-26 09:25:19 UTC ++++ configure +@@ -18532,7 +18532,7 @@ esac + + { $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)" + + version="`${ERL} -version 2>&1 | ${SED} 's/[^0-9]/ /g'` 0 0 0" + major_version=`echo $version | ${AWK} "{print \\$1}"` +@@ -18540,7 +18540,7 @@ minor_version=`echo $version | ${AWK} "{ + patch_version=`echo $version | ${AWK} "{print \\$3}"` + 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 + as_fn_error $? "$erlang_version_error major_version does not match" "$LINENO" 5 + fi + +@@ -18559,7 +18559,7 @@ otp_release="`\ + + + +- 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 + USE_OTP_NIFS_TRUE= + USE_OTP_NIFS_FALSE='#' + else +@@ -18567,7 +18567,7 @@ else + USE_OTP_NIFS_FALSE= + 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 + USE_EJSON_COMPARE_NIF_TRUE= + USE_EJSON_COMPARE_NIF_FALSE='#' + else |
