[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.90+bzr356-1-14-ge84b1f8

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit d7d36c451b1a865ed6e1d382759aaf84de26a032
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue May 28 16:36:40 2013 +0200

    Add no-ocamlopt-arches.diff: work-around for partial upstream fix (see https://bugs.launchpad.net/ocamlbricks/+bug/1130098).

diff --git a/debian/patches/no-ocamlopt-arches.diff b/debian/patches/no-ocamlopt-arches.diff
new file mode 100644
index 0000000..254c51a
--- /dev/null
+++ b/debian/patches/no-ocamlopt-arches.diff
@@ -0,0 +1,30 @@
+Description: build on non-ocamlopt architectures
+Author: Lucas Nussbaum <lucas at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: vendor
+Bug: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
+Forwarded: https://bugs.launchpad.net/ocamlbricks/+bug/1130098
+Last-Update: 2013-05-28
+
+--- ocamlbricks-0.90+bzr364.3.orig/Makefile.d/ocamlmklib_wrapper.sh
++++ ocamlbricks-0.90+bzr364.3/Makefile.d/ocamlmklib_wrapper.sh
+@@ -41,6 +41,12 @@ cd _build/
+ echo "Rebuilding library with ocamlmklib..."
+ set -x
+ ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMO
+-ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMX
++if which ocamlopt &>/dev/null; then
++   ocamlmklib -custom -o ocamlbricks $OBJECTS $INCLUDES $CMX
++fi
+ set +x
+-ls -l ocamlbricks.cm{,x}a
++if which ocamlopt &>/dev/null; then
++   ls -l ocamlbricks.cm{,x}a
++else
++   ls -l ocamlbricks.cma
++fi
diff --git a/debian/patches/series b/debian/patches/series
index a08459b..cd1d1aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_mlvalues.h_path.diff
 debian-prefix.diff
+no-ocamlopt-arches.diff

-- 
ocamlbricks packaging