From: Ximin Luo Date: Sun, 30 Jul 2017 23:42:00 +0000 (+0200) Subject: Only install ocaml-native-compilers.conf on native-code architectures X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~36 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8be831d1d46a6925b4f774e96fe1308da309df0;p=ocaml.git Only install ocaml-native-compilers.conf on native-code architectures --- diff --git a/debian/changelog b/debian/changelog index d9745733..38cf1b70 100644 --- 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 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 81788eed..0fa994d0 100644 --- 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