From f7a88df05dba2a914bd0af4fa838faeb490c2878 Mon Sep 17 00:00:00 2001 From: Markus Mottl Date: Tue, 14 Jun 2016 12:50:20 -0400 Subject: [PATCH] Loadable extensions turned off by default on Mac OS X --- CHANGES.txt | 5 +++++ README.md | 6 +++++- _oasis | 4 ++-- lib/META | 4 ++-- setup.ml | 16 +++++++++++----- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5c5f754..8ad4a78 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +2016-06-14: Changed default configuration setting for loadable extensions + on Mac OS X. Due to frequent installation issues the default + setting is now to turn off loadable extensions on that platform. + You will have to explicitly turn them on if you need them. + 2016-05-24: Fixed a bug finalizing user-defined functions for a database. Thanks to Mark Bradley for this patch! diff --git a/README.md b/README.md index 8bcb058..d5c08c4 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,10 @@ Undefined symbols for architecture ...: the environment variable `SQLITE3_DISABLE_LOADABLE_EXTENSIONS` if linking problems persist. + * Due to frequent installation issues with loadable extensions on Mac OS X, + the default there is to disable them. You will have to explicitly enable + them on that platform. + Credits ------- @@ -85,4 +89,4 @@ page](https://github.com/mmottl/sqlite3-ocaml). Enjoy! -Markus Mottl on January 5, 2015 +Markus Mottl on June 14, 2016 diff --git a/_oasis b/_oasis index 67c5100..069b19b 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: sqlite3 -Version: 4.0.4 +Version: 4.0.5 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, @@ -39,7 +39,7 @@ Flag brewcheck Flag loadable_extensions Description: Enable loadable extensions - Default: true + Default$: !system(macosx) Library sqlite3 Path: lib diff --git a/lib/META b/lib/META index 52ce354..72d353f 100644 --- a/lib/META +++ b/lib/META @@ -1,6 +1,6 @@ # OASIS_START -# DO NOT EDIT (digest: 56d9dac34e0e883dec973a08d6bbc316) -version = "4.0.4" +# DO NOT EDIT (digest: 27e63caeb52312bb42f7f0429c2aa1c1) +version = "4.0.5" description = "sqlite3-ocaml - SQLite3 bindings" archive(byte) = "sqlite3.cma" archive(byte, plugin) = "sqlite3.cma" diff --git a/setup.ml b/setup.ml index 4335c1d..32b63ed 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: adb1168acc22486a161b56bf620f5f4c) *) +(* DO NOT EDIT (digest: 82597847a62e7f7a1d2c41f18cb7e689) *) (* Regenerated by OASIS v0.4.6 Visit http://oasis.forge.ocamlcore.org for more information and @@ -7004,7 +7004,7 @@ let setup_t = alpha_features = []; beta_features = []; name = "sqlite3"; - version = "4.0.4"; + version = "4.0.5"; license = OASISLicense.DEP5License (OASISLicense.DEP5Unit @@ -7104,7 +7104,13 @@ let setup_t = }, { flag_description = Some "Enable loadable extensions"; - flag_default = [(OASISExpr.EBool true, true)] + flag_default = + [ + (OASISExpr.EBool true, false); + (OASISExpr.ENot + (OASISExpr.ETest ("system", "macosx")), + true) + ] }); Library ({ @@ -7585,7 +7591,7 @@ let setup_t = }; oasis_fn = Some "_oasis"; oasis_version = "0.4.6"; - oasis_digest = Some "\005\003ÝËæôX\142R.\156urµÝý"; + oasis_digest = Some "4 \003\004\002R\199\b\205\137\0040\173\141\003\202"; oasis_exec = None; oasis_setup_args = []; setup_update = false @@ -7593,6 +7599,6 @@ let setup_t = let setup () = BaseSetup.setup setup_t;; -# 7597 "setup.ml" +# 7603 "setup.ml" (* OASIS_STOP *) let () = setup ();;