[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.2+debian2-2-g389d385

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 389d385df5745b39cc9229296d4ed53e3f0c94da
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Feb 22 20:29:57 2010 -0600

    Added fixes from Pierre Letouzey

diff --git a/debian/changelog b/debian/changelog
index c4d1a30..b5feeed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mingw32-ocaml (3.11.2+debian4) unstable; urgency=low
+
+  * Added a patch to hardcode linker's options
+    for ocamlmklib.
+  * Added missing files to install target.
+  Thanks to Pierre Letouzey for testing and reporting 
+  these issues. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 22 Feb 2010 20:24:08 -0600
+
 mingw32-ocaml (3.11.2+debian3) unstable; urgency=low
 
   * Fixed build-dep for kfreebsd-amd64. 
diff --git a/debian/patches/hardcode_mingw32_include.patch b/debian/patches/hardcode_mingw32_include.patch
index 07b77f3..5b8098e 100644
--- a/debian/patches/hardcode_mingw32_include.patch
+++ b/debian/patches/hardcode_mingw32_include.patch
@@ -11,3 +11,14 @@ Index: build-tree/ocaml-3.11.1/utils/clflags.ml
  and no_std_include = ref false          (* -nostdlib *)
  and print_types = ref false             (* -i *)
  and make_archive = ref false            (* -a *)
+--- build-tree.orig/ocaml-3.11.2/tools/ocamlmklib.mlp	2010-02-22 20:15:57.000000000 -0600
++++ build-tree/ocaml-3.11.2/tools/ocamlmklib.mlp	2010-02-22 20:16:20.000000000 -0600
+@@ -29,7 +29,7 @@
+ and failsafe = ref false    (* whether to fall back on static build only *)
+ and c_libs = ref []         (* libs to pass to mksharedlib and ocamlc -cclib *)
+ and c_opts = ref []      (* options to pass to mksharedlib and ocamlc -ccopt *)
+-and ld_opts = ref []        (* options to pass only to the linker *)
++and ld_opts = ref ["-I /usr/i586-mingw32msvc/lib"]        (* options to pass only to the linker *)
+ and ocamlc = ref (compiler_path "ocamlc")
+ and ocamlopt = ref (compiler_path "ocamlopt")
+ and output = ref "a"        (* Output name for Caml part of library *)
diff --git a/debian/rules b/debian/rules
index 893c6ca..041083a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -150,6 +150,13 @@ $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/ocamlopt:
 	                                        LIBDIR=$(INSTALL_PATH)/usr/$(MINGW32_HOST)/lib/ocaml \
 	                                        installopt
 	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && install -m 0755 ocamlc $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin
+	cd $(DEB_BUILDDIR)/$(OCAML_DIR) && cp \
+	  toplevel/topstart.cmo \
+	  typing/outcometree.cmi typing/outcometree.mli \
+	  toplevel/toploop.cmi toplevel/toploop.mli \
+	  toplevel/topdirs.cmi toplevel/topdirs.mli \
+ 	  toplevel/topmain.cmi toplevel/topmain.mli \
+	  $(INSTALL_PATH)/usr/$(MINGW32_HOST)/lib/ocaml
 	# Rename all the binaries to target-binary
 	for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof; do \
 	  dh_link usr/$(MINGW32_HOST)/bin/$$f usr/bin/$(MINGW32_HOST)-$$f; \

-- 
mingw32-ocaml packaging