You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/10 21:05:34 UTC
[34/50] couch commit: updated refs/remotes/origin/import to 09c6556
Build icu_driver
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/a64fe659
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/a64fe659
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/a64fe659
Branch: refs/remotes/origin/import
Commit: a64fe6592fc2b758fb2f7b7dc43312fafd8b5ecf
Parents: d05eb31
Author: Robert Newson <rn...@apache.org>
Authored: Mon Feb 3 13:42:58 2014 +0000
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Feb 4 17:03:53 2014 -0600
----------------------------------------------------------------------
rebar.config.script | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/a64fe659/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index a0e1345..43c9a61 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -48,21 +48,26 @@ end,
CFLAGS1 = CFLAGS0 ++ " -DWITHOUT_CURL",
PortEnv = [
+ {"DRV_CFLAGS", "$DRV_CFLAGS -DPIC -O2 -fno-common"},
+ {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"},
{"CFLAGS", "$CFLAGS -Wall -c -g -O2 " ++ CFLAGS1},
{"LDFLAGS", LDFLAGS}],
CouchJSSpec = [{filename:join(["priv", CouchJSName]),
["priv/couch_js/{help,http,main,utf8,util}.c"]}],
SpawnSpec = [{"priv/couchspawnkillable", ["priv/spawnkillable/*.c"]}],
+IcuSpec = [{"priv/couch_icu_driver.so", ["priv/icu_driver/*.c"]}],
+
+BaseSpecs = CouchJSSpec ++ IcuSpec,
PortSpecs = case os:type() of
{win32, _} ->
- CouchJSSpec ++ SpawnSpec;
+ BaseSpecs ++ SpawnSpec;
_ ->
{ok, _} = file:copy("priv/spawnkillable/couchspawnkillable.sh",
"priv/couchspawnkillable"),
os:cmd("chmod +x priv/couchspawnkillable"),
- CouchJSSpec
+ BaseSpecs
end,
[{port_env, PortEnv},