[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-1-5-gb0d08fd

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8d807375ca5993864bf90f88808e7e459f9b6773
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Mar 24 20:40:05 2009 +0100

    Add a patch to fix FTBFS of bytecode version

diff --git a/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch b/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
new file mode 100644
index 0000000..572d14c
--- /dev/null
+++ b/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
@@ -0,0 +1,28 @@
+From cf2a4e373fbe0b85059da10bcdde42f3ab9d7c7b Mon Sep 17 00:00:00 2001
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 24 Mar 2009 20:13:56 +0100
+Subject: [PATCH] Add dynlink.cma to the linking command of the bytecode version
+
+In OCaml 3.11.0, dynlink.cma is no longer embedded in camlp4lib.cma,
+and must be explicitly linked (see upstream PR#4568). This fixes build
+failure of the bytecode version.
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index eec1f51..10ba683 100644
+--- a/Makefile
++++ b/Makefile
+@@ -83,7 +83,7 @@ else
+   EXTENSION_LIB = cma
+   COMPILE = $(CAMLC)
+   CAML=ocamlc
+-  LINK = $(CAMLC) -custom -linkpkg camlp4lib.cma
++  LINK = $(CAMLC) -custom -linkpkg dynlink.cma camlp4lib.cma
+   SYNTAX += -symbol ocaml_compiler=\"bytecode\"
+ endif
+ 
+-- 
+1.6.2
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2fe48e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch

-- 
cduce packaging