[Pkg-ocaml-maint-commits] [SCM] cduce packaging branch, master, updated. debian/0.5.3-2-15-geeb31c3

[Mehdi Dogguy]

The following commit has been merged in the master branch:
commit 116362df75d9ce09001ff0bee3ee22ceabbebfd7
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri Apr 22 13:02:34 2011 +0200

    Don't compile to native code on native architectures without natdynlink

diff --git a/debian/changelog b/debian/changelog
index 71d09ce..4f13914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ cduce (0.5.3-3) unstable; urgency=low
   [ Mehdi Dogguy ]
   * Team upload.
   * Upload to unstable.
+  * Don't compile to native code on native architectures without natdynlink.
+    It won't work because cduce needs Camlp4lib, which need Dynlink.
 
- -- Mehdi Dogguy <mehdi at debian.org>  Fri, 22 Apr 2011 11:43:49 +0200
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 22 Apr 2011 13:01:19 +0200
 
 cduce (0.5.3-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 1d50211..1c959db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,11 @@
 PACKAGE = cduce
 
 include /usr/share/ocaml/ocamlinit.mk
-MAKE_OPTS := "NATIVE=$(if $(OCAML_OPT_ARCH),true,false)"
+ifeq ($(OCAML_NATDYNLINK),yes)
+  MAKE_OPTS := "NATIVE=true"
+else
+  MAKE_OPTS := "NATIVE=false"
+endif
 
 LIBDIR=$(CURDIR)/debian/cduce/$(OCAML_STDLIB_DIR)
 DOCDIR=$(CURDIR)/debian/cduce/usr/share/doc/cduce/html

-- 
cduce packaging