You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2020/04/28 19:26:13 UTC
[couchdb] branch 3.0.x updated (e375b3d -> 916bd6b)
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a change to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from e375b3d View is partitioned if db and view are partitioned
new 14e3cd4 Suppress offsetof gcc warnings for SM60
new 916bd6b Drop os_mon from dependencies
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
INSTALL.Unix.md | 2 +-
rebar.config.script | 2 +-
rel/reltool.config | 2 --
src/couch/rebar.config.script | 2 +-
src/couch/src/couch.app.src | 1 -
src/couch/src/couch.erl | 1 -
6 files changed, 3 insertions(+), 7 deletions(-)
[couchdb] 02/02: Drop os_mon from dependencies
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 916bd6bb29fae3d32ba01edae7ecb2aef04694cd
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Apr 28 14:31:06 2020 -0400
Drop os_mon from dependencies
---
INSTALL.Unix.md | 2 +-
rebar.config.script | 2 +-
rel/reltool.config | 2 --
src/couch/src/couch.app.src | 1 -
src/couch/src/couch.erl | 1 -
5 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/INSTALL.Unix.md b/INSTALL.Unix.md
index 1934e9b..cb45e9a 100644
--- a/INSTALL.Unix.md
+++ b/INSTALL.Unix.md
@@ -90,7 +90,7 @@ You can install the dependencies by running:
sudo yum install autoconf autoconf-archive automake \
curl-devel erlang-asn1 erlang-erts erlang-eunit \
- erlang-os_mon erlang-xmerl help2man \
+ erlang-xmerl help2man \
js-devel-1.8.5 libicu-devel libtool perl-Test-Harness
You can install the Node.JS dependencies via [NodeSource](https://github.com/nodesource/distributions#rpminstall).
diff --git a/rebar.config.script b/rebar.config.script
index cfb3134..78c2e2f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -205,7 +205,7 @@ AddConfig = [
{plt_location, local},
{plt_location, COUCHDB_ROOT},
{plt_extra_apps, [
- asn1, compiler, crypto, inets, kernel, os_mon, runtime_tools,
+ asn1, compiler, crypto, inets, kernel, runtime_tools,
sasl, setup, ssl, stdlib, syntax_tools, xmerl]},
{warnings, [unmatched_returns, error_handling, race_conditions]}]},
{post_hooks, [{compile, "escript support/build_js.escript"}]}
diff --git a/rel/reltool.config b/rel/reltool.config
index 5285504..a576f9c 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -19,7 +19,6 @@
crypto,
inets,
kernel,
- os_mon,
runtime_tools,
sasl,
ssl,
@@ -76,7 +75,6 @@
{app, crypto, [{incl_cond, include}]},
{app, inets, [{incl_cond, include}]},
{app, kernel, [{incl_cond, include}]},
- {app, os_mon, [{incl_cond, include}]},
{app, public_key, [{incl_cond, include}]},
{app, runtime_tools, [{incl_cond, include}]},
{app, sasl, [{incl_cond, include}]},
diff --git a/src/couch/src/couch.app.src b/src/couch/src/couch.app.src
index 12ec29e..6116c79 100644
--- a/src/couch/src/couch.app.src
+++ b/src/couch/src/couch.app.src
@@ -33,7 +33,6 @@
sasl,
inets,
ssl,
- os_mon,
% Upstream deps
ibrowse,
diff --git a/src/couch/src/couch.erl b/src/couch/src/couch.erl
index 60a8b66..1c912ac 100644
--- a/src/couch/src/couch.erl
+++ b/src/couch/src/couch.erl
@@ -23,7 +23,6 @@ deps() ->
[
sasl,
inets,
- os_mon,
crypto,
public_key,
ssl,
[couchdb] 01/02: Suppress offsetof gcc warnings for SM60
Posted by wo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wohali pushed a commit to branch 3.0.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 14e3cd43fbaab93d65639c73c621125212192707
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Apr 28 13:46:14 2020 -0400
Suppress offsetof gcc warnings for SM60
Mozilla did this years ago:
https://hg.mozilla.org/mozilla-central/rev/41d9d32ab5a7
---
src/couch/rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 91e24d9..39304cc 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -120,7 +120,7 @@ end,
};
{unix, _} when SMVsn == "60" ->
{
- "-DXP_UNIX -I/usr/include/mozjs-60 -I/usr/local/include/mozjs-60 -std=c++14",
+ "-DXP_UNIX -I/usr/include/mozjs-60 -I/usr/local/include/mozjs-60 -std=c++14 -Wno-invalid-offsetof",
"-L/usr/local/lib -std=c++14 -lmozjs-60 -lm"
}
end.