[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:41:59 UTC 2010
The following commit has been merged in the master branch:
commit ed39c4d5f313ad60b2e7a4374c888dfbe8f17c8f
Author: Romain Beauxis <toots at rastageeks.org>
Date: Thu Jun 24 01:31:54 2010 +0200
Updated package to ocaml 3.12.0+beta1..
diff --git a/debian/Makefile-mingw32.in b/debian/Makefile-mingw32.in
index 6968b7b..9348e91 100644
--- a/debian/Makefile-mingw32.in
+++ b/debian/Makefile-mingw32.in
@@ -25,6 +25,7 @@ EXE=
SUPPORTS_SHARED_LIBRARIES=true
SHAREDCCCOMPOPTS=
MKSHAREDLIBRPATH=
+NATDYNLINK=true
NATDYNLINKOPTS=
SYSLIB=-l$(1)
#ml let syslib x = "-l"^x;;
diff --git a/debian/changelog b/debian/changelog
index bfbe1dc..fae5a8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mingw32-ocaml (3.12.0~beta1+debian1) unstable; urgency=low
+
+ * Updated package to 3.12.0+beta1
+
+ -- Romain Beauxis <toots at rastageeks.org> Thu, 24 Jun 2010 01:20:13 +0200
+
mingw32-ocaml (3.11.2+debian4) unstable; urgency=low
* Added a patch to hardcode linker's options
diff --git a/debian/patches/hardcode_mingw32_include.patch b/debian/patches/hardcode_mingw32_include.patch
index 5b8098e..951bf18 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.11.2/utils/clflags.ml 2010-01-07 04:00:11.000000000 +0100
-+++ build-tree/ocaml-3.11.2/utils/clflags.ml 2010-01-07 04:00:24.000000000 +0100
+--- 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
@@ -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.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
+--- 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
@@ -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 a8d3ff0..49f2f97 100644
--- a/debian/patches/mingw32-ocaml-combined-Makefile.patch
+++ b/debian/patches/mingw32-ocaml-combined-Makefile.patch
@@ -4,16 +4,16 @@ 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.11.2/asmrun/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/asmrun/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/asmrun/Makefile 2007-11-15 07:21:15.000000000 -0600
-+++ build-tree/ocaml-3.11.2/asmrun/Makefile 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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 \
gc_ctrl.o terminfo.o md5.o obj.o lexing.o printexc.o callback.o weak.o \
-- compact.o finalise.o custom.o unix.o backtrace.o natdynlink.o
-+ compact.o finalise.o custom.o unix.o win32.o backtrace.o natdynlink.o
+- compact.o finalise.o custom.o unix.o backtrace.o natdynlink.o debugger.o
++ compact.o finalise.o custom.o unix.o win32.o backtrace.o natdynlink.o debugger.o
ASMOBJS=$(ARCH).o
@@ -26,19 +26,19 @@ Index: build-tree/ocaml-3.11.2/asmrun/Makefile
dynlink.c: ../byterun/dynlink.c
ln -s ../byterun/dynlink.c dynlink.c
signals.c: ../byterun/signals.c
-@@ -146,7 +148,7 @@
+@@ -148,7 +150,7 @@
LINKEDFILES=misc.c freelist.c major_gc.c minor_gc.c memory.c alloc.c array.c \
compare.c ints.c floats.c str.c io.c extern.c intern.c hash.c sys.c \
parsing.c gc_ctrl.c terminfo.c md5.c obj.c lexing.c printexc.c callback.c \
- weak.c compact.c finalise.c meta.c custom.c main.c globroots.c unix.c \
+ weak.c compact.c finalise.c meta.c custom.c main.c globroots.c unix.c win32.c \
- dynlink.c signals.c
+ dynlink.c signals.c debugger.c
clean::
-Index: build-tree/ocaml-3.11.2/byterun/Makefile.common
+Index: build-tree/ocaml-3.12.0+beta1/byterun/Makefile.common
===================================================================
---- build-tree.orig/ocaml-3.11.2/byterun/Makefile.common 2009-05-25 07:25:25.000000000 -0500
-+++ build-tree/ocaml-3.11.2/byterun/Makefile.common 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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.11.2/byterun/Makefile.common
PRIMS=\
alloc.c array.c compare.c extern.c floats.c gc_ctrl.c hash.c \
-Index: build-tree/ocaml-3.11.2/byterun/unix.c
+Index: build-tree/ocaml-3.12.0+beta1/byterun/unix.c
===================================================================
---- build-tree.orig/ocaml-3.11.2/byterun/unix.c 2008-12-03 06:39:44.000000000 -0600
-+++ build-tree/ocaml-3.11.2/byterun/unix.c 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -15,6 +15,8 @@
/* Unix-specific stuff */
@@ -67,101 +67,63 @@ Index: build-tree/ocaml-3.11.2/byterun/unix.c
#endif
+
+#endif /* !WIN32 */
-Index: build-tree/ocaml-3.11.2/byterun/win32.c
+Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
===================================================================
---- build-tree.orig/ocaml-3.11.2/byterun/win32.c 2010-02-10 16:15:41.000000000 -0600
-+++ build-tree/ocaml-3.11.2/byterun/win32.c 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -13,6 +13,8 @@
- /* $Id: win32.c 8873 2008-04-22 12:24:10Z frisch $ */
+ /* $Id: win32.c 9547 2010-01-22 12:48:24Z doligez $ */
+#ifdef WIN32
+
/* Win32-specific stuff */
#include <windows.h>
-@@ -562,3 +564,5 @@
+@@ -543,3 +545,5 @@
seed ^= GetCurrentProcessId();
return seed;
}
+
+#endif /* WIN32 */
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile 2010-02-10 16:15:41.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -20,8 +20,8 @@
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
COMPFLAGS=-warn-error A -g
--BYTECODE_C_OBJS=posix_b.o
--NATIVECODE_C_OBJS=posix_n.o
-+BYTECODE_C_OBJS=posix_b.o win32_b.o
-+NATIVECODE_C_OBJS=posix_n.o win32_n.o
+-BYTECODE_C_OBJS=st_stubs_b.o
+-NATIVECODE_C_OBJS=st_stubs_n.o
++BYTECODE_C_OBJS=st_stubs_b.o win32_b.o
++NATIVECODE_C_OBJS=st_stubs_n.o win32_n.o
THREAD_OBJS= thread.cmo mutex.cmo condition.cmo event.cmo threadUnix.cmo
-@@ -39,6 +39,10 @@
- -c posix.c
- mv posix.o posix_b.o
+@@ -37,6 +37,10 @@
+ -c st_stubs.c
+ mv st_stubs.o st_stubs_b.o
-+win32_b.$(O): win32.c
-+ $(BYTECC) -I ../../byterun $(BYTECCCOMPOPTS) $(CFLAGS) -c win32.c
-+ mv win32.$(O) win32_b.$(O)
++win32_b.$(O): st_stubs.c st_win32.h
++ $(BYTECC) -I ../../byterun $(BYTECCCOMPOPTS) $(CFLAGS) -c st_stubs.c
++ mv st_stubs.$(O) win32_b.$(O)
+
# Dynamic linking with -lpthread is risky on many platforms, so
# do not create a shared object for libthreadsnat.
libthreadsnat.a: $(NATIVECODE_C_OBJS)
-@@ -48,9 +52,13 @@
- $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c posix.c
- mv posix.o posix_n.o
+@@ -46,9 +50,13 @@
+ $(NATIVECC) -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) $(SHAREDCCCOMPOPTS) -DNATIVE_CODE -DTARGET_$(ARCH) -DSYS_$(SYSTEM) -c st_stubs.c
+ mv st_stubs.o st_stubs_n.o
-+win32_n.$(O): win32.c
-+ $(NATIVECC) -DNATIVE_CODE -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -c win32.c
-+ mv win32.$(O) win32_n.$(O)
++win32_n.$(O): st_stubs.c st_win32.h
++ $(NATIVECC) -DNATIVE_CODE -O -I../../asmrun -I../../byterun $(NATIVECCCOMPOPTS) -c st_stubs.c
++ mv st_stubs.$(O) win32_n.$(O)
+
threads.cma: $(THREAD_OBJS)
$(MKLIB) -ocamlc '$(CAMLC)' -o threads $(THREAD_OBJS) \
-- -cclib -lunix $(PTHREAD_LINK)
-+ -cclib -lunix $(PTHREAD_LINK) -lcamlrun
+- -cclib -lunix $(PTHREAD_LINK)
++ -cclib -lunix $(PTHREAD_LINK) -lcamlrun
# See remark above: force static linking of libthreadsnat.a
threads.cmxa: $(THREAD_OBJS:.cmo=.cmx)
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/posix.c
-===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/posix.c 2009-03-28 12:35:59.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/posix.c 2010-02-10 16:15:41.000000000 -0600
-@@ -13,6 +13,8 @@
-
- /* $Id: posix.c 9201 2009-03-28 17:35:59Z xleroy $ */
-
-+#ifndef WIN32
-+
- /* Thread interface for POSIX 1003.1c threads */
-
- #include <errno.h>
-@@ -928,3 +930,4 @@
- raise_sys_error(str);
- }
-
-+#endif /* !WIN32 */
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/win32.c
-===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/win32.c 2007-10-31 04:12:29.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/win32.c 2010-02-10 16:15:41.000000000 -0600
-@@ -13,6 +13,8 @@
-
- /* $Id: win32.c 8468 2007-10-31 09:12:29Z xleroy $ */
-
-+#ifdef WIN32
-+
- /* Thread interface for Win32 threads */
-
- #include <windows.h>
-@@ -662,3 +664,6 @@
- sprintf(errmsg, "%s: error code %lx", msg, GetLastError());
- raise_sys_error(copy_string(errmsg));
- }
-+
-+#endif /* WIN32 */
-+
diff --git a/debian/patches/mingw32-ocaml-disable-cmxs.patch b/debian/patches/mingw32-ocaml-disable-cmxs.patch
index d8257f0..f6b2b75 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.11.2/otherlibs/Makefile.shared
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/Makefile.shared
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/Makefile.shared 2008-07-15 10:31:32.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/Makefile.shared 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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 899e34c..578dd38 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.11.2/stdlib/filename.ml
+Index: build-tree/ocaml-3.12.0+beta1/stdlib/filename.ml
===================================================================
---- build-tree.orig/ocaml-3.11.2/stdlib/filename.ml 2009-09-16 09:24:11.000000000 -0500
-+++ build-tree/ocaml-3.11.2/stdlib/filename.ml 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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 4234af7..4483940 100644
--- a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
+++ b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
@@ -1,8 +1,8 @@
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2010-02-10 16:15:42.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2010-02-10 16:16:06.000000000 -0600
-@@ -37,7 +37,7 @@
+--- 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
+@@ -35,7 +35,7 @@
allopt: lib$(LIBNAME).$(A) $(LIBNAME).cmxa $(LIBNAME).cmxs $(CMIFILES)
$(LIBNAME).cma: $(CAMLOBJS)
@@ -11,7 +11,7 @@ Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
lib$(LIBNAME).$(A): $(COBJS)
$(MKLIB) -o $(LIBNAME) $(COBJS) $(LDOPTS)
-@@ -49,7 +49,7 @@
+@@ -47,7 +47,7 @@
$(LIBNAME).cmxa: $(CAMLOBJS:.cmo=.cmx)
diff --git a/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch b/debian/patches/mingw32-ocaml-fix-opt-link-opts.patch
index 2110bab..ab81ab6 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.2/otherlibs/win32unix/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/win32unix/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt 2008-07-29 03:31:41.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -40,7 +40,7 @@
COBJS=$(ALL_FILES:.c=.$(O))
CAMLOBJS=unix.cmo unixLabels.cmo
@@ -10,23 +10,23 @@ Index: build-tree/ocaml-3.11.2/otherlibs/win32unix/Makefile.nt
+LDOPTS=-L/usr/i586-mingw32msvc/lib -ldopt $(WSOCKLIB)
EXTRACAMLFLAGS=-nolabels
EXTRACFLAGS=-I../unix
- HEADERS=unixsupport.h
-Index: build-tree/ocaml-3.11.2/otherlibs/str/Makefile
+ HEADERS=unixsupport.h socketaddr.h
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/str/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/str/Makefile 2007-11-06 09:16:56.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/str/Makefile 2010-02-10 16:15:41.000000000 -0600
-@@ -19,6 +19,7 @@
- LIBNAME=str
+--- 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
+@@ -20,6 +20,7 @@
COBJS=strstubs.$(O)
+ CLIBNAME=camlstr
CAMLOBJS=str.cmo
+LDOPTS=-L/usr/i586-mingw32msvc/lib
include ../Makefile
-Index: build-tree/ocaml-3.11.2/otherlibs/num/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/num/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/num/Makefile 2008-09-10 11:10:43.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/num/Makefile 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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.11.2/otherlibs/num/Makefile
include ../Makefile
-Index: build-tree/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/win32graph/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt 2007-11-06 09:16:56.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/win32graph/Makefile.nt 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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.11.2/otherlibs/win32graph/Makefile.nt
include ../Makefile.nt
-Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt 2008-01-04 09:01:48.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -19,6 +19,7 @@
COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
CAMLOBJS=bigarray.cmo
@@ -60,10 +60,10 @@ Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile.nt
include ../Makefile.nt
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2007-11-06 09:16:56.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2010-02-10 16:16:08.000000000 -0600
+--- 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
@@ -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 c3f33eb..12114ef 100644
--- a/debian/patches/mingw32-ocaml-force-os-type.patch
+++ b/debian/patches/mingw32-ocaml-force-os-type.patch
@@ -2,11 +2,11 @@ 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.2/utils/config.mlp
+Index: build-tree/ocaml-3.12.0+beta1/utils/config.mlp
===================================================================
---- build-tree.orig/ocaml-3.11.2/utils/config.mlp 2009-05-18 04:38:16.000000000 -0500
-+++ build-tree/ocaml-3.11.2/utils/config.mlp 2010-02-10 16:15:42.000000000 -0600
-@@ -82,11 +82,7 @@
+--- 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
+@@ -83,11 +83,7 @@
let ext_lib = "%%EXT_LIB%%"
let ext_dll = "%%EXT_DLL%%"
@@ -19,7 +19,7 @@ Index: build-tree/ocaml-3.11.2/utils/config.mlp
let systhread_supported = %%SYSTHREAD_SUPPORT%%;;
-@@ -113,7 +109,7 @@
+@@ -114,7 +110,7 @@
p "ext_asm" ext_asm;
p "ext_lib" ext_lib;
p "ext_dll" ext_dll;
diff --git a/debian/patches/mingw32-ocaml-i386-profiling.patch b/debian/patches/mingw32-ocaml-i386-profiling.patch
index 85abaab..e67aceb 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.11.2/asmrun/i386.S
+Index: build-tree/ocaml-3.12.0+beta1/asmrun/i386.S
===================================================================
---- build-tree.orig/ocaml-3.11.2/asmrun/i386.S 2008-08-01 03:04:57.000000000 -0500
-+++ build-tree/ocaml-3.11.2/asmrun/i386.S 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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 b0a1721..6e42705 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.11.2/byterun/dynlink.c
+Index: build-tree/ocaml-3.12.0+beta1/byterun/dynlink.c
===================================================================
---- build-tree.orig/ocaml-3.11.2/byterun/dynlink.c 2008-04-22 07:24:10.000000000 -0500
-+++ build-tree/ocaml-3.11.2/byterun/dynlink.c 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -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 77627f4..f25f63c 100644
--- a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
+++ b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
@@ -1,8 +1,8 @@
-Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2010-02-10 16:15:42.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt 2010-02-10 16:15:42.000000000 -0600
-@@ -78,12 +78,14 @@
+--- 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
+@@ -72,6 +72,7 @@
install:
cp dllthreads.dll $(STUBLIBDIR)/dllthreads.dll
cp libthreads.$(A) $(LIBDIR)/libthreads.$(A)
@@ -10,10 +10,11 @@ Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile.nt
mkdir -p $(LIBDIR)/threads
cp $(CMIFILES) threads.cma $(LIBDIR)/threads
rm -f $(LIBDIR)/threads/stdlib.cma
+@@ -79,6 +80,7 @@
installopt:
cp libthreadsnat.$(A) $(LIBDIR)/libthreadsnat.$(A)
-+ cd $(LIBDIR); $(RANLIB) libthreadsnat.$(A)
++ cd $(LIBDIR); $(RANLIB) libthreadsnat.$(A)
cp $(THREAD_OBJS:.cmo=.cmx) threads.cmxa threads.$(A) $(LIBDIR)/threads
cp threads.cmxs $(LIBDIR)/threads
diff --git a/debian/patches/mingw32-ocaml-win32-compat.patch b/debian/patches/mingw32-ocaml-win32-compat.patch
new file mode 100644
index 0000000..8690051
--- /dev/null
+++ b/debian/patches/mingw32-ocaml-win32-compat.patch
@@ -0,0 +1,48 @@
+Index: build-tree/ocaml-3.12.0+beta1/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"
+
+ #include "flexdll.h"
+
++/* XXX including <io.h> gets ../byterun/io.h for some reason.
++ * Including the real io.h using the full path fails because of
++ * some strange bug in the system header file itself. Give up and
++ * just define _finddata_t explicitly here.
++ */
++#ifndef _FSIZE_T_DEFINED
++typedef unsigned long _fsize_t;
++#define _FSIZE_T_DEFINED
++
++struct _finddata_t
++{
++ unsigned attrib;
++ time_t time_create;
++ time_t time_access;
++ time_t time_write;
++ _fsize_t size;
++ char name[FILENAME_MAX];
++};
++#endif
++
+ #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
+===================================================================
+--- 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
+@@ -16,7 +16,7 @@
+ /* Win32 implementation of the "st" interface */
+
+ #include <windows.h>
+-#include <WinError.h>
++#include <winerror.h>
+ #include <stdio.h>
+ #include <signal.h>
+
diff --git a/debian/patches/mingw32-ocaml-win32-fixes.patch b/debian/patches/mingw32-ocaml-win32-fixes.patch
index 7c40bda..13aae0f 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.11.2/byterun/win32.c
+Index: build-tree/ocaml-3.12.0+beta1/byterun/win32.c
===================================================================
---- build-tree.orig/ocaml-3.11.2/byterun/win32.c 2008-04-22 07:24:10.000000000 -0500
-+++ build-tree/ocaml-3.11.2/byterun/win32.c 2010-02-10 16:16:17.000000000 -0600
+--- 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
@@ -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 7180e26..bebcc3b 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.11.2/otherlibs/systhreads/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/systhreads/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/systhreads/Makefile 2008-07-15 10:31:32.000000000 -0500
-+++ build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile 2010-02-10 16:16:17.000000000 -0600
+--- 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
@@ -15,8 +15,8 @@
include ../../config/Makefile
@@ -18,10 +18,10 @@ Index: build-tree/ocaml-3.11.2/otherlibs/systhreads/Makefile
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
COMPFLAGS=-warn-error A -g
-Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/otherlibs/bigarray/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/otherlibs/bigarray/Makefile 2008-01-04 03:52:27.000000000 -0600
-+++ build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -14,8 +14,8 @@
# $Id: Makefile 8748 2008-01-04 09:52:27Z xleroy $
@@ -33,11 +33,11 @@ Index: build-tree/ocaml-3.11.2/otherlibs/bigarray/Makefile
COBJS=bigarray_stubs.$(O) mmap_unix.$(O)
CAMLOBJS=bigarray.cmo
HEADERS=bigarray.h
-Index: build-tree/ocaml-3.11.2/myocamlbuild.ml
+Index: build-tree/ocaml-3.12.0+beta1/myocamlbuild.ml
===================================================================
---- build-tree.orig/ocaml-3.11.2/myocamlbuild.ml 2010-01-15 07:36:23.000000000 -0600
-+++ build-tree/ocaml-3.11.2/myocamlbuild.ml 2010-02-10 16:15:41.000000000 -0600
-@@ -116,9 +116,11 @@
+--- 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
+@@ -107,9 +107,11 @@
if mixed then ".."/dir else dir;;
let unix_dir =
@@ -52,10 +52,10 @@ Index: build-tree/ocaml-3.11.2/myocamlbuild.ml
let threads_dir = if_mixed_dir "otherlibs/threads";;
let systhreads_dir = if_mixed_dir "otherlibs/systhreads";;
-Index: build-tree/ocaml-3.11.2/ocamldoc/Makefile
+Index: build-tree/ocaml-3.12.0+beta1/ocamldoc/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.2/ocamldoc/Makefile 2009-04-09 08:56:38.000000000 -0500
-+++ build-tree/ocaml-3.11.2/ocamldoc/Makefile 2010-02-10 16:15:41.000000000 -0600
+--- 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
@@ -62,6 +62,7 @@
INCLUDES_NODEP= -I $(OCAMLSRCDIR)/stdlib \
-I $(OCAMLSRCDIR)/otherlibs/str \
diff --git a/debian/patches/series b/debian/patches/series
index 4c0ba39..55f67f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ flexdll-real-objdump.patch
flexdll-no-cygpath.patch
mingw32-ocaml-disable-cmxs.patch
mingw32-ocaml-i386-profiling.patch
-mingw32-ocaml-win32-fixes.patch
mingw32-ocaml-win32unix-path.patch
mingw32-ocaml-combined-Makefile.patch
mingw32-ocaml-filename-win32-dirsep.patch
@@ -13,3 +12,4 @@ 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-win32-compat.patch
diff --git a/debian/rules b/debian/rules
index 041083a..a76a19f 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.11.2
+OCAML_DIR := ocaml-3.12.0+beta1
FINDLIB_DIR := findlib-1.2.5+debian
OTHER_LIBS := win32unix str num dynlink bigarray systhreads win32graph
INSTALL_PATH := $(CURDIR)/debian/mingw32-ocaml
diff --git a/ocaml-3.11.2.tar.gz b/ocaml-3.11.2.tar.gz
deleted file mode 100644
index ce0562d..0000000
Binary files a/ocaml-3.11.2.tar.gz and /dev/null differ
diff --git a/ocaml-3.12.0+beta1.tar.gz b/ocaml-3.12.0+beta1.tar.gz
new file mode 100644
index 0000000..17bf2dd
Binary files /dev/null and b/ocaml-3.12.0+beta1.tar.gz differ
--
mingw32-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list