From a0b150c73db4d3f8d9381ea43237397694f3b935 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 3 Oct 2017 21:44:19 +0200 Subject: [PATCH] Drop support for ocamlopt on armel as suggested by upstream --- debian/changelog | 6 ++++++ debian/native-archs | 2 +- debian/ocamlvars.mk | 2 +- debian/rules | 5 +++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c9f5367..fe20e39a 100644 --- 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 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 1d4503d0..6b492b06 100644 --- 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 4604a618..3a3093ef 100644 --- 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 9587cc5c..96fef652 100755 --- 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 $@ -- 2.30.2