Skip to content

Commit f7a88df

Browse files
committed
Loadable extensions turned off by default on Mac OS X
1 parent b93aae8 commit f7a88df

File tree

5 files changed

+25
-10
lines changed

5 files changed

+25
-10
lines changed

CHANGES.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2016-06-14: Changed default configuration setting for loadable extensions
2+
on Mac OS X. Due to frequent installation issues the default
3+
setting is now to turn off loadable extensions on that platform.
4+
You will have to explicitly turn them on if you need them.
5+
16
2016-05-24: Fixed a bug finalizing user-defined functions for a database.
27

38
Thanks to Mark Bradley <[email protected]> for this patch!

README.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ Undefined symbols for architecture ...:
5959
the environment variable `SQLITE3_DISABLE_LOADABLE_EXTENSIONS` if linking
6060
problems persist.
6161

62+
* Due to frequent installation issues with loadable extensions on Mac OS X,
63+
the default there is to disable them. You will have to explicitly enable
64+
them on that platform.
65+
6266
Credits
6367
-------
6468

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

8690
Enjoy!
8791

88-
Markus Mottl on January 5, 2015
92+
Markus Mottl on June 14, 2016

_oasis

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
OASISFormat: 0.4
22
Name: sqlite3
3-
Version: 4.0.4
3+
Version: 4.0.5
44
Synopsis: sqlite3-ocaml - SQLite3 bindings
55
Description: sqlite3-ocaml is an OCaml library with bindings to the
66
SQLite3 client API. Sqlite3 is a self-contained, serverless,
@@ -39,7 +39,7 @@ Flag brewcheck
3939

4040
Flag loadable_extensions
4141
Description: Enable loadable extensions
42-
Default: true
42+
Default$: !system(macosx)
4343

4444
Library sqlite3
4545
Path: lib

lib/META

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OASIS_START
2-
# DO NOT EDIT (digest: 56d9dac34e0e883dec973a08d6bbc316)
3-
version = "4.0.4"
2+
# DO NOT EDIT (digest: 27e63caeb52312bb42f7f0429c2aa1c1)
3+
version = "4.0.5"
44
description = "sqlite3-ocaml - SQLite3 bindings"
55
archive(byte) = "sqlite3.cma"
66
archive(byte, plugin) = "sqlite3.cma"

setup.ml

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(* setup.ml generated for the first time by OASIS v0.3.0 *)
22

33
(* OASIS_START *)
4-
(* DO NOT EDIT (digest: adb1168acc22486a161b56bf620f5f4c) *)
4+
(* DO NOT EDIT (digest: 82597847a62e7f7a1d2c41f18cb7e689) *)
55
(*
66
Regenerated by OASIS v0.4.6
77
Visit http://oasis.forge.ocamlcore.org for more information and
@@ -7004,7 +7004,7 @@ let setup_t =
70047004
alpha_features = [];
70057005
beta_features = [];
70067006
name = "sqlite3";
7007-
version = "4.0.4";
7007+
version = "4.0.5";
70087008
license =
70097009
OASISLicense.DEP5License
70107010
(OASISLicense.DEP5Unit
@@ -7104,7 +7104,13 @@ let setup_t =
71047104
},
71057105
{
71067106
flag_description = Some "Enable loadable extensions";
7107-
flag_default = [(OASISExpr.EBool true, true)]
7107+
flag_default =
7108+
[
7109+
(OASISExpr.EBool true, false);
7110+
(OASISExpr.ENot
7111+
(OASISExpr.ETest ("system", "macosx")),
7112+
true)
7113+
]
71087114
});
71097115
Library
71107116
({
@@ -7585,14 +7591,14 @@ let setup_t =
75857591
};
75867592
oasis_fn = Some "_oasis";
75877593
oasis_version = "0.4.6";
7588-
oasis_digest = Some "\005\003ÝËæôX\142R.\156urµÝý";
7594+
oasis_digest = Some "4 \003\004\002R\199\b\205\137\0040\173\141\003\202";
75897595
oasis_exec = None;
75907596
oasis_setup_args = [];
75917597
setup_update = false
75927598
};;
75937599

75947600
let setup () = BaseSetup.setup setup_t;;
75957601

7596-
# 7597 "setup.ml"
7602+
# 7603 "setup.ml"
75977603
(* OASIS_STOP *)
75987604
let () = setup ();;

0 commit comments

Comments
 (0)