[Pkg-ocaml-maint-commits] [SCM] ocaml-zarith packaging branch, master, updated. debian/1.0-1-3-g8010404

Mehdi Dogguy mehdi at debian.org
Wed Oct 5 07:19:33 UTC 2011


The following commit has been merged in the master branch:
commit b5837301c84cb24f4016d157972d055b911ddb1c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Oct 2 12:06:22 2011 +0200

    Make ocamlopt optional

diff --git a/debian/changelog b/debian/changelog
index 3d6a30d..1b7d13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-zarith (1.0-2) UNRELEASED; urgency=low
+
+  * Make ocamlopt's presence optional. This should prevent build failures
+    on bytecode only architectures.
+    - Add 0005-ocamlopt-is-not-really-required.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 02 Oct 2011 11:53:38 +0200
+
 ocaml-zarith (1.0-1) experimental; urgency=low
 
   * Initial release. (Closes: #643736)
diff --git a/debian/patches/0005-ocamlopt-is-not-really-required.patch b/debian/patches/0005-ocamlopt-is-not-really-required.patch
new file mode 100644
index 0000000..2bd1b4d
--- /dev/null
+++ b/debian/patches/0005-ocamlopt-is-not-really-required.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 2 Oct 2011 11:53:22 +0200
+Subject: [PATCH] ocamlopt is not really required
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index 5bd80d3..980aedd 100755
+--- a/configure
++++ b/configure
+@@ -186,7 +186,7 @@ checkcc()
+ 
+ searchbinreq $ocaml
+ searchbinreq $ocamlc
+-searchbinreq $ocamlopt
++searchbin    $ocamlopt
+ searchbinreq $ocamldep
+ searchbinreq $ocamlmklib
+ searchbinreq $ocamldoc
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index eb369c2..dedf398 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix-install-target.patch
 0003-Make-it-byte-arch-aware.patch
 0004-Disable-charset-when-calling-ocamldoc.patch
+0005-ocamlopt-is-not-really-required.patch

-- 
ocaml-zarith packaging



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