diff options
| author | Jan Lehnardt <jan@apache.org> | 2021-03-13 20:42:01 +0100 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2021-03-17 15:32:49 +0100 |
| commit | 84eac8a8562c9a7186a60f676d6274ea13d56c9c (patch) | |
| tree | 8e7bcdf668ae0dd9aecc9a7b0267c09997703162 | |
| parent | bfc25ccd34f77191c0d7329a1e57f4ef6c837dff (diff) | |
| download | couchdb-84eac8a8562c9a7186a60f676d6274ea13d56c9c.tar.gz | |
feat: update deps to support otp23 in a full build
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | rebar.config.script | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -237,7 +237,11 @@ EOF install_local_rebar() { if [ ! -x "${rootdir}/bin/rebar" ]; then if [ ! -d "${rootdir}/src/rebar" ]; then - git clone --depth 1 https://github.com/apache/couchdb-rebar.git ${rootdir}/src/rebar + # git clone --depth 1 https://github.com/apache/couchdb-rebar.git ${rootdir}/src/rebar + git clone https://github.com/apache/couchdb-rebar.git ${rootdir}/src/rebar + cd ${rootdir}/src/rebar + git checkout origin/feat/otp23 + cd - fi make -C ${rootdir}/src/rebar mv ${rootdir}/src/rebar/rebar ${rootdir}/bin/rebar diff --git a/rebar.config.script b/rebar.config.script index cbb2192b7..532906c60 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -148,7 +148,7 @@ DepDescs = [ {b64url, "b64url", {tag, "1.0.2"}}, {ets_lru, "ets-lru", {tag, "1.1.0"}}, {khash, "khash", {tag, "1.1.0"}}, -{snappy, "snappy", {tag, "CouchDB-1.0.4"}}, +{snappy, "snappy", {branch, "feat/otp23"}}, %% Non-Erlang deps {docs, {url, "https://github.com/apache/couchdb-documentation"}, @@ -159,7 +159,7 @@ DepDescs = [ {folsom, "folsom", {tag, "CouchDB-0.8.3"}}, {hyper, "hyper", {tag, "CouchDB-2.2.0-6"}}, {ibrowse, "ibrowse", {tag, "CouchDB-4.0.1-1"}}, -{jiffy, "jiffy", {tag, "CouchDB-1.0.4-1"}}, +{jiffy, "jiffy", {branch, "main"}}, {mochiweb, "mochiweb", {tag, "v2.20.0"}}, {meck, "meck", {tag, "0.8.8"}}, {recon, "recon", {tag, "2.5.0"}} |