Fix ctypes header location (#49)

The ctypes headers are installed in the ctypes package, not
ctypes.stubs. This has not mattered too much before but they are being
installed in a separate directory in ctypes.0.21.0. This patch ensures
that mariadb can build with old and new ctypes.

Author: emillon

_oasis

@@ -54,7 +54,7 @@ Library "mariadb_bindings"
   Modules:          Ffi_bindings
   ByteOpt:          -warn-error +1..45
   NativeOpt:        -warn-error +1..45
-  BuildDepends:     ctypes.stubs
+  BuildDepends:     ctypes,ctypes.stubs
 
 Executable "ffi_stubgen"
   Install:          false

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: fc4f1def45cd9de0092739442e8a8081)
+# DO NOT EDIT (digest: 95bb932199002f3267d7d5edf10f0fe6)
 # Ignore VCS directories, you can use the same kind of rule outside
 # OASIS_START/STOP if you want to exclude directories that contains
 # useless stuff for the build process
@@ -20,6 +20,7 @@ true: annot, bin_annot
 <bindings/*.ml{,i,y}>: oasis_library_mariadb_bindings_byte
 <bindings/mariadb_bindings.{cma,cmxa}>: oasis_library_mariadb_bindings_native
 <bindings/*.ml{,i,y}>: oasis_library_mariadb_bindings_native
+<bindings/*.ml{,i,y}>: package(ctypes)
 <bindings/*.ml{,i,y}>: package(ctypes.stubs)
 # Library mariadb
 "lib/mariadb.cmxs": use_mariadb
@@ -37,9 +38,11 @@ true: annot, bin_annot
 <lib/*.ml{,i,y}>: oasis_library_mariadb_native
 "lib/ffi_generated_stubs.c": oasis_library_mariadb_native
 <lib/mariadb.{cma,cmxa}>: use_libmariadb_stubs
+<lib/*.ml{,i,y}>: package(ctypes)
 <lib/*.ml{,i,y}>: package(ctypes.stubs)
 <lib/*.ml{,i,y}>: package(unix)
 <lib/*.ml{,i,y}>: use_mariadb_bindings
+"lib/ffi_generated_stubs.c": package(ctypes)
 "lib/ffi_generated_stubs.c": package(ctypes.stubs)
 "lib/ffi_generated_stubs.c": package(unix)
 "lib/ffi_generated_stubs.c": use_mariadb_bindings
@@ -48,22 +51,26 @@ true: annot, bin_annot
 <stubgen/*.ml{,i,y}>: oasis_executable_ffi_stubgen_byte
 "stubgen/ffi_stubgen.byte": oasis_executable_ffi_stubgen_native
 <stubgen/*.ml{,i,y}>: oasis_executable_ffi_stubgen_native
+"stubgen/ffi_stubgen.byte": package(ctypes)
 "stubgen/ffi_stubgen.byte": package(ctypes.stubs)
 "stubgen/ffi_stubgen.byte": use_mariadb_bindings
 # Executable ffi_types_stubgen
 "stubgen/ffi_types_stubgen.byte": oasis_executable_ffi_types_stubgen_byte
 <stubgen/*.ml{,i,y}>: oasis_executable_ffi_types_stubgen_byte
 "stubgen/ffi_types_stubgen.byte": oasis_executable_ffi_types_stubgen_native
 <stubgen/*.ml{,i,y}>: oasis_executable_ffi_types_stubgen_native
+"stubgen/ffi_types_stubgen.byte": package(ctypes)
 "stubgen/ffi_types_stubgen.byte": package(ctypes.stubs)
 "stubgen/ffi_types_stubgen.byte": use_mariadb_bindings
+<stubgen/*.ml{,i,y}>: package(ctypes)
 <stubgen/*.ml{,i,y}>: package(ctypes.stubs)
 <stubgen/*.ml{,i,y}>: use_mariadb_bindings
 # Executable nonblocking_select
 <examples/select/nonblocking_select_example.{native,byte}>: oasis_executable_nonblocking_select_byte
 <examples/select/*.ml{,i,y}>: oasis_executable_nonblocking_select_byte
 <examples/select/nonblocking_select_example.{native,byte}>: oasis_executable_nonblocking_select_native
 <examples/select/*.ml{,i,y}>: oasis_executable_nonblocking_select_native
+<examples/select/nonblocking_select_example.{native,byte}>: package(ctypes)
 <examples/select/nonblocking_select_example.{native,byte}>: package(ctypes.stubs)
 <examples/select/nonblocking_select_example.{native,byte}>: package(unix)
 <examples/select/nonblocking_select_example.{native,byte}>: use_mariadb
@@ -73,10 +80,12 @@ true: annot, bin_annot
 <examples/select/*.ml{,i,y}>: oasis_executable_nonblocking_select_stress_test_byte
 <examples/select/nonblocking_select_stress_test.{native,byte}>: oasis_executable_nonblocking_select_stress_test_native
 <examples/select/*.ml{,i,y}>: oasis_executable_nonblocking_select_stress_test_native
+<examples/select/nonblocking_select_stress_test.{native,byte}>: package(ctypes)
 <examples/select/nonblocking_select_stress_test.{native,byte}>: package(ctypes.stubs)
 <examples/select/nonblocking_select_stress_test.{native,byte}>: package(unix)
 <examples/select/nonblocking_select_stress_test.{native,byte}>: use_mariadb
 <examples/select/nonblocking_select_stress_test.{native,byte}>: use_mariadb_bindings
+<examples/select/*.ml{,i,y}>: package(ctypes)
 <examples/select/*.ml{,i,y}>: package(ctypes.stubs)
 <examples/select/*.ml{,i,y}>: package(unix)
 <examples/select/*.ml{,i,y}>: use_mariadb
@@ -86,6 +95,7 @@ true: annot, bin_annot
 <examples/lwt/*.ml{,i,y}>: oasis_executable_nonblocking_lwt_byte
 <examples/lwt/nonblocking_lwt_example.{native,byte}>: oasis_executable_nonblocking_lwt_native
 <examples/lwt/*.ml{,i,y}>: oasis_executable_nonblocking_lwt_native
+<examples/lwt/nonblocking_lwt_example.{native,byte}>: package(ctypes)
 <examples/lwt/nonblocking_lwt_example.{native,byte}>: package(ctypes.stubs)
 <examples/lwt/nonblocking_lwt_example.{native,byte}>: package(lwt)
 <examples/lwt/nonblocking_lwt_example.{native,byte}>: package(lwt.unix)
@@ -97,12 +107,14 @@ true: annot, bin_annot
 <examples/lwt/*.ml{,i,y}>: oasis_executable_nonblocking_lwt_stress_test_byte
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: oasis_executable_nonblocking_lwt_stress_test_native
 <examples/lwt/*.ml{,i,y}>: oasis_executable_nonblocking_lwt_stress_test_native
+<examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: package(ctypes)
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: package(ctypes.stubs)
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: package(lwt)
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: package(lwt.unix)
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: package(unix)
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: use_mariadb
 <examples/lwt/nonblocking_lwt_stress_test.{native,byte}>: use_mariadb_bindings
+<examples/lwt/*.ml{,i,y}>: package(ctypes)
 <examples/lwt/*.ml{,i,y}>: package(ctypes.stubs)
 <examples/lwt/*.ml{,i,y}>: package(lwt)
 <examples/lwt/*.ml{,i,y}>: package(lwt.unix)
@@ -115,6 +127,7 @@ true: annot, bin_annot
 <examples/async/nonblocking_async_example.{native,byte}>: oasis_executable_nonblocking_async_native
 <examples/async/*.ml{,i,y}>: oasis_executable_nonblocking_async_native
 <examples/async/nonblocking_async_example.{native,byte}>: package(async)
+<examples/async/nonblocking_async_example.{native,byte}>: package(ctypes)
 <examples/async/nonblocking_async_example.{native,byte}>: package(ctypes.stubs)
 <examples/async/nonblocking_async_example.{native,byte}>: package(threads)
 <examples/async/nonblocking_async_example.{native,byte}>: package(unix)
@@ -126,12 +139,14 @@ true: annot, bin_annot
 <examples/async/nonblocking_async_stress_test.{native,byte}>: oasis_executable_nonblocking_async_stress_test_native
 <examples/async/*.ml{,i,y}>: oasis_executable_nonblocking_async_stress_test_native
 <examples/async/nonblocking_async_stress_test.{native,byte}>: package(async)
+<examples/async/nonblocking_async_stress_test.{native,byte}>: package(ctypes)
 <examples/async/nonblocking_async_stress_test.{native,byte}>: package(ctypes.stubs)
 <examples/async/nonblocking_async_stress_test.{native,byte}>: package(threads)
 <examples/async/nonblocking_async_stress_test.{native,byte}>: package(unix)
 <examples/async/nonblocking_async_stress_test.{native,byte}>: use_mariadb
 <examples/async/nonblocking_async_stress_test.{native,byte}>: use_mariadb_bindings
 <examples/async/*.ml{,i,y}>: package(async)
+<examples/async/*.ml{,i,y}>: package(ctypes)
 <examples/async/*.ml{,i,y}>: package(ctypes.stubs)
 <examples/async/*.ml{,i,y}>: package(threads)
 <examples/async/*.ml{,i,y}>: package(unix)
@@ -142,6 +157,7 @@ true: annot, bin_annot
 <examples/blocking/*.ml{,i,y}>: oasis_executable_blocking_byte
 <examples/blocking/blocking_example.{native,byte}>: oasis_executable_blocking_native
 <examples/blocking/*.ml{,i,y}>: oasis_executable_blocking_native
+<examples/blocking/blocking_example.{native,byte}>: package(ctypes)
 <examples/blocking/blocking_example.{native,byte}>: package(ctypes.stubs)
 <examples/blocking/blocking_example.{native,byte}>: package(unix)
 <examples/blocking/blocking_example.{native,byte}>: use_mariadb
@@ -151,10 +167,12 @@ true: annot, bin_annot
 <examples/blocking/*.ml{,i,y}>: oasis_executable_blocking_stress_test_byte
 <examples/blocking/blocking_stress_test.{native,byte}>: oasis_executable_blocking_stress_test_native
 <examples/blocking/*.ml{,i,y}>: oasis_executable_blocking_stress_test_native
+<examples/blocking/blocking_stress_test.{native,byte}>: package(ctypes)
 <examples/blocking/blocking_stress_test.{native,byte}>: package(ctypes.stubs)
 <examples/blocking/blocking_stress_test.{native,byte}>: package(unix)
 <examples/blocking/blocking_stress_test.{native,byte}>: use_mariadb
 <examples/blocking/blocking_stress_test.{native,byte}>: use_mariadb_bindings
+<examples/blocking/*.ml{,i,y}>: package(ctypes)
 <examples/blocking/*.ml{,i,y}>: package(ctypes.stubs)
 <examples/blocking/*.ml{,i,y}>: package(unix)
 <examples/blocking/*.ml{,i,y}>: use_mariadb

bindings/META

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: b1c8f540e34aa763d77aa317840bf85d)
+# DO NOT EDIT (digest: 47cccea31efa35a55e6091b7e92cea5c)
 version = "1.1.6"
 description = "OCaml bindings for MariaDB"
-requires = "ctypes.stubs"
+requires = "ctypes ctypes.stubs"
 archive(byte) = "mariadb_bindings.cma"
 archive(byte, plugin) = "mariadb_bindings.cma"
 archive(native) = "mariadb_bindings.cmxa"

myocamlbuild.ml

@@ -1372,7 +1372,7 @@ let dispatch = function
          let env = BaseEnvLight.load () in
          let cc = BaseEnvLight.var_get "bytecomp_c_compiler" env in
          let stdlib = BaseEnvLight.var_get "standard_library" env in
-         let ctypes = BaseEnvLight.var_get "pkg_ctypes_stubs" env in
+         let ctypes = BaseEnvLight.var_get "pkg_ctypes" env in
          Cmd (S [Sh cc; A"stubgen/ffi_ml_types_stubgen.c";
                  A"-I"; P ctypes; A"-I"; P stdlib;
                  A"-o"; A stubgen_ml_types])

setup.ml

@@ -6,7 +6,7 @@ module Pervasives = Stdlib
 (* setup.ml generated for the first time by OASIS v0.4.6 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 356ce038ca5fafb6373fb62a81ec27da) *)
+(* DO NOT EDIT (digest: a07ab61f795ee78f9ec3214b3386e511) *)
 (*
    Regenerated by OASIS v0.4.11
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6962,7 +6962,10 @@ let setup_t =
                       bs_path = "bindings";
                       bs_compiled_object = Best;
                       bs_build_depends =
-                        [FindlibPackage ("ctypes.stubs", None)];
+                        [
+                           FindlibPackage ("ctypes", None);
+                           FindlibPackage ("ctypes.stubs", None)
+                        ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_interface_patterns =
                         [
@@ -8796,15 +8799,15 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.11";
-     oasis_digest = Some "\000YVj\173\139\003dq\148\197\224 (u\017";
+     oasis_digest = Some "\159\158\226N+zm\127\230\249\236xj\166\\\n";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 8803 "setup.ml"
+# 8806 "setup.ml"
 let setup_t = BaseCompat.Compat_0_4.adapt_setup_t setup_t
 open BaseCompat.Compat_0_4
 (* OASIS_STOP *)