[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. b103e802aa223e37ad683b6a3119272c07749962
Romain Beauxis
toots at rastageeks.org
Tue Jan 12 20:24:00 UTC 2010
The following commit has been merged in the master branch:
commit b103e802aa223e37ad683b6a3119272c07749962
Author: Romain Beauxis <toots at rastageeks.org>
Date: Tue Jan 12 14:29:14 2010 -0600
More fixes..
diff --git a/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch b/debian/patches/mingw32-ocaml-fix-ocamlrun-path.patch
index c43f868..270620f 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.11.1/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-11 12:16:40.000000000 -0600
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-11 12:17:11.000000000 -0600
+--- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-12 12:25:56.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-12 12:26:48.000000000 -0600
@@ -37,7 +37,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 25b1736..9647b3b 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 2008-07-29 10:31:41.000000000 +0200
-+++ build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt 2010-01-09 17:37:19.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt 2010-01-12 12:25:29.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/win32unix/Makefile.nt 2010-01-12 12:25:39.000000000 -0600
@@ -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 2007-11-06 16:16:56.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/str/Makefile 2010-01-09 17:37:19.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/str/Makefile 2010-01-12 12:25:29.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/str/Makefile 2010-01-12 12:25:39.000000000 -0600
@@ -19,6 +19,7 @@
LIBNAME=str
COBJS=strstubs.$(O)
@@ -25,8 +25,8 @@ Index: build-tree/ocaml-3.11.1/otherlibs/str/Makefile
Index: build-tree/ocaml-3.11.1/otherlibs/num/Makefile
===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/num/Makefile 2008-09-10 18:10:43.000000000 +0200
-+++ build-tree/ocaml-3.11.1/otherlibs/num/Makefile 2010-01-09 17:37:19.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/num/Makefile 2010-01-12 12:25:29.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/num/Makefile 2010-01-12 12:25:39.000000000 -0600
@@ -21,6 +21,7 @@
ratio.cmo num.cmo arith_status.cmo
CMIFILES=big_int.cmi nat.cmi num.cmi ratio.cmi arith_status.cmi
@@ -37,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 2007-11-06 16:16:56.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt 2010-01-09 17:37:19.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt 2010-01-12 12:25:30.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt 2010-01-12 12:25:39.000000000 -0600
@@ -18,7 +18,7 @@
CAMLOBJS=graphics.cmo
WIN32LIBS=$(call SYSLIB,kernel32) $(call SYSLIB,gdi32) $(call SYSLIB,user32)
@@ -50,8 +50,8 @@ Index: build-tree/ocaml-3.11.1/otherlibs/win32graph/Makefile.nt
Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt 2008-01-04 16:01:48.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt 2010-01-09 17:37:19.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt 2010-01-12 12:25:30.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt 2010-01-12 12:25:39.000000000 -0600
@@ -19,6 +19,7 @@
COBJS=bigarray_stubs.$(O) mmap_win32.$(O)
CAMLOBJS=bigarray.cmo
@@ -60,25 +60,10 @@ Index: build-tree/ocaml-3.11.1/otherlibs/bigarray/Makefile.nt
include ../Makefile.nt
-Index: build-tree/ocaml-3.11.1/byterun/Makefile.nt
-===================================================================
---- build-tree.orig/ocaml-3.11.1/byterun/Makefile.nt 2010-01-09 17:38:28.000000000 +0100
-+++ build-tree/ocaml-3.11.1/byterun/Makefile.nt 2010-01-09 17:39:01.000000000 +0100
-@@ -18,8 +18,9 @@
- CFLAGS=-DOCAML_STDLIB_DIR='"$(LIBDIR)"' $(IFLEXDIR)
-
- DBGO=d.$(O)
--OBJS=$(COMMONOBJS:.o=.$(O)) win32.$(O) main.$(O)
-+OBJS=$(COMMONOBJS:.o=.$(O)) win32.$(O) main.$(O) prims.$(O)
- DOBJS=$(OBJS:.$(O)=.$(DBGO)) instrtrace.$(DBGO)
-+LDOPTS=-L/usr/i586-mingw32msvc/lib
-
- ocamlrun$(EXE): libcamlrun.$(A) prims.$(O)
- $(MKEXE) -o ocamlrun$(EXE) prims.$(O) $(call SYSLIB,ws2_32) $(EXTRALIBS) libcamlrun.$(A)
Index: build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt
===================================================================
---- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-09 17:43:55.000000000 +0100
-+++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-09 17:44:03.000000000 +0100
+--- build-tree.orig/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-12 12:25:48.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt 2010-01-12 12:25:56.000000000 -0600
@@ -21,6 +21,7 @@
COMPFLAGS=-warn-error A -g
MKLIB=../../boot/ocamlrun ../../tools/ocamlmklib
diff --git a/debian/rules b/debian/rules
index 938b573..caff338 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,12 @@ stamp-build-ocamlcore:
cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make coreboot
touch stamp-build-ocamlcore
-stamp-prepare-cross-build:
+stamp-patch-mingw32-include:
+ # Now patch utils/clflags.ml to hardcode mingw32-specific include.
+ patch -p0 < debian/hardcode_mingw32_include.patch
+ touch stamp-patch-mingw32-include
+
+stamp-prepare-cross-build: stamp-patch-mingw32-include
# Replace the compiler configuration (config/{s.h,m.h,Makefile})
# with ones as they would be on a 32 bit Windows system.
cp -f $(DEB_BUILDDIR)/$(OCAML_DIR)/config/m-nt.h $(DEB_BUILDDIR)/$(OCAML_DIR)/config/m.h
@@ -61,8 +66,7 @@ stamp-prepare-cross-build:
for d in $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/win32unix \
$(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/win32graph \
$(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/bigarray \
- $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/systhreads \
- $(DEB_BUILDDIR)/$(OCAML_DIR)/byterun; do \
+ $(DEB_BUILDDIR)/$(OCAML_DIR)/otherlibs/systhreads; do \
ln -sf Makefile.nt $$d/Makefile; \
done
# Now clean the temporary files from the previous build. This
@@ -70,8 +74,6 @@ stamp-prepare-cross-build:
# i386 versions, essentially causing ocamlopt to use the Win/i386 code
# generator.
cd $(DEB_BUILDDIR)/$(OCAML_DIR) && make partialclean
- # Now patch utils/clflags.ml to hardcode mingw32-specific include.
- patch -p0 < debian/hardcode_mingw32_include.patch
touch stamp-prepare-cross-build
stamp-build-mingw32-ocaml:
@@ -185,4 +187,5 @@ install/mingw32-ocaml::
clean::
rm -f *.cdbs-config_list stamp-build-flexdll stamp-build-ocamlcore \
- stamp-prepare-cross-build stamp-build-mingw32-ocaml stamp-build-findlib
+ stamp-prepare-cross-build stamp-build-mingw32-ocaml stamp-build-findlib \
+ stamp-patch-mingw32-include
--
mingw32-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list