[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. 5c46a737ede030402db23ec683543fbdb8ad14ea

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 831253398fd38d84bec587325edb222de2fbcad4
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Sat Jan 9 17:08:25 2010 +0100

    Build bigarray with win32 mmap implementation

diff --git a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
index 3993c09..40dd2e1 100644
--- a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
+++ b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
@@ -1,7 +1,7 @@
 Index: build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-07 03:58:53.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-07 04:00:05.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-09 16:58:29.000000000 +0100
++++ build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt	2010-01-09 17:02:24.000000000 +0100
 @@ -40,7 +40,7 @@
  COBJS=$(ALL_FILES:.c=.$(O))
  CAMLOBJS=unix.cmo unixLabels.cmo
@@ -13,8 +13,8 @@ Index: build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt
  HEADERS=unixsupport.h
 Index: build-tree/ocaml-3.11.1/otherlibs/str/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-07 03:58:53.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-07 04:00:05.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-09 16:58:29.000000000 +0100
++++ build-tree/ocaml-3.11.1/otherlibs/str/Makefile	2010-01-09 17:02:24.000000000 +0100
 @@ -19,6 +19,7 @@
  LIBNAME=str
  COBJS=strstubs.$(O)
@@ -23,22 +23,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/str/Makefile
  
  include ../Makefile
  
-Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile
-===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile	2010-01-07 03:58:53.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile	2010-01-07 04:00:05.000000000 +0100
-@@ -19,6 +19,7 @@
- COBJS=bigarray_stubs.$(O) mmap_unix.$(O)
- CAMLOBJS=bigarray.cmo
- HEADERS=bigarray.h
-+LDOPTS=-L/usr/i586-mingw32msvc/lib
- 
- include ../Makefile
- 
 Index: build-tree/ocaml-3.11.1/otherlibs/num/Makefile
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-07 03:58:53.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-07 04:00:05.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-09 16:58:29.000000000 +0100
++++ build-tree/ocaml-3.11.1/otherlibs/num/Makefile	2010-01-09 17:02:24.000000000 +0100
 @@ -21,6 +21,7 @@
    ratio.cmo num.cmo arith_status.cmo
  CMIFILES=big_int.cmi nat.cmi num.cmi ratio.cmi arith_status.cmi
@@ -49,8 +37,8 @@ Index: build-tree/ocaml-3.11.1/otherlibs/num/Makefile
  
 Index: build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt
 ===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-07 03:58:53.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-07 04:00:05.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-09 16:58:30.000000000 +0100
++++ build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt	2010-01-09 17:02:24.000000000 +0100
 @@ -18,7 +18,7 @@
  CAMLOBJS=graphics.cmo
  WIN32LIBS=$(call SYSLIB,kernel32) $(call SYSLIB,gdi32) $(call SYSLIB,user32)
@@ -60,3 +48,15 @@ Index: build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt
  
  include ../Makefile.nt
  
+Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt
+===================================================================
+--- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt	2010-01-09 16:58:29.000000000 +0100
++++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt	2010-01-09 17:02:24.000000000 +0100
+@@ -19,6 +19,7 @@
+ COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
+ CAMLOBJS=bigarray.cmo
+ HEADERS=bigarray.h
++LDOPTS=-L/usr/i586-mingw32msvc/lib
+ 
+ include ../Makefile.nt
+ 
diff --git a/debian/rules b/debian/rules
index b9de8ff..b9f5453 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,8 @@ stamp-prepare-cross-build:
 	# Windows, they only have the Makefile.nt files.  Just symlink
 	# Makefile -> Makefile.nt for these cases.
 	for d in $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/win32unix \
-	         $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/win32graph; do \
+	         $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/win32graph \
+		 $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/bigarray; do \
  	  ln -sf Makefile.nt $$d/Makefile; \
 	done
 	# Now clean the temporary files from the previous build.  This
@@ -106,6 +107,7 @@ stamp-build-findlib:
 build/mingw32-ocaml:: stamp-build-flexdll \
 		      stamp-build-ocamlcore \
 		      stamp-prepare-cross-build \
+		      stamp-build-mingw32-ocaml \
 		      $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/ocamlopt \
 		      stamp-build-findlib
 

-- 
mingw32-ocaml packaging