[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.1+debian1-2-gab8be57

[Romain Beauxis]

The following commit has been merged in the master branch:
commit ab8be570afca4406adcdfb956df34e9399090adf
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Jan 27 14:24:38 2010 -0600

    added a patch to display Win32 as the os_type when invoking ocamlc -config

diff --git a/debian/changelog b/debian/changelog
index cbe1940..4afd2f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ mingw32-ocaml (3.11.1+debian2) unstable; urgency=low
   * Added a patch to also remove all binary objects
     in byterun/ to force their recompilation.
   Thanks to Jerome Vouillon for reporting and fixing the issue. 
+  * Added a patch to display "Win32" as the os_type when invoking
+  ocaml{c,opt} -config
 
- -- Romain Beauxis <toots at rastageeks.org>  Sat, 16 Jan 2010 14:33:40 -0600
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 27 Jan 2010 14:21:29 -0600
 
 mingw32-ocaml (3.11.1+debian1) unstable; urgency=low
 
diff --git a/debian/patches/mingw32-ocaml-force-os-type.patch b/debian/patches/mingw32-ocaml-force-os-type.patch
new file mode 100644
index 0000000..9a4d3ef
--- /dev/null
+++ b/debian/patches/mingw32-ocaml-force-os-type.patch
@@ -0,0 +1,30 @@
+Displayed os_type when calling ocamlc -config is wrong.
+This patch forces the correct value without changing anything
+in the Sys module.
+
+Index: build-tree/ocaml-3.11.1/utils/config.mlp
+===================================================================
+--- build-tree.orig/ocaml-3.11.1/utils/config.mlp	2010-01-27 14:11:04.000000000 -0600
++++ build-tree/ocaml-3.11.1/utils/config.mlp	2010-01-27 14:12:17.000000000 -0600
+@@ -82,11 +82,7 @@
+ let ext_lib = "%%EXT_LIB%%"
+ let ext_dll = "%%EXT_DLL%%"
+ 
+-let default_executable_name =
+-  match Sys.os_type with
+-    "Unix" -> "a.out"
+-  | "Win32" | "Cygwin" -> "camlprog.exe"
+-  | _ -> "camlprog"
++let default_executable_name = "camlprog.exe"
+ 
+ let systhread_supported = %%SYSTHREAD_SUPPORT%%;;
+ 
+@@ -113,7 +109,7 @@
+   p "ext_asm" ext_asm;
+   p "ext_lib" ext_lib;
+   p "ext_dll" ext_dll;
+-  p "os_type" Sys.os_type;
++  p "os_type" "Win32";
+   p "default_executable_name" default_executable_name;
+   p_bool "systhread_supported" systhread_supported;
+   flush oc;
diff --git a/debian/patches/series b/debian/patches/series
index 6ef71cc..4c0ba39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ mingw32-ocaml-no-stdlib-dir.patch
 mingw32-ocaml-fix-opt-link-opts.patch
 mingw32-ocaml-fix-ocamlrun-path.patch
 mingw32-ocaml-run-ranlib-on-threads.patch
+mingw32-ocaml-force-os-type.patch

-- 
mingw32-ocaml packaging