[Pkg-ocaml-maint-commits] [SCM] camlimages packaging branch, master, updated. debian/3.0.1-5-38-gd9a632e

[Stephane Glondu]

The following commit has been merged in the master branch:
commit bfd1e60245ed6798feec58ba34050cc83894347a
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 2 18:04:20 2011 +0200

    Add patch to fix building of mixed bytecode libraries

diff --git a/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch b/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch
new file mode 100644
index 0000000..6569d12
--- /dev/null
+++ b/debian/patches/0001-Add-missing-cclib-in-ocamlc-a.patch
@@ -0,0 +1,31 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Sat, 2 Jul 2011 17:56:41 +0200
+Subject: Add missing -cclib in ocamlc -a
+
+This allows simple linking with -custom by naming only .cma files
+(used by advi).
+
+Remark: runtime support libraries (dll*.so, lib*.a) and the OCaml
+archives (*.cma, *.cmxa) are built in an ad-hoc way using ocamlmklib,
+ocamlc -a and ocamlopt -a. It would be better (but more intrusive) to
+use only ocamlmklib.
+
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ src/OMakefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/OMakefile b/src/OMakefile
+index e198fa1..013164f 100644
+--- a/src/OMakefile
++++ b/src/OMakefile
+@@ -225,7 +225,7 @@ MakeLibOCaml(name) =
+     $(LIBRARY_PREFIX)_$(name).cma $(LIBRARY_PREFIX)_$(name).cmxa: $(MakeLibC $(name))
+     # OCAML_{BYTE,NATIVE}_LINK_FLAGS do not work for OCamlLibrary
+     # Bit dirty workaround
+-    OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name)
++    OCAMLCFLAGS+=-dllib -l$(LIBRARY_PREFIX)_$(name) -cclib -l$(LIBRARY_PREFIX)_$(name)
+     OCAMLOPTFLAGS+=-cclib -l$(LIBRARY_PREFIX)_$(name)
+     # use mapprefix instead of addprefix, otherwise "-cclib -lgif"
+     # is considered one option.
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f5e0dd5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-missing-cclib-in-ocamlc-a.patch

-- 
camlimages packaging