[Pkg-ocaml-maint-commits] [SCM] obus packaging branch, master, updated. debian/1.1.2-1-3-g294d6d2

[Nicolas Dandrimont]

The following commit has been merged in the master branch:
commit 294d6d2696b4ccf04547e4858ed478cb8bd5b3e0
Author: Nicolas Dandrimont <Nicolas.Dandrimont at crans.org>
Date:   Mon Jun 13 23:18:57 2011 +0200

    Force bytecode compilation on architectures without native dynlink (Closes: #630320)

diff --git a/debian/changelog b/debian/changelog
index 449ee1f..a1a8504 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ obus (1.1.2-2) unstable; urgency=low
 
   * Add a timeout instead of disabling tests
   * Make the tests use a temporary directory as $HOME (Closes: #630322)
+  * Force compilation as bytecode on architectures without native dynlink (Closes: #630320)
 
- -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Mon, 13 Jun 2011 00:49:35 +0200
+ -- Nicolas Dandrimont <nicolas.dandrimont at crans.org>  Tue, 14 Jun 2011 15:37:50 +0200
 
 obus (1.1.2-1) unstable; urgency=low
 
diff --git a/debian/libobus-ocaml-dev.install.in b/debian/libobus-ocaml-dev.install.in
index fe055cd..ba37853 100644
--- a/debian/libobus-ocaml-dev.install.in
+++ b/debian/libobus-ocaml-dev.install.in
@@ -1,5 +1,5 @@
 usr/share/doc/libobus-ocaml-dev
 @OCamlStdlibDir@/obus/*.cmi
 @OCamlStdlibDir@/obus/*.mli
-OPT: @OCamlStdlibDir@/obus/*.cmxa
-OPT: @OCamlStdlibDir@/obus/*.a
+DYN: @OCamlStdlibDir@/obus/*.cmxa
+DYN: @OCamlStdlibDir@/obus/*.a
diff --git a/debian/libobus-ocaml.install.in b/debian/libobus-ocaml.install.in
index a6e6a80..8e96e4c 100644
--- a/debian/libobus-ocaml.install.in
+++ b/debian/libobus-ocaml.install.in
@@ -1,3 +1,3 @@
 @OCamlStdlibDir@/obus/META
 @OCamlStdlibDir@/obus/*.cma
-OPT: @OCamlStdlibDir@/obus/*.cmxs
+DYN: @OCamlStdlibDir@/obus/*.cmxs
diff --git a/debian/rules b/debian/rules
index 7891b3e..0247293 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,12 @@
 # -*- makefile -*-
 include /usr/share/ocaml/ocamlvars.mk
 
+CONFIGURE_OPTS := 
+
+ifneq ($(OCAML_NATDYNLINK),yes)
+	CONFIGURE_OPTS := --override is_native false
+endif
+
 export OCAMLFIND_DESTDIR=$(CURDIR)/debian/tmp/$(OCAML_STDLIB_DIR)
 DESTDIR=$(CURDIR)/debian/tmp
 
@@ -10,7 +16,7 @@ DESTDIR=$(CURDIR)/debian/tmp
 
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libobus-ocaml-dev
+	ocaml setup.ml -configure $(CONFIGURE_OPTS) --prefix /usr --destdir '$(DESTDIR)' --docdir /usr/share/doc/libobus-ocaml-dev
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:

-- 
obus packaging