couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [3/3] couch commit: updated refs/heads/master to caf44fb
Date Fri, 23 May 2014 16:16:24 GMT
Build against homebrew ICU on OS X


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

Branch: refs/heads/master
Commit: caf44fb19c649948c0b9892e252958b4098da664
Parents: 9e67427
Author: Robert Newson <rnewson@apache.org>
Authored: Fri May 23 17:15:57 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Fri May 23 17:15:57 2014 +0100

----------------------------------------------------------------------
 rebar.config.script | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/caf44fb1/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 7221d0f..aa86df8 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -51,6 +51,16 @@ end,
 
 CouchJSSrc = ["priv/couch_js/*.c"],
 
+IcuPath = "priv/couch_icu_driver.so",
+IcuSrc = ["priv/icu_driver/*.c"],
+IcuEnv = [{"DRV_CFLAGS",  "$DRV_CFLAGS -DPIC -O2 -fno-common"},
+          {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}],
+IcuDarwinEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/opt/icu4c/include"},
+                {"LDFLAGS", "-L/usr/local/opt/icu4c/lib"}],
+
+ComparePath = "priv/couch_ejson_compare.so",
+CompareSrc = ["priv/couch_ejson_compare/*.c"],
+
 BaseSpecs = [
         %% couchjs
         {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"},
{"LDFLAGS", JS_LDFLAGS}]}]},
@@ -58,11 +68,15 @@ BaseSpecs = [
         {"unix",   CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js}"},
{"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
         {"win32",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_WIN -I/usr/include/js"},
{"LDFLAGS", JS_LDFLAGS}]}]},
         % ICU
-        {"", "priv/couch_icu_driver.so", ["priv/icu_driver/*.c"], [{env, [
-            {"DRV_CFLAGS",  "$DRV_CFLAGS -DPIC -O2 -fno-common"},
-            {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"}]}]},
+        {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
+        {"linux",  IcuPath, IcuSrc, [{env, IcuEnv}]},
+        {"unix",   IcuPath, IcuSrc, [{env, IcuEnv}]},
+        {"win32",  IcuPath, IcuSrc, [{env, IcuEnv}]},
         % ejson_compare
-        {"priv/couch_ejson_compare.so", ["priv/couch_ejson_compare/*.c"]}
+        {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
+        {"linux",  ComparePath, CompareSrc, [{env, IcuEnv}]},
+        {"unix",   ComparePath, CompareSrc, [{env, IcuEnv}]},
+        {"win32",  ComparePath, CompareSrc, [{env, IcuEnv}]}
 ],
 
 SpawnSpec = [


Mime
View raw message