Skip to content

Commit

Permalink
Fix compilation error under elixir 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
silviucpp committed Jan 13, 2022
1 parent cdef92d commit 798866a
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
10 changes: 8 additions & 2 deletions c_src/nif.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)),)
Expand Down Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -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">>}]}
].
2 changes: 1 addition & 1 deletion src/erlcass.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -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, []}},
Expand Down

0 comments on commit 798866a

Please sign in to comment.