[Pkg-ocaml-maint-commits] [ocaml-sqlite3] 07/19: Imported Upstream version 4.0.1

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository ocaml-sqlite3.

commit 9307de921f58c7d7766ac37a65858990365c321d
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Aug 3 15:37:20 2016 +0200

    Imported Upstream version 4.0.1
---
 CHANGES.txt     |  4 ++++
 _oasis          |  6 +++++-
 lib/META        |  4 ++--
 myocamlbuild.ml | 17 +++++++++++++++--
 setup.ml        | 19 +++++++++++++++----
 5 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 31a102a..22bd07f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2015-11-05: Improved build process for Homebrew users.
+
+            Thanks to Leonid Rozenberg <leonidr at gmail.com> for this patch!
+
 2015-09-02: Major API change that is compatible with major release series 2:
 
             It is now possible to return errors from user-defined SQL-functions
diff --git a/_oasis b/_oasis
index 89fc385..8c979df 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat:      0.4
 Name:             sqlite3
-Version:          4.0.0
+Version:          4.0.1
 Synopsis:         sqlite3-ocaml - SQLite3 bindings
 Description:      sqlite3-ocaml is an OCaml library with bindings to the
                   SQLite3 client API.  Sqlite3 is a self-contained, serverless,
@@ -33,6 +33,10 @@ Flag strict
   Description:    Strict compile-time checks
   Default:        true
 
+Flag brewcheck
+  Description:    Try to check against a homebrewed sqlite3
+  Default:        false
+
 Library sqlite3
   Path:           lib
   FindlibName:    sqlite3
diff --git a/lib/META b/lib/META
index 2360e7e..8f3ef17 100644
--- a/lib/META
+++ b/lib/META
@@ -1,6 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 5c96ba55072fdd9b0770a2d5872a8c6d)
-version = "4.0.0"
+# DO NOT EDIT (digest: fa19b11d9ac1a4791fb1c01cd07a002f)
+version = "4.0.1"
 description = "sqlite3-ocaml - SQLite3 bindings"
 archive(byte) = "sqlite3.cma"
 archive(byte, plugin) = "sqlite3.cma"
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index ae55ac0..4cff5b3 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -708,6 +708,19 @@ let string_trim s =
   else if !j >= !i then String.sub s !i (!j - !i + 1)
   else ""
 
+let pkg_export =
+  let env = BaseEnvLight.load () in
+  let bcs = BaseEnvLight.var_get "brewcheck" env in
+  let bcs = try bool_of_string bcs with _ -> false in
+  if not bcs then ""
+  else
+    let cmd = "brew ls sqlite | grep pkgconfig" in
+    match read_lines_from_cmd ~max_lines:1 cmd with
+    | [fullpath] when fullpath <> "" ->
+      let path = Filename.dirname fullpath in
+      Printf.sprintf "PKG_CONFIG_PATH=%s" path
+    | _ -> ""
+
 let () =
   let additional_rules = function
     | After_rules ->
@@ -733,13 +746,13 @@ let () =
           List.map cnv chunks
         in
         let osqlite3_cflags =
-          let cmd = "pkg-config --cflags sqlite3" in
+          let cmd = pkg_export ^ " pkg-config --cflags sqlite3" in
           match read_lines_from_cmd ~max_lines:1 cmd with
           | [cflags] -> S (ocamlify ~ocaml_flag:"-ccopt" cflags)
           | _ -> failwith "pkg-config failed for cflags"
         in
         let sqlite3_clibs, osqlite3_clibs =
-          let cmd = "pkg-config --libs sqlite3" in
+          let cmd = pkg_export ^ " pkg-config --libs sqlite3" in
           match read_lines_from_cmd ~max_lines:1 cmd with
           | [libs] ->
               S (split_flags libs), S (ocamlify ~ocaml_flag:"-cclib" libs)
diff --git a/setup.ml b/setup.ml
index 5e395db..0975922 100644
--- a/setup.ml
+++ b/setup.ml
@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.3.0 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 1b6fe2a99f7d4b7e0a8fcaf32a49dc1a) *)
+(* DO NOT EDIT (digest: 728d524ab62c228fdd760d9587408492) *)
 (*
    Regenerated by OASIS v0.4.5
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6981,7 +6981,7 @@ let setup_t =
           alpha_features = [];
           beta_features = [];
           name = "sqlite3";
-          version = "4.0.0";
+          version = "4.0.1";
           license =
             OASISLicense.DEP5License
               (OASISLicense.DEP5Unit
@@ -7062,6 +7062,17 @@ let setup_t =
                       flag_description = Some "Strict compile-time checks";
                       flag_default = [(OASISExpr.EBool true, true)]
                    });
+               Flag
+                 ({
+                     cs_name = "brewcheck";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = []
+                  },
+                   {
+                      flag_description =
+                        Some "Try to check against a homebrewed sqlite3";
+                      flag_default = [(OASISExpr.EBool true, false)]
+                   });
                Library
                  ({
                      cs_name = "sqlite3";
@@ -7512,7 +7523,7 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.5";
-     oasis_digest = Some "�7�\022\139Ku�e��_��\019?";
+     oasis_digest = Some "\\\015�\014�Mkl=�\026\129\146zR\144";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
@@ -7520,6 +7531,6 @@ let setup_t =
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 7524 "setup.ml"
+# 7535 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-sqlite3.git