From 90f39f441361c045dbde2d3f6a7e4d60c5f09754 Mon Sep 17 00:00:00 2001 From: Dairon Medina Caro Date: Fri, 7 Feb 2020 10:07:47 -0500 Subject: [PATCH] Fixes compilation in OSX --- .gitignore | 1 + .travis.yml | 1 + apps/vmq_generic_msg_store/rebar.config | 2 +- apps/vmq_swc/rebar.config | 2 +- changelog.md | 1 + rebar.lock | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 66131df34..e3c17be1c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ vars.generated vars/dev*_vars.config *.deb *.rpm +*.crashdump .ropeproject *~ diff --git a/.travis.yml b/.travis.yml index 0632fb99f..55921ec71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ services: - memcached before_install: + - sudo apt-get -y install libsnappy-dev - mysql -e "CREATE DATABASE vmq_test_database;" -uroot - mysql -e "CREATE USER 'vmq_test_user' IDENTIFIED BY 'vmq_test_password';" -uroot - mysql -e "GRANT ALL PRIVILEGES ON * . * TO 'vmq_test_user';" -uroot diff --git a/apps/vmq_generic_msg_store/rebar.config b/apps/vmq_generic_msg_store/rebar.config index 87144b169..3ca8770cc 100644 --- a/apps/vmq_generic_msg_store/rebar.config +++ b/apps/vmq_generic_msg_store/rebar.config @@ -1,7 +1,7 @@ {erl_opts, [debug_info, {parse_transform, lager_transform}]}. {deps, [ lager, - {eleveldb, {git, "git://github.com/vernemq/eleveldb.git", "develop"}}, + {eleveldb, {git, "git://github.com/vernemq/eleveldb.git", {branch, "develop"}}}, {sext, "1.5.0"} ]}. diff --git a/apps/vmq_swc/rebar.config b/apps/vmq_swc/rebar.config index ad741786b..510ef1452 100644 --- a/apps/vmq_swc/rebar.config +++ b/apps/vmq_swc/rebar.config @@ -3,7 +3,7 @@ lager, {sext, "1.5.0"}, {swc, {git, "git://github.com/vernemq/ServerWideClocks.git", "master"}}, - {eleveldb, {git, "git://github.com/vernemq/eleveldb.git", "develop"}}, + {eleveldb, {git, "git://github.com/vernemq/eleveldb.git", {branch, "develop"}}}, riak_dt ]}. diff --git a/changelog.md b/changelog.md index 31d010175..e05d06f5d 100644 --- a/changelog.md +++ b/changelog.md @@ -6,6 +6,7 @@ - Fix bug where vmq_metrics crashes because external metric providers haven't started yet. - Fix bug in vmq_swc where a cluster leave didn't properly cleanup the node clock. +- Fix compilation on OSX Mojave and Catalina. Requires running `brew install openssl snappy`. ## VerneMQ 1.10.0 diff --git a/rebar.lock b/rebar.lock index 6f1224a26..b557b0029 100644 --- a/rebar.lock +++ b/rebar.lock @@ -29,7 +29,7 @@ 1}, {<<"eleveldb">>, {git,"git://github.com/vernemq/eleveldb.git", - {ref,"751961c905764ef947330773d6678cac5991d98f"}}, + {ref,"06fefb8102b7fd344c3c56810dee8a2f2c9691d7"}}, 0}, {<<"emysql">>, {git,"git://github.com/djustinek/Emysql.git",