Skip to content

Commit

Permalink
Loadable extensions turned off by default on Mac OS X
Browse files Browse the repository at this point in the history
  • Loading branch information
mmottl committed Jun 14, 2016
1 parent b93aae8 commit f7a88df
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> for this patch!
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------

Expand All @@ -85,4 +89,4 @@ page](https://github.com/mmottl/sqlite3-ocaml).

Enjoy!

Markus Mottl on January 5, 2015
Markus Mottl on June 14, 2016
4 changes: 2 additions & 2 deletions _oasis
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -39,7 +39,7 @@ Flag brewcheck

Flag loadable_extensions
Description: Enable loadable extensions
Default: true
Default$: !system(macosx)

Library sqlite3
Path: lib
Expand Down
4 changes: 2 additions & 2 deletions lib/META
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
16 changes: 11 additions & 5 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
({
Expand Down Expand Up @@ -7585,14 +7591,14 @@ 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
};;

let setup () = BaseSetup.setup setup_t;;

# 7597 "setup.ml"
# 7603 "setup.ml"
(* OASIS_STOP *)
let () = setup ();;

0 comments on commit f7a88df

Please sign in to comment.