[Pkg-ocaml-maint-commits] [SCM] mingw32-ocaml packaging branch, master, updated. debian/3.11.2+debian3-2-g18106a6

Romain Beauxis toots at rastageeks.org
Tue Feb 23 23:35:37 UTC 2010


The following commit has been merged in the master branch:
commit 18106a67f28d696a9f1a9d8b1394dbf32940d3a0
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Tue Feb 23 17:23:52 2010 -0600

    Added another patch from Pierre Letouze

diff --git a/debian/Makefile-mingw32.in b/debian/Makefile-mingw32.in
index 3b938ff..6968b7b 100644
--- a/debian/Makefile-mingw32.in
+++ b/debian/Makefile-mingw32.in
@@ -23,15 +23,15 @@ BYTECCLIBS=
 BYTECCRPATH=
 EXE=
 SUPPORTS_SHARED_LIBRARIES=true
-SHAREDCCCOMPOPTS=-fPIC
+SHAREDCCCOMPOPTS=
 MKSHAREDLIBRPATH=
-NATDYNLINKOPTS=-Wl,-E
+NATDYNLINKOPTS=
 SYSLIB=-l$(1)
 #ml let syslib x = "-l"^x;;
 
 ### How to build a static library
 MKLIB=i586-mingw32msvc-ar rcs $(1) $(2)
-#ml let mklib out files opts = Printf.sprintf "ar rc %s %s %s; ranlib %s" out opts files out;;
+#ml let mklib out files opts = Printf.sprintf "i586-mingw32msvc-ar rcs %s %s %s" out opts files;;
 ARCH=i386
 MODEL=default
 SYSTEM=mingw
diff --git a/debian/changelog b/debian/changelog
index b5feeed..bfbe1dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mingw32-ocaml (3.11.2+debian4) unstable; urgency=low
 
   * Added a patch to hardcode linker's options
     for ocamlmklib.
+  * Modified custom Makefile to call the correct ranlib
+    and setup correct options for dynlink and shared object
+    compilation.
   * Added missing files to install target.
   Thanks to Pierre Letouzey for testing and reporting 
   these issues. 

-- 
mingw32-ocaml packaging



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