Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: support OTP-18.0 #325

Merged
merged 1 commit into from Jun 26, 2015
Merged

build: support OTP-18.0 #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion INSTALL.Unix
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@ Dependencies

You should have the following installed:

* Erlang OTP (>=R14B01, =<R17) (http://erlang.org/)
* Erlang OTP (>=R14B01, =<R18) (http://erlang.org/)
* ICU (http://icu-project.org/)
* OpenSSL (http://www.openssl.org/)
* Mozilla SpiderMonkey (1.8.5) (http://www.mozilla.org/js/spidermonkey/)
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.Windows
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ Dependencies

You will need the following installed:

* Erlang OTP (>=14B01, <R17) (http://erlang.org/)
* Erlang OTP (>=14B01, <R18) (http://erlang.org/)
* ICU (>=4.*) (http://icu-project.org/)
* OpenSSL (>=0.9.8r) (http://www.openssl.org/)
* Mozilla SpiderMonkey (=1.8.5) (http://www.mozilla.org/js/spidermonkey/)
Expand Down
8 changes: 4 additions & 4 deletions configure.ac
View file
Open in desktop
Expand Up @@ -411,15 +411,15 @@ 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}"`
minor_version=`echo $version | ${AWK} "{print \\$2}"`
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

Expand All @@ -438,9 +438,9 @@ otp_release="`\
AC_SUBST(otp_release)

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)")])
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)")])

has_crypto=`\
${ERL} -eval "\
Expand Down
2 changes: 1 addition & 1 deletion share/doc/src/install/unix.rst
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ Dependencies

You should have the following installed:

* `Erlang OTP (>=R14B01, =<R17) <http://erlang.org/>`_
* `Erlang OTP (>=R14B01, =<R18) <http://erlang.org/>`_
* `ICU <http://icu-project.org/>`_
* `OpenSSL <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
Expand Down
2 changes: 1 addition & 1 deletion share/doc/src/install/windows.rst
View file
Open in desktop
Expand Up @@ -90,7 +90,7 @@ Dependencies

You should have the following installed:

* `Erlang OTP (>=14B01, <R17) <http://erlang.org/>`_
* `Erlang OTP (>=14B01, <R18) <http://erlang.org/>`_
* `ICU (>=4.*) <http://icu-project.org/>`_
* `OpenSSL (>0.9.8r) <http://www.openssl.org/>`_
* `Mozilla SpiderMonkey (=1.8.5) <http://www.mozilla.org/js/spidermonkey/>`_
Expand Down