From 0e4382d5f722fd5d6848172d369db3b7237dc1f1 Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Fri, 23 Aug 2024 11:01:46 +0200 Subject: [PATCH 1/3] Use emqx fork of erlang-rocksdb --- rebar.config | 2 +- rebar.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 4d94262..7f3ee48 100644 --- a/rebar.config +++ b/rebar.config @@ -4,7 +4,7 @@ {deps, [ {sext, "1.8.0"}, - {rocksdb, {git, "https://gitlab.com/barrel-db/erlang-rocksdb.git", {tag,"1.8.0"}}}, + {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb.git", {tag,"1.8.0-emqx-6"}}}, {hut, "1.4.0"} ]}. diff --git a/rebar.lock b/rebar.lock index 3b9e82e..39544d6 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,8 @@ {"1.2.0", [{<<"hut">>,{pkg,<<"hut">>,<<"1.4.0">>},0}, {<<"rocksdb">>, - {git,"https://gitlab.com/barrel-db/erlang-rocksdb.git", - {ref,"fced5f637de7991c5948e28414ba3790b0476c4b"}}, + {git,"https://github.com/emqx/erlang-rocksdb.git", + {ref,"1f02f720b91fb53f9535f68548c31280b345d029"}}, 0}, {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}. [ From 0ae7ecd41db8d2a2f6591988cc89f1e0bd1163ac Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Wed, 9 Oct 2024 13:53:01 +0200 Subject: [PATCH 2/3] Use our patched version of the EMQX fork --- rebar.config | 2 +- rebar.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 7f3ee48..771b5f8 100644 --- a/rebar.config +++ b/rebar.config @@ -4,7 +4,7 @@ {deps, [ {sext, "1.8.0"}, - {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb.git", {tag,"1.8.0-emqx-6"}}}, + {rocksdb, {git, "https://github.com/aeternity/erlang-rocksdb.git", {ref,"79bab7c6b6"}}}, {hut, "1.4.0"} ]}. diff --git a/rebar.lock b/rebar.lock index 39544d6..ca035dc 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,8 @@ {"1.2.0", [{<<"hut">>,{pkg,<<"hut">>,<<"1.4.0">>},0}, {<<"rocksdb">>, - {git,"https://github.com/emqx/erlang-rocksdb.git", - {ref,"1f02f720b91fb53f9535f68548c31280b345d029"}}, + {git,"https://github.com/aeternity/erlang-rocksdb.git", + {ref,"79bab7c6b693bf7016490c28987d0b12a6b0dae9"}}, 0}, {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}. [ From d42055c7ac9144b39a1cfe91297f245ffbd5c75e Mon Sep 17 00:00:00 2001 From: Richard Carlsson Date: Sun, 13 Oct 2024 14:30:56 +0200 Subject: [PATCH 3/3] Update erlang-rocksdb to use latest patch fixing compilation issues --- rebar.config | 2 +- rebar.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index 771b5f8..5bd294c 100644 --- a/rebar.config +++ b/rebar.config @@ -4,7 +4,7 @@ {deps, [ {sext, "1.8.0"}, - {rocksdb, {git, "https://github.com/aeternity/erlang-rocksdb.git", {ref,"79bab7c6b6"}}}, + {rocksdb, {git, "https://github.com/emqx/erlang-rocksdb.git", {ref,"d695c6e"}}}, {hut, "1.4.0"} ]}. diff --git a/rebar.lock b/rebar.lock index ca035dc..5149a02 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,8 @@ {"1.2.0", [{<<"hut">>,{pkg,<<"hut">>,<<"1.4.0">>},0}, {<<"rocksdb">>, - {git,"https://github.com/aeternity/erlang-rocksdb.git", - {ref,"79bab7c6b693bf7016490c28987d0b12a6b0dae9"}}, + {git,"https://github.com/emqx/erlang-rocksdb.git", + {ref,"d695c6ee9dd27bfe492ed4e24c72ad20ab0d770b"}}, 0}, {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}. [