Add Dune package management compatibility patch for ocamlbuild

packages/ocamlbuild/ocamlbuild.0.15.0+ox/files/dune.patch

@@ -0,0 +1,116 @@
+diff --git a/examples/07-dependent-projects/libdemo b/examples/07-dependent-projects/libdemo
+deleted file mode 120000
+index ad0a385..0000000
+--- a/examples/07-dependent-projects/libdemo
++++ /dev/null
+@@ -1 +0,0 @@
+-../04-library/libdemo
+\ No newline at end of file
+diff --git a/examples/07-dependent-projects/libdemo/hello.ml b/examples/07-dependent-projects/libdemo/hello.ml
+new file mode 100644
+index 0000000..aa3c439
+--- /dev/null
++++ b/examples/07-dependent-projects/libdemo/hello.ml
+@@ -0,0 +1,4 @@
++
++let hello = "hello"
++
++
+diff --git a/examples/07-dependent-projects/libdemo/hello.mli b/examples/07-dependent-projects/libdemo/hello.mli
+new file mode 100644
+index 0000000..2f327fd
+--- /dev/null
++++ b/examples/07-dependent-projects/libdemo/hello.mli
+@@ -0,0 +1,2 @@
++
++val hello: string
+diff --git a/examples/07-dependent-projects/libdemo/libdemo.mllib b/examples/07-dependent-projects/libdemo/libdemo.mllib
+new file mode 100644
+index 0000000..2bb9220
+--- /dev/null
++++ b/examples/07-dependent-projects/libdemo/libdemo.mllib
+@@ -0,0 +1,5 @@
++
++Hello
++Util
++
++
+diff --git a/examples/07-dependent-projects/libdemo/util.ml b/examples/07-dependent-projects/libdemo/util.ml
+new file mode 100644
+index 0000000..206518a
+--- /dev/null
++++ b/examples/07-dependent-projects/libdemo/util.ml
+@@ -0,0 +1,8 @@
++
++let rec join = function
++    | []      -> ""
++    | [x]     -> x
++    | [x;y]   -> x ^ " and " ^ y
++    | x::xs   -> x ^ ", "    ^ join xs
++
++
+diff --git a/examples/07-dependent-projects/libdemo/util.mli b/examples/07-dependent-projects/libdemo/util.mli
+new file mode 100644
+index 0000000..582eec7
+--- /dev/null
++++ b/examples/07-dependent-projects/libdemo/util.mli
+@@ -0,0 +1,4 @@
++
++(** join strings together using command and "and" for the last element *)
++val join: string list -> string
++
+diff --git a/src/ocamlbuild_where.ml b/src/ocamlbuild_where.ml
+index 506c5b0..417adce 100644
+--- a/src/ocamlbuild_where.ml
++++ b/src/ocamlbuild_where.ml
+@@ -14,6 +14,19 @@
+ module O = Ocamlbuild_config;;
+
+ let bindir = ref O.bindir;;
++
++(* Check if a directory contains a file that libdir is expected to contain. *)
++let libdir_contains_ocamlbuild_library libdir =
++  Sys.file_exists (Filename.concat libdir "ocamlbuild.cma") ||
++    Sys.file_exists (Filename.concat libdir "ocamlbuild.cmx")
++
++(* Try to guess the libdir from the current exe's location. *)
++let guess_libdir_from_executable_name () =
++  let guessed_bin_dir = Filename.dirname Sys.executable_name in
++  Filename.concat
++    (Filename.concat (Filename.dirname guessed_bin_dir) "lib")
++    "ocamlbuild"
++
+ let libdir = ref begin
+   let root, suffix =
+     let ocaml_lib_len = String.length O.ocaml_libdir + 1 in
+@@ -46,5 +59,29 @@ let libdir = ref begin
+         Sys.getenv "OCAMLLIB", Filename.concat subroot "ocamlbuild"
+       with Not_found -> O.libdir, "ocamlbuild"
+   in
+-  Filename.concat root suffix
++  let libdir = Filename.concat root suffix in
++  if libdir_contains_ocamlbuild_library libdir then
++    libdir
++  else
++    (* The libdir doesn't contain the ocamlbuild library. Maybe the ocamlbuild
++       installation has been moved to a new location after installation. Try to
++       guess the libdir from the current exe's path. *)
++    let guessed_libdir = guess_libdir_from_executable_name () in
++    if libdir_contains_ocamlbuild_library guessed_libdir then (
++      Printf.eprintf "Warning: The library directory where ocamlbuild was \
++        originally installed (%s) either no longer exists, or does not contain \
++        a copy of the ocamlbuild library. Guessing that the correct library \
++        directory is %s because a copy of the ocamlbuild library exists at that \
++        location, and because it is located at the expected path relative to \
++        the current ocamlbuild executable. This can happen if ocamlbuild's \
++        files are moved from the location where they were originally \
++        installed."
++        libdir
++        guessed_libdir;
++      guessed_libdir)
++    else
++      (* The guessed path also doesn't contain the ocamlbuild library, so just
++         return the original libdir to help the user debug the error which will
++         likely result. *)
++      libdir
+ end;;