couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couch commit: updated refs/heads/master to 46cb6a4
Date Sun, 05 Oct 2014 16:14:17 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/master 09a206621 -> 46cb6a4cd


build on *BSD


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

Branch: refs/heads/master
Commit: 46cb6a4cd4c655814427123938b9999062b26b91
Parents: 09a2066
Author: Robert Newson <rnewson@apache.org>
Authored: Sun Oct 5 17:13:59 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Oct 5 17:13:59 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/46cb6a4c/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 747c4d0..09e11ad 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -74,7 +74,8 @@ 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"}],
-
+IcuBsdEnv = [{"CFLAGS", "-DXP_UNIX -I/usr/local/include"},
+             {"LDFLAGS", "-L/usr/local/lib"}],
 ComparePath = "priv/couch_ejson_compare.so",
 CompareSrc = ["priv/couch_ejson_compare/*.c"],
 
@@ -82,17 +83,17 @@ BaseSpecs = [
         %% couchjs
         {"darwin", CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"},
{"LDFLAGS", JS_LDFLAGS}]}]},
         {"linux",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/include/js"},
{"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
-        {"unix",   CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js}"},
{"LDFLAGS", JS_LDFLAGS ++ " -lm"}]}]},
+        {"bsd",   CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_UNIX -I/usr/local/include/js"},
{"LDFLAGS", JS_LDFLAGS ++ " -L/usr/local/lib -lm"}]}]},
         {"win32",  CouchJSPath, CouchJSSrc, [{env, [{"CFLAGS", JS_CFLAGS ++ "-DXP_WIN -I/usr/include/js"},
{"LDFLAGS", JS_LDFLAGS}]}]},
         % ICU
         {"darwin", IcuPath, IcuSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
         {"linux",  IcuPath, IcuSrc, [{env, IcuEnv}]},
-        {"unix",   IcuPath, IcuSrc, [{env, IcuEnv}]},
+        {"bsd",   IcuPath, IcuSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
         {"win32",  IcuPath, IcuSrc, [{env, IcuEnv}]},
         % ejson_compare
         {"darwin", ComparePath, CompareSrc, [{env, IcuEnv ++ IcuDarwinEnv}]},
         {"linux",  ComparePath, CompareSrc, [{env, IcuEnv}]},
-        {"unix",   ComparePath, CompareSrc, [{env, IcuEnv}]},
+        {"bsd",   ComparePath, CompareSrc, [{env, IcuEnv ++ IcuBsdEnv}]},
         {"win32",  ComparePath, CompareSrc, [{env, IcuEnv}]}
 ],
 


Mime
View raw message