Only install ocaml-native-compilers.conf on native-code architectures

diff --git a/debian/changelog b/debian/changelog
index d974573356f9562b46be5af0f59cedd2c7bb0949..38cf1b70a695e672ca4a91cc963ed338b61e1a1b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocaml (4.05.0-7) UNRELEASED; urgency=medium
+
+  * Only install findlib/ocaml-native-compilers.conf on native-code arches,
+    fixing ocamlfind behaviour and FTBFS of ocamlbuild.
+
+ -- Ximin Luo <infinity0@debian.org>  Mon, 31 Jul 2017 01:40:55 +0200
+
 ocaml (4.05.0-6) experimental; urgency=medium
 
   * Mark certain symbols as .hidden in arm64 codegen, fixing FTBFS with

diff --git a/debian/ocaml-nox.install.in b/debian/ocaml-nox.install.in
index 81788eede3d819b5f68013d8b102b178c2ee7488..0fa994d033487a40cf1086df6cc1ff3f8ca77fbb 100644 (file)
--- a/debian/ocaml-nox.install.in
+++ b/debian/ocaml-nox.install.in
@@ -18,7 +18,7 @@ OPT: usr/bin/ocamldoc.opt
      usr/bin/ocamlmktop.*
      usr/bin/ocamlobjinfo.*
      usr/bin/ocamlprof.*
-debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
+OPT: debian/ocamlfind/ocaml-native-compilers.conf usr/share/ocaml-findlib/
      @OCamlStdlibDir@/objinfo_helper
      debian/native-archs @OCamlStdlibDir@
 OPT: usr/bin/ocamlopt