[Pkg-ocaml-maint-commits] [findlib] 01/03: Better check for raw_spacetime, should fix FTBFS on some arches

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to annotated tag debian/1.7.3-1
in repository findlib.

commit a3f669d9af7ab1d2083fa737a0377e4fbb2ce415
Author: Ximin Luo <infinity0 at debian.org>
Date:   Sat Jul 29 16:05:42 2017 +0200

    Better check for raw_spacetime, should fix FTBFS on some arches
---
 debian/libfindlib-ocaml.install.in | 2 +-
 debian/rules                       | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/libfindlib-ocaml.install.in b/debian/libfindlib-ocaml.install.in
index d80664c..d33a73f 100644
--- a/debian/libfindlib-ocaml.install.in
+++ b/debian/libfindlib-ocaml.install.in
@@ -15,4 +15,4 @@ DYN: @OCamlStdlibDir@/findlib/findlib_dynload.cmxs
 @OCamlStdlibDir@/bigarray/META
 @OCamlStdlibDir@/compiler-libs/META
 @OCamlStdlibDir@/threads/META
-64:  @OCamlStdlibDir@/raw_spacetime/META
+ at OCamlStdlibDir@/raw_spacetime/META
diff --git a/debian/rules b/debian/rules
index 1c4bdc7..a92faf0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,10 +26,9 @@ ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	$(MAKE) opt
 endif
 
-ifeq ($(DEB_BUILD_ARCH_BITS),64)
-  OCAMLINIT_SED += -e 's/^64: //'
-else
-  OCAMLINIT_SED += -e '/^64: /d'
+# Some platforms don't have raw_spacetime, do the same check as ./configure
+ifeq (,$(wildcard $(OCAML_STDLIB_DIR)/raw_spacetime_lib.cmxa))
+  OCAMLINIT_SED += -e '\,raw_spacetime/META,d'
 endif
 
 export OCAMLINIT_SED

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/findlib.git