Drop support for ocamlopt on armel as suggested by upstream

diff --git a/debian/changelog b/debian/changelog
index 6c9f53673a5dd6e4649ffff8527ff8c3233e056a..fe20e39a00461e46b8db76c510bfe828eedc73da 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (4.05.0-10) UNRELEASED; urgency=medium
+
+  * Drop support for ocamlopt on armel as suggested by upstream.
+
+ -- Ximin Luo <infinity0@debian.org>  Tue, 03 Oct 2017 23:36:43 +0200
+
 ocaml (4.05.0-9) unstable; urgency=medium
 
   * Upload to unstable. (Closes: #871990)

diff --git a/debian/native-archs b/debian/native-archs
index 1d4503d00ca701862861514038f794555cc24081..6b492b0638364b661e7fcc3df52f186646aa2de4 100644 (file)
--- a/debian/native-archs
+++ b/debian/native-archs
@@ -1 +1 @@
-amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x
+amd64 arm64 armhf hurd-i386 i386 kfreebsd-i386 kfreebsd-amd64 lpia powerpc ppc64 ppc64el sparc s390x

diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 4604a6180b01f5a102e94abafa765d93c5851d8e..3a3093efe30b532e27a24447febda5fcf1555e22 100644 (file)
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -6,6 +6,6 @@ OCAMLMINOR := 0
 OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
 OCAML_STDLIB_DIR := /usr/lib/ocaml
 OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)
-OCAML_OPT_ARCH := $(filter $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
+OCAML_OPT_ARCH := $(filter $(DEB_HOST_ARCH),$(OCAML_NATIVE_ARCHS))
 OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no)
 OCAML_OCAMLDOC_DESTDIR_HTML =

diff --git a/debian/rules b/debian/rules
index 9587cc5cf170df02ff98d7e940148ec4f2bdcd27..96fef6525775073fcd934fa77c69f7e4eb3ec556 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,11 @@ CONFIGURE_SED := \
   -e "s%LIBDIR=.*$$%LIBDIR=\$$(PREFIX)/lib/ocaml%g" \
   -e "s%STUBLIBDIR=.*$$%STUBLIBDIR=\$$(PREFIX)/lib/ocaml/stublibs%g"
 
+# Upstream recommends dropping support, see https://caml.inria.fr/mantis/view.php?id=7642
+ifneq (,$(filter $(DEB_HOST_ARCH),armel))
+CONFIGURE_OPTS += --no-native-compiler
+endif
+
 %:
        dh $@