The following commit has been merged in the experimental/master branch:
commit 811a15eecb2d04f78c0061d384985532dcb551a0
Author: Ralf Treinen <trei...@free.fr>
Date: Sun Jan 20 17:35:11 2013 +0100
fix FTBFS when dynlink not available
diff --git a/debian/changelog b/debian/changelog
index 2b83be9..bc8fc72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dose3 (3.1.3-2) experimental; urgency=low
+
+ * Fix FTBFS on architectures not supporting dynamic loading:
+ - new patch configure-dynlink, provided by Mehdi Dogguy
+ - debian/control: add build-dependency on automake, autoconf
+ - debian/rules: dh_auto_configure calls aclocal and autoconf
+
+ -- Ralf Treinen <trei...@debian.org> Sun, 20 Jan 2013 17:34:42 +0100
+
dose3 (3.1.3-1) experimental; urgency=low
* New upstream version. This version fixes the invocation of the clean
diff --git a/debian/control b/debian/control
index 2626d5e..c81f3d4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian OCaml Maintainers
<debian-ocaml-ma...@lists.debian.org>
Uploaders: Stefano Zacchiroli <z...@debian.org>,
Ralf Treinen <trei...@debian.org>
Build-Depends: debhelper (>= 7.0.50~), dh-ocaml (>= 0.9~),
+# use the following line only when autoconf stuff has been patched:
+ automake, autoconf,
ocaml-nox (>= 3.11.1-3~), camlp4,
libpcre-ocaml-dev,
libextlib-ocaml-dev,
diff --git a/debian/patches/configure-dynlink b/debian/patches/configure-dynlink
new file mode 100644
index 0000000..6abf583
--- /dev/null
+++ b/debian/patches/configure-dynlink
@@ -0,0 +1,19 @@
+Author: Mehdi Dogguy <me...@dogguy.org>
+Description: use dynamic loading only where available. Load bytecode, not
+ native code, on bytecode architectures.
+
+Index: dose3/configure.ac
+===================================================================
+--- dose3.orig/configure.ac 2013-01-20 17:21:15.000000000 +0100
++++ dose3/configure.ac 2013-01-20 17:24:29.000000000 +0100
+@@ -10,8 +10,8 @@
+ AC_MSG_ERROR([You must install the Camlp4 pre-processor])
+ fi
+
+-if test "$CAMLP4OOPT" = "no" ; then
+- CAMLP4OMACRO="$CAMLP4O Camlp4MacroParser.cmx"
++if test "$CAMLP4OOPT" = "no" || (test ! -f /usr/lib/ocaml/dynlink.cmxa) ; then
++ CAMLP4OMACRO="$CAMLP4O Camlp4MacroParser.cmo"
+ else
+ CAMLP4OMACRO="$CAMLP4OOPT -I_build Camlp4MacroParser.cmxs"
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index 5c4d960..8ec9137 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
binaries-prefix-edos
doc-makefile-html
+configure-dynlink
diff --git a/debian/rules b/debian/rules
index cbc688a..c58e408 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ RELEASE = $(shell dpkg-parsechangelog | grep ^Version: | cut -f
2 -d' ')
override_dh_auto_configure:
rm -f doc/debcheck.primer/version.tex
+ # use the following line when autoconf stuff is patched
+ aclocal -I m4 && autoconf
./configure --with-ocamlgraph --with-zip --with-bz2 --with-rpm4
override_dh_auto_install:
--
dose3 packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
