diff --git a/CHANGELOG.md b/CHANGELOG.md index fb465cc..baaf2bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ### Changelog: +##### v4.0.5 + +- Fix compilation error under elixir 1.13 + ##### v4.0.4 - Speed up builds, use shallow clone for `cpp-driver` diff --git a/c_src/nif.mk b/c_src/nif.mk index 29f7420..adfd3fb 100644 --- a/c_src/nif.mk +++ b/c_src/nif.mk @@ -4,9 +4,15 @@ CURDIR := $(shell pwd) BASEDIR := $(abspath $(CURDIR)/..) +ifndef REBAR_BARE_COMPILER_OUTPUT_DIR + PRIV_DIR ?= $(BASEDIR)/priv +else + PRIV_DIR ?= $(REBAR_BARE_COMPILER_OUTPUT_DIR)/priv +endif + C_SRC_DIR = $(CURDIR) C_SRC_ENV ?= $(C_SRC_DIR)/env.mk -C_SRC_OUTPUT ?= $(CURDIR)/../priv/$(PROJECT_NIF_NAME).so +C_SRC_OUTPUT ?= $(PRIV_DIR)/$(PROJECT_NIF_NAME).so #regenerate all the time the env.mk ifneq ($(wildcard $(C_SRC_DIR)),) @@ -68,7 +74,7 @@ COMPILE_C = $(c_verbose) $(CC) $(CFLAGS) $(CPPFLAGS) -c COMPILE_CPP = $(cpp_verbose) $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $(C_SRC_OUTPUT): $(OBJECTS) - @mkdir -p $(BASEDIR)/priv/ + @mkdir -p $(PRIV_DIR)/ $(link_verbose) $(CC) $(OBJECTS) $(LDFLAGS) -o $(C_SRC_OUTPUT) %.o: %.c diff --git a/rebar.lock b/rebar.lock index 1191c1b..dd792d8 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,11 @@ -{"1.1.0", +{"1.2.0", [{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1}, {<<"lager">>,{pkg,<<"lager">>,<<"3.9.2">>},0}]}. [ {pkg_hash,[ {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}, - {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>}]} + {<<"lager">>, <<"4CAB289120EB24964E3886BD22323CB5FEFE4510C076992A23AD18CF85413D8C">>}]}, +{pkg_hash_ext,[ + {<<"goldrush">>, <<"99CB4128CFFCB3227581E5D4D803D5413FA643F4EB96523F77D9E6937D994CEB">>}, + {<<"lager">>, <<"7F904D9E87A8CB7E66156ED31768D1C8E26EBA1D54F4BC85B1AA4AC1F6340C28">>}]} ]. diff --git a/src/erlcass.app.src b/src/erlcass.app.src index 370cefc..41c5396 100644 --- a/src/erlcass.app.src +++ b/src/erlcass.app.src @@ -2,7 +2,7 @@ {description, "ErlCass - Erlang Cassandra Driver"}, {licenses, ["MIT"]}, {links,[{"Github","https://github.com/silviucpp/erlcass"}]}, - {vsn, "4.0.4"}, + {vsn, "4.0.5"}, {registered, []}, {applications, [kernel, stdlib, lager]}, {mod, {erlcass_app, []}},