You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2020/01/06 11:23:00 UTC
[couchdb] branch fix/sm60 created (now ee68ec2)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch fix/sm60
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
at ee68ec2 fix: build against sm60 on mac needs extra compiler flags
This branch includes the following new commits:
new 99c1aff fix: avoid segfaults, patch by @davisp
new ee68ec2 fix: build against sm60 on mac needs extra compiler flags
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.
[couchdb] 01/02: fix: avoid segfaults, patch by @davisp
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch fix/sm60
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 99c1affff3e31b500ec155afd4cc864039c9ab01
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Mon Jan 6 11:28:58 2020 +0100
fix: avoid segfaults, patch by @davisp
---
src/couch/priv/couch_js/60/main.cpp | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/couch/priv/couch_js/60/main.cpp b/src/couch/priv/couch_js/60/main.cpp
index c92cfb7..ecedfbd 100644
--- a/src/couch/priv/couch_js/60/main.cpp
+++ b/src/couch/priv/couch_js/60/main.cpp
@@ -487,8 +487,5 @@ main(int argc, const char* argv[])
JS_MaybeGC(cx);
}
- JS_DestroyContext(cx);
- JS_ShutDown();
-
return 0;
}
[couchdb] 02/02: fix: build against sm60 on mac needs extra
compiler flags
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch fix/sm60
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ee68ec2f4ec2e4dd8b03fece20390a33bafa0b5b
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Mon Jan 6 12:22:39 2020 +0100
fix: build against sm60 on mac needs extra compiler flags
---
src/couch/rebar.config.script | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 2672578..b875fbc 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -108,6 +108,11 @@ end,
"/DXP_WIN /IC:\\relax\\js-60\\js\\src",
"/LIBPATH:C:\\relax\\js-60\\js\\src mozjs-60.lib"
};
+ {unix, darwin} when SMVsn == "60" ->
+ {
+ "-DXP_UNIX -I/usr/include/mozjs-60 -I/usr/local/include/mozjs-60 -std=c++14 -lc++",
+ "-L/usr/local/lib -lmozjs-60 -lm -std=c++14 -lc++"
+ };
{unix, _} when SMVsn == "60" ->
{
"-DXP_UNIX -I/usr/include/mozjs-60 -I/usr/local/include/mozjs-60 -std=c++14",