From: Stephane Glondu <steph@glondu.net>
Date: Fri, 4 Sep 2020 13:31:05 +0000 (+0200)
Subject: Call ./configure with --disable-native-compiler on bytecode
X-Git-Tag: archive/raspbian/4.11.1-5+rpi1~1^2~13
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fded1395644c56c34786812b31ed5bea9dd820c6;p=ocaml.git

Call ./configure with --disable-native-compiler on bytecode
---

diff --git a/debian/changelog b/debian/changelog
index 74efcacb..af625400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.11.1-2) UNRELEASED; urgency=medium
+
+  * Call ./configure with --disable-native-compiler on all bytecode
+    architectures
+
+ -- Stéphane Glondu <glondu@debian.org>  Fri, 04 Sep 2020 15:30:36 +0200
+
 ocaml (4.11.1-1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 5f92738d..2817a391 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,7 +63,7 @@ CONFIGURE_OPTS := \
 # Upstream recommends dropping support on armel, see https://github.com/ocaml/ocaml/issues/7642
 # Binaries generated by ocamlopt segfault on x32
 # ld reports spurious messages on powerpc, see https://github.com/ocaml/ocaml/issues/8846
-ifneq (,$(filter $(DEB_HOST_ARCH),armel powerpc x32))
+ifeq (,$(OCAML_OPT_ARCH))
 CONFIGURE_OPTS += --disable-native-compiler
 endif