[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-3-19-g4c79f00
Stephane Glondu
steph at glondu.net
Mon Jul 11 19:32:26 UTC 2011
The following commit has been merged in the master branch:
commit 6e43908cfbaa63a7866e8390d8a26d65672bc42a
Author: Stephane Glondu <steph at glondu.net>
Date: Thu Jul 7 09:16:51 2011 +0200
Remove obsolete patches
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
deleted file mode 100644
index 325fd55..0000000
--- a/debian/patches/0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
---
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2fe48e8..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Add-dynlink.cma-to-the-linking-command-of-the-byteco.patch
--
cduce packaging
More information about the Pkg-ocaml-maint-commits
mailing list