couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/1843-feature-bigcouch to c89125f
Date Mon, 03 Feb 2014 13:50:24 GMT
Updated Branches:
  refs/heads/1843-feature-bigcouch 85e594e8c -> c89125f13


Build icu_driver


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c89125f1
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c89125f1
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c89125f1

Branch: refs/heads/1843-feature-bigcouch
Commit: c89125f1366040c7e2a51a2b10bc0beddcaa7fe4
Parents: 85e594e
Author: Robert Newson <rnewson@apache.org>
Authored: Mon Feb 3 13:42:58 2014 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Mon Feb 3 13:42:58 2014 +0000

----------------------------------------------------------------------
 src/couch/rebar.config.script | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c89125f1/src/couch/rebar.config.script
----------------------------------------------------------------------
diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index a0e1345..43c9a61 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/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},


Mime
View raw message