[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.2+debian4-3-g1663de2
Romain Beauxis
toots at rastageeks.org
Wed Aug 11 21:42:05 UTC 2010
The following commit has been merged in the master branch:
commit dfa894c4ff87601c4f335a8ebee08fbc6b0fd9e5
Author: Romain Beauxis <toots at rastageeks.org>
Date: Wed Aug 11 16:34:44 2010 -0500
Prepared 3.12.0+debian1
diff --git a/debian/changelog b/debian/changelog
index fae5a8e..964a18c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mingw32-ocaml (3.12.0+debian1) unstable; urgency=low
+
+ * Updated package to 3.12.0.
+ * Bumped standards-version to 3.9.1
+ * New build and install camlp4.
+
+ -- Romain Beauxis <toots at rastageeks.org> Tue, 10 Aug 2010 21:55:52 -0500
+
mingw32-ocaml (3.12.0~beta1+debian1) unstable; urgency=low
* Updated package to 3.12.0+beta1
diff --git a/debian/control b/debian/control
index 02f6c3f..825b9b4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders: Romain Beauxis <toots at rastageeks.org>
Build-Depends: cdbs, debhelper (>= 7), quilt, mingw32, gcc-multilib [amd64 kfreebsd-amd64],
ocaml-nox, camlp4, m4
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mingw32-ocaml.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mingw32-ocaml.git
diff --git a/debian/mingw32-ocaml.lintian-overrides b/debian/mingw32-ocaml.lintian-overrides
index d3e543d..37c57b7 100644
--- a/debian/mingw32-ocaml.lintian-overrides
+++ b/debian/mingw32-ocaml.lintian-overrides
@@ -6,10 +6,33 @@ mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamldep (#
mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlmklib (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlopt (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlprof (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
-mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/addlabels (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/camlheader (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/extract_crc (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
-mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/lib/ocaml/scrapelabels (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: wrong-path-for-interpreter ./usr/i586-mingw32msvc/bin/ocamlobjinfo (#!/usr/i586-mingw32msvc/bin/ocamlrun != /usr/bin/ocamlrun)
+mingw32-ocaml: executable-not-elf-or-script ./usr/i586-mingw32msvc/bin/camlp4o
+mingw32-ocaml: executable-not-elf-or-script ./usr/i586-mingw32msvc/bin/mkcamlp4
+mingw32-ocaml: executable-not-elf-or-script ./usr/i586-mingw32msvc/bin/camlp4r
+mingw32-ocaml: executable-not-elf-or-script ./usr/i586-mingw32msvc/bin/camlp4
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/camlp4
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/camlp4o
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/camlp4r
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/mkcamlp4
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlobjinfo
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/caml/socketaddr.h
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/caml/threads.h
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/labltk/META
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libcamlstr.a
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/objinfo_helper
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/outcometree.cmi
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/outcometree.mli
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllcamlstr.dll
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/topdirs.cmi
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/topdirs.mli
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/toploop.cmi
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/toploop.mli
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/topmain.cmi
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/topmain.mli
+mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/topstart.cmo
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlrun
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlc
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlcp
@@ -18,7 +41,6 @@ mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlmklib
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlmktop
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlopt
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/bin/ocamlprof
-mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/addlabels
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/arg.cmi
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/arg.cmx
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/arg.ml
@@ -177,7 +199,6 @@ mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libbigarray.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libcamlrun.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libgraphics.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libnums.a
-mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libstr.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libthreads.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libthreadsnat.a
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/libunix.a
@@ -271,7 +292,6 @@ mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/scanf.cmx
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/scanf.ml
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/scanf.mli
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/scanf.p.cmx
-mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/scrapelabels
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/set.cmi
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/set.cmx
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/set.ml
@@ -330,7 +350,6 @@ mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stringLabels.p
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllbigarray.dll
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllgraphics.dll
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllnums.dll
-mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllstr.dll
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllthreads.dll
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/stublibs/dllunix.dll
mingw32-ocaml: file-in-unusual-dir usr/i586-mingw32msvc/lib/ocaml/sys.cmi
diff --git a/debian/patches/hardcode_mingw32_include.patch b/debian/patches/hardcode_mingw32_include.patch
index 951bf18..ccd0cec 100644
--- a/debian/patches/hardcode_mingw32_include.patch
+++ b/debian/patches/hardcode_mingw32_include.patch
@@ -1,7 +1,7 @@
Index: build-tree/ocaml-3.11.1/utils/clflags.ml
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/utils/clflags.ml 2010-01-07 04:00:11.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/utils/clflags.ml 2010-01-07 04:00:24.000000000 +0100
+--- build-tree.orig/ocaml-3.12.0/utils/clflags.ml 2010-01-07 04:00:11.000000000 +0100
++++ build-tree/ocaml-3.12.0/utils/clflags.ml 2010-01-07 04:00:24.000000000 +0100
@@ -20,7 +20,7 @@
let compile_only = ref false (* -c *)
@@ -11,8 +11,8 @@ 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.12.0+beta1/tools/ocamlmklib.mlp 2010-02-22 20:15:57.000000000 -0600
-+++ build-tree/ocaml-3.12.0+beta1/tools/ocamlmklib.mlp 2010-02-22 20:16:20.000000000 -0600
+--- build-tree.orig/ocaml-3.12.0/tools/ocamlmklib.mlp 2010-02-22 20:15:57.000000000 -0600
++++ build-tree/ocaml-3.12.0/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 *)
diff --git a/debian/patches/mingw32-ocaml-combined-Makefile.patch b/debian/patches/mingw32-ocaml-combined-Makefile.patch
index 49f2f97..1eea7d8 100644
--- a/debian/patches/mingw32-ocaml-combined-Makefile.patch
+++ b/debian/patches/mingw32-ocaml-combined-Makefile.patch
@@ -4,10 +4,10 @@ combine all objects into one Makefile, and make sure the source is
defended by #ifdef/#ifndef WIN32 ... #endif, around the whole files as
necessary.
-Index: build-tree/ocaml-3.12.0+beta1/asmrun/Makefile
+Index: build-tree/ocaml-3.12.0/asmrun/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/asmrun/Makefile 2010-06-23 19:37:52.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/asmrun/Makefile 2010-06-23 19:39:37.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/asmrun/Makefile 2010-06-23 19:37:52.000000000 +0200
++++ build-tree/ocaml-3.12.0/asmrun/Makefile 2010-06-23 19:39:37.000000000 +0200
@@ -26,7 +26,7 @@
misc.o freelist.o major_gc.o minor_gc.o memory.o alloc.o compare.o ints.o \
floats.o str.o array.o io.o extern.o intern.o hash.o sys.o parsing.o \
@@ -35,10 +35,10 @@ Index: build-tree/ocaml-3.12.0+beta1/asmrun/Makefile
dynlink.c signals.c debugger.c
clean::
-Index: build-tree/ocaml-3.12.0+beta1/byterun/Makefile.common
+Index: build-tree/ocaml-3.12.0/byterun/Makefile.common
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/Makefile.common 2010-06-23 19:37:51.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/byterun/Makefile.common 2010-06-23 19:39:37.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/byterun/Makefile.common 2010-06-23 19:37:51.000000000 +0200
++++ build-tree/ocaml-3.12.0/byterun/Makefile.common 2010-06-23 19:39:37.000000000 +0200
@@ -24,7 +24,7 @@
compare.o ints.o floats.o str.o array.o io.o extern.o intern.o \
hash.o sys.o meta.o parsing.o gc_ctrl.o terminfo.o md5.o obj.o \
@@ -48,10 +48,10 @@ Index: build-tree/ocaml-3.12.0+beta1/byterun/Makefile.common
PRIMS=\
alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
-Index: build-tree/ocaml-3.12.0+beta1/byterun/unix.c
+Index: build-tree/ocaml-3.12.0/byterun/unix.c
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/unix.c 2010-06-23 19:37:51.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/byterun/unix.c 2010-06-23 19:39:37.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/byterun/unix.c 2010-06-23 19:37:51.000000000 +0200
++++ build-tree/ocaml-3.12.0/byterun/unix.c 2010-06-23 19:39:37.000000000 +0200
@@ -15,6 +15,8 @@
/* Unix-specific stuff */
@@ -67,10 +67,10 @@ Index: build-tree/ocaml-3.12.0+beta1/byterun/unix.c
#endif
+
+#endif /* !WIN32 */
-Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
+Index: build-tree/ocaml-3.12.0/byterun/win32.c
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/win32.c 2010-06-23 19:37:52.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/byterun/win32.c 2010-06-23 19:39:37.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/byterun/win32.c 2010-06-23 19:37:52.000000000 +0200
++++ build-tree/ocaml-3.12.0/byterun/win32.c 2010-06-23 19:39:37.000000000 +0200
@@ -13,6 +13,8 @@
/* $Id: win32.c 9547 2010-01-22 12:48:24Z doligez $ */
@@ -86,10 +86,10 @@ Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
}
+
+#endif /* WIN32 */
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile 2010-06-23 19:37:52.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile 2010-06-23 19:43:39.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/Makefile 2010-06-23 19:37:52.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile 2010-06-23 19:43:39.000000000 +0200
@@ -20,8 +20,8 @@
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
COMPFLAGS=-warn-error A -g
diff --git a/debian/patches/mingw32-ocaml-disable-cmxs.patch b/debian/patches/mingw32-ocaml-disable-cmxs.patch
index f6b2b75..7c1a831 100644
--- a/debian/patches/mingw32-ocaml-disable-cmxs.patch
+++ b/debian/patches/mingw32-ocaml-disable-cmxs.patch
@@ -1,10 +1,10 @@
I couldn't get *.cmxs files to build in the cross-compiler. This
patch disables them.
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/Makefile.shared
+Index: build-tree/ocaml-3.12.0/otherlibs/Makefile.shared
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/Makefile.shared 2008-07-15 10:31:32.000000000 -0500
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/Makefile.shared 2010-02-10 16:15:41.000000000 -0600
+--- build-tree.orig/ocaml-3.12.0/otherlibs/Makefile.shared 2008-07-15 10:31:32.000000000 -0500
++++ build-tree/ocaml-3.12.0/otherlibs/Makefile.shared 2010-02-10 16:15:41.000000000 -0600
@@ -42,7 +42,8 @@
all: lib$(CLIBNAME).$(A) $(LIBNAME).cma $(CMIFILES)
diff --git a/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch b/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
index 578dd38..ca743c6 100644
--- a/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
+++ b/debian/patches/mingw32-ocaml-filename-win32-dirsep.patch
@@ -3,10 +3,10 @@ the default OCaml this has the negative effect of causing it to
use '\' character in paths. Since it's really running on a Linux
kernel, that won't work. This is a quick and dirty fix.
-Index: build-tree/ocaml-3.12.0+beta1/stdlib/filename.ml
+Index: build-tree/ocaml-3.12.0/stdlib/filename.ml
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/stdlib/filename.ml 2010-01-20 17:26:46.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/stdlib/filename.ml 2010-06-23 19:30:22.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/stdlib/filename.ml 2010-01-20 17:26:46.000000000 +0100
++++ build-tree/ocaml-3.12.0/stdlib/filename.ml 2010-06-23 19:30:22.000000000 +0200
@@ -68,7 +68,7 @@
module Win32 = struct
let current_dir_name = "."
diff --git a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
index 4483940..068689e 100644
--- a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
+++ b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
@@ -1,7 +1,7 @@
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:37.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:37.000000000 +0200
@@ -35,7 +35,7 @@
allopt: lib$(LIBNAME).$(A) $(LIBNAME).cmxa $(LIBNAME).cmxs $(CMIFILES)
diff --git a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
index ab81ab6..33397a1 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.12.0+beta1/otherlibs/win32unix/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/win32unix/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/win32unix/Makefile.nt 2010-05-20 11:40:41.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/win32unix/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/win32unix/Makefile.nt 2010-05-20 11:40:41.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/win32unix/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
@@ -40,7 +40,7 @@
COBJS=$(ALL_FILES:.c=.$(O))
CAMLOBJS=unix.cmo unixLabels.cmo
@@ -11,10 +11,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/win32unix/Makefile.nt
EXTRACAMLFLAGS=-nolabels
EXTRACFLAGS=-I../unix
HEADERS=unixsupport.h socketaddr.h
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/str/Makefile
+Index: build-tree/ocaml-3.12.0/otherlibs/str/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/str/Makefile 2010-01-22 13:48:24.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/str/Makefile 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/str/Makefile 2010-01-22 13:48:24.000000000 +0100
++++ build-tree/ocaml-3.12.0/otherlibs/str/Makefile 2010-06-23 19:30:30.000000000 +0200
@@ -20,6 +20,7 @@
COBJS=strstubs.$(O)
CLIBNAME=camlstr
@@ -23,10 +23,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/str/Makefile
include ../Makefile
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/num/Makefile
+Index: build-tree/ocaml-3.12.0/otherlibs/num/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/num/Makefile 2010-02-09 15:17:20.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/num/Makefile 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/num/Makefile 2010-02-09 15:17:20.000000000 +0100
++++ build-tree/ocaml-3.12.0/otherlibs/num/Makefile 2010-06-23 19:30:30.000000000 +0200
@@ -21,6 +21,7 @@
ratio.cmo num.cmo arith_status.cmo
CMIFILES=big_int.cmi nat.cmi num.cmi ratio.cmi arith_status.cmi
@@ -35,10 +35,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/num/Makefile
include ../Makefile
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/win32graph/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/win32graph/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/win32graph/Makefile.nt 2007-11-06 16:16:56.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/win32graph/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/win32graph/Makefile.nt 2007-11-06 16:16:56.000000000 +0100
++++ build-tree/ocaml-3.12.0/otherlibs/win32graph/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
@@ -18,7 +18,7 @@
CAMLOBJS=graphics.cmo
WIN32LIBS=$(call SYSLIB,kernel32) $(call SYSLIB,gdi32) $(call SYSLIB,user32)
@@ -48,10 +48,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/win32graph/Makefile.nt
include ../Makefile.nt
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/bigarray/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile.nt 2008-01-04 16:01:48.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/bigarray/Makefile.nt 2008-01-04 16:01:48.000000000 +0100
++++ build-tree/ocaml-3.12.0/otherlibs/bigarray/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
@@ -19,6 +19,7 @@
COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
CAMLOBJS=bigarray.cmo
@@ -60,10 +60,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile.nt
include ../Makefile.nt
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-04-27 09:55:08.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-04-27 09:55:08.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:30.000000000 +0200
@@ -21,6 +21,7 @@
COMPFLAGS=-warn-error A -g
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/debian/patches/mingw32-ocaml-force-os-type.patch b/debian/patches/mingw32-ocaml-force-os-type.patch
index 12114ef..273b6a7 100644
--- a/debian/patches/mingw32-ocaml-force-os-type.patch
+++ b/debian/patches/mingw32-ocaml-force-os-type.patch
@@ -2,10 +2,10 @@ 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.12.0+beta1/utils/config.mlp
+Index: build-tree/ocaml-3.12.0/utils/config.mlp
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/utils/config.mlp 2010-05-19 13:29:38.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/utils/config.mlp 2010-06-23 19:32:00.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/utils/config.mlp 2010-05-19 13:29:38.000000000 +0200
++++ build-tree/ocaml-3.12.0/utils/config.mlp 2010-06-23 19:32:00.000000000 +0200
@@ -83,11 +83,7 @@
let ext_lib = "%%EXT_LIB%%"
let ext_dll = "%%EXT_DLL%%"
diff --git a/debian/patches/mingw32-ocaml-i386-profiling.patch b/debian/patches/mingw32-ocaml-i386-profiling.patch
index e67aceb..5b1223f 100644
--- a/debian/patches/mingw32-ocaml-i386-profiling.patch
+++ b/debian/patches/mingw32-ocaml-i386-profiling.patch
@@ -1,10 +1,10 @@
Make sure that PROFILE_* macros are defined on MinGW. Not sure
what to put in them yet, so at the moment they are just empty.
-Index: build-tree/ocaml-3.12.0+beta1/asmrun/i386.S
+Index: build-tree/ocaml-3.12.0/asmrun/i386.S
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/asmrun/i386.S 2008-08-01 03:04:57.000000000 -0500
-+++ build-tree/ocaml-3.12.0+beta1/asmrun/i386.S 2010-02-10 16:15:41.000000000 -0600
+--- build-tree.orig/ocaml-3.12.0/asmrun/i386.S 2008-08-01 03:04:57.000000000 -0500
++++ build-tree/ocaml-3.12.0/asmrun/i386.S 2010-02-10 16:15:41.000000000 -0600
@@ -64,6 +64,9 @@
popl %edx; popl %ecx; popl %eax; popl %ebp
#define PROFILE_C \
diff --git a/debian/patches/mingw32-ocaml-no-stdlib-dir.patch b/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
index 6e42705..35ac76d 100644
--- a/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
+++ b/debian/patches/mingw32-ocaml-no-stdlib-dir.patch
@@ -2,10 +2,10 @@ Not sure if this is right, but OCAML_STDLIB_DIR can be undefined
in our cross-compiler. It's only used in a one place in the C
code so this works around it.
-Index: build-tree/ocaml-3.12.0+beta1/byterun/dynlink.c
+Index: build-tree/ocaml-3.12.0/byterun/dynlink.c
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/dynlink.c 2010-01-22 13:48:24.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/byterun/dynlink.c 2010-06-23 19:30:27.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/byterun/dynlink.c 2010-01-22 13:48:24.000000000 +0100
++++ build-tree/ocaml-3.12.0/byterun/dynlink.c 2010-06-23 19:30:27.000000000 +0200
@@ -80,7 +80,12 @@
stdlib = getenv("OCAMLLIB");
diff --git a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
index f25f63c..978be6a 100644
--- a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
+++ b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
@@ -1,7 +1,7 @@
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:37.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt 2010-06-23 19:31:50.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-06-23 19:30:37.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile.nt 2010-06-23 19:31:50.000000000 +0200
@@ -72,6 +72,7 @@
install:
cp dllthreads.dll $(STUBLIBDIR)/dllthreads.dll
diff --git a/debian/patches/mingw32-ocaml-win32-compat.patch b/debian/patches/mingw32-ocaml-win32-compat.patch
index 8690051..6fb7e0a 100644
--- a/debian/patches/mingw32-ocaml-win32-compat.patch
+++ b/debian/patches/mingw32-ocaml-win32-compat.patch
@@ -1,12 +1,8 @@
-Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
+Index: build-tree/ocaml-3.12.0/byterun/win32.c
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/win32.c 2010-06-24 01:17:25.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/byterun/win32.c 2010-06-24 01:17:32.000000000 +0200
-@@ -34,9 +34,30 @@
- #include "osdeps.h"
- #include "signals.h"
- #include "sys.h"
-+#include "compatibility.h"
+--- build-tree.orig/ocaml-3.12.0/byterun/win32.c 2010-08-11 11:16:55.000000000 -0500
++++ build-tree/ocaml-3.12.0/byterun/win32.c 2010-08-11 11:17:30.000000000 -0500
+@@ -37,6 +37,26 @@
#include "flexdll.h"
@@ -33,10 +29,28 @@ Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
#ifndef S_ISREG
#define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
#endif
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/st_win32.h
+@@ -95,7 +115,7 @@
+ pathlen = strlen(name) + 1;
+ if (pathlen < 256) pathlen = 256;
+ while (1) {
+- fullname = stat_alloc(pathlen);
++ fullname = caml_stat_alloc(pathlen);
+ retcode = SearchPath(NULL, /* use system search path */
+ name,
+ ".exe", /* add .exe extension if needed */
+@@ -109,7 +129,7 @@
+ break;
+ }
+ if (retcode < pathlen) break;
+- stat_free(fullname);
++ caml_stat_free(fullname);
+ pathlen = retcode + 1;
+ }
+ return fullname;
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/st_win32.h
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/st_win32.h 2010-06-24 01:17:43.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/st_win32.h 2010-06-24 01:18:34.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/st_win32.h 2010-08-11 11:16:55.000000000 -0500
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/st_win32.h 2010-08-11 11:17:07.000000000 -0500
@@ -16,7 +16,7 @@
/* Win32 implementation of the "st" interface */
diff --git a/debian/patches/mingw32-ocaml-win32-fixes.patch b/debian/patches/mingw32-ocaml-win32-fixes.patch
index 13aae0f..d5f5b62 100644
--- a/debian/patches/mingw32-ocaml-win32-fixes.patch
+++ b/debian/patches/mingw32-ocaml-win32-fixes.patch
@@ -1,9 +1,9 @@
Misc fixes for byterun/win32.c
-Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
+Index: build-tree/ocaml-3.12.0/byterun/win32.c
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/byterun/win32.c 2008-04-22 07:24:10.000000000 -0500
-+++ build-tree/ocaml-3.12.0+beta1/byterun/win32.c 2010-02-10 16:16:17.000000000 -0600
+--- build-tree.orig/ocaml-3.12.0/byterun/win32.c 2008-04-22 07:24:10.000000000 -0500
++++ build-tree/ocaml-3.12.0/byterun/win32.c 2010-02-10 16:16:17.000000000 -0600
@@ -18,7 +18,6 @@
#include <windows.h>
#include <stdlib.h>
diff --git a/debian/patches/mingw32-ocaml-win32unix-path.patch b/debian/patches/mingw32-ocaml-win32unix-path.patch
index bebcc3b..f07a45a 100644
--- a/debian/patches/mingw32-ocaml-win32unix-path.patch
+++ b/debian/patches/mingw32-ocaml-win32unix-path.patch
@@ -3,10 +3,10 @@ but really they depend on either the ("real") unix library or the
win32unix library. Include both, with win32unix first, on the basis
that this should pick up the correct one in all cases.
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile 2010-04-27 09:55:08.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile 2010-06-23 19:22:23.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/systhreads/Makefile 2010-04-27 09:55:08.000000000 +0200
++++ build-tree/ocaml-3.12.0/otherlibs/systhreads/Makefile 2010-06-23 19:22:23.000000000 +0200
@@ -15,8 +15,8 @@
include ../../config/Makefile
@@ -18,10 +18,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
COMPFLAGS=-warn-error A -g
-Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile
+Index: build-tree/ocaml-3.12.0/otherlibs/bigarray/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile 2008-01-04 10:52:27.000000000 +0100
-+++ build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile 2010-06-23 19:22:23.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/otherlibs/bigarray/Makefile 2008-01-04 10:52:27.000000000 +0100
++++ build-tree/ocaml-3.12.0/otherlibs/bigarray/Makefile 2010-06-23 19:22:23.000000000 +0200
@@ -14,8 +14,8 @@
# $Id: Makefile 8748 2008-01-04 09:52:27Z xleroy $
@@ -33,10 +33,10 @@ Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile
COBJS=bigarray_stubs.$(O) mmap_unix.$(O)
CAMLOBJS=bigarray.cmo
HEADERS=bigarray.h
-Index: build-tree/ocaml-3.12.0+beta1/myocamlbuild.ml
+Index: build-tree/ocaml-3.12.0/myocamlbuild.ml
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/myocamlbuild.ml 2010-06-08 11:50:56.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/myocamlbuild.ml 2010-06-23 19:22:23.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/myocamlbuild.ml 2010-06-08 11:50:56.000000000 +0200
++++ build-tree/ocaml-3.12.0/myocamlbuild.ml 2010-06-23 19:22:23.000000000 +0200
@@ -107,9 +107,11 @@
if mixed then ".."/dir else dir;;
@@ -52,10 +52,10 @@ Index: build-tree/ocaml-3.12.0+beta1/myocamlbuild.ml
let threads_dir = if_mixed_dir "otherlibs/threads";;
let systhreads_dir = if_mixed_dir "otherlibs/systhreads";;
-Index: build-tree/ocaml-3.12.0+beta1/ocamldoc/Makefile
+Index: build-tree/ocaml-3.12.0/ocamldoc/Makefile
===================================================================
---- build-tree.orig/ocaml-3.12.0+beta1/ocamldoc/Makefile 2009-05-20 13:52:42.000000000 +0200
-+++ build-tree/ocaml-3.12.0+beta1/ocamldoc/Makefile 2010-06-23 19:22:23.000000000 +0200
+--- build-tree.orig/ocaml-3.12.0/ocamldoc/Makefile 2009-05-20 13:52:42.000000000 +0200
++++ build-tree/ocaml-3.12.0/ocamldoc/Makefile 2010-06-23 19:22:23.000000000 +0200
@@ -62,6 +62,7 @@
INCLUDES_NODEP= -I $(OCAMLSRCDIR)/stdlib \
-I $(OCAMLSRCDIR)/otherlibs/str \
diff --git a/debian/rules b/debian/rules
index a76a19f..2ee667c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ DEB_TAR_SRCDIR := .
MINGW32_HOST := i586-mingw32msvc
FLEXDLL_DIR := flexdll
-OCAML_DIR := ocaml-3.12.0+beta1
+OCAML_DIR := ocaml-3.12.0
FINDLIB_DIR := findlib-1.2.5+debian
OTHER_LIBS := win32unix str num dynlink bigarray systhreads win32graph
INSTALL_PATH := $(CURDIR)/debian/mingw32-ocaml
@@ -99,6 +99,8 @@ stamp-build-mingw32-ocaml:
PATH=$(CURDIR)/$(DEB_BUILDDIR)/$(FLEXDLL_DIR):$(PATH) \
make -C otherlibs/$$i allopt; \
done
+ # Build camlp4
+ cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make camlp4opt
touch stamp-build-mingw32-ocaml
stamp-build-findlib:
@@ -150,6 +152,10 @@ $(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)/_build/camlp4/ && \
+ for i in mkcamlp4 camlp4o camlp4r camlp4; do \
+ install -m 0755 "$$i.native" "$(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/$$i"; \
+ done
cd $(DEB_BUILDDIR)/$(OCAML_DIR) && cp \
toplevel/topstart.cmo \
typing/outcometree.cmi typing/outcometree.mli \
@@ -158,7 +164,7 @@ $(INSTALL_PATH)/usr/$(MINGW32_HOST)/bin/ocamlopt:
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 \
+ for f in ocamlc ocamlcp ocamlrun ocamldep ocamlmklib ocamlmktop ocamlopt ocamlprof mkcamlp4 camlp4o camlp4r camlp4; do \
dh_link usr/$(MINGW32_HOST)/bin/$$f usr/bin/$(MINGW32_HOST)-$$f; \
done
diff --git a/ocaml-3.12.0+beta1.tar.gz b/ocaml-3.12.0+beta1.tar.gz
deleted file mode 100644
index 17bf2dd..0000000
Binary files a/ocaml-3.12.0+beta1.tar.gz and /dev/null differ
diff --git a/ocaml-3.12.0.tar.gz b/ocaml-3.12.0.tar.gz
new file mode 100644
index 0000000..713d4ff
Binary files /dev/null and b/ocaml-3.12.0.tar.gz differ
--
mingw32-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list