[Pkg-ocaml-maint-commits] [SCM] gdo packaging branch, master, updated. debian/1.0_alpha5-2-2-g19a7a68

[Romain Beauxis]

The following commit has been merged in the master branch:
commit 19a7a68fe0b07874ceb28d210190d36476f91c1e
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Wed Oct 12 02:15:12 2011 +0200

    Fix build on non native archs..

diff --git a/debian/changelog b/debian/changelog
index d59649b..2245564 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gd4o (1.0~alpha5-4) unstable; urgency=low
+
+  * Disable native build on archs without ocaml native compiler. 
+
+ -- Romain Beauxis <toots at rastageeks.org>  Wed, 12 Oct 2011 02:11:37 +0200
+
 gd4o (1.0~alpha5-3) unstable; urgency=low
 
   * Also build native library. 
diff --git a/debian/rules b/debian/rules
index 57a4f60..c74d402 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,12 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 DESTDIR = $(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 # Do not compile dynlink files for now..
-DEB_MAKE_BUILD_TARGET := OCAML_DYNLINK="" all opt
+DEB_MAKE_BUILD_TARGET := OCAML_DYNLINK="" all
 DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore
 
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+  DEB_MAKE_BUILD_TARGET += opt
+endif
+
 build/libgd-gd2-noxpm-ocaml-dev::
 	mkdir -p $(DESTDIR)

-- 
gdo packaging