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

Romain Beauxis toots at rastageeks.org
Mon Jan 11 23:06:21 UTC 2010


The following commit has been merged in the master branch:
commit f6654c156514ecbe61c525e646dffe6be3b8eabd
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Jan 11 17:11:33 2010 -0600

    Run ranlib on threads static libs

diff --git a/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
new file mode 100644
index 0000000..a59be5b
--- /dev/null
+++ b/debian/patches/mingw32-ocaml-run-ranlib-on-threads.patch
@@ -0,0 +1,19 @@
+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 16:40:06.000000000 -0600
++++ build-tree/ocaml-3.11.1/otherlibs/systhreads/Makefile.nt	2010-01-11 17:09:35.000000000 -0600
+@@ -78,12 +78,14 @@
+ install:
+ 	cp dllthreads.dll $(STUBLIBDIR)/dllthreads.dll
+ 	cp libthreads.$(A) $(LIBDIR)/libthreads.$(A)
++	cd $(LIBDIR); $(RANLIB) libthreads.$(A)
+ 	mkdir -p $(LIBDIR)/threads
+ 	cp $(CMIFILES) threads.cma $(LIBDIR)/threads
+ 	rm -f $(LIBDIR)/threads/stdlib.cma
+ 
+ installopt:
+ 	cp libthreadsnat.$(A) $(LIBDIR)/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/series b/debian/patches/series
index 15902d0..6ef71cc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ mingw32-ocaml-filename-win32-dirsep.patch
 mingw32-ocaml-no-stdlib-dir.patch
 mingw32-ocaml-fix-opt-link-opts.patch
 mingw32-ocaml-fix-ocamlrun-path.patch
+mingw32-ocaml-run-ranlib-on-threads.patch

-- 
mingw32-ocaml packaging



More information about the Pkg-ocaml-maint-commits mailing list