[Pkg-ocaml-maint-commits] [parmap] 02/03: Set OCAMLBEST from /u/s/o/ocamlvars.mk in d/rules

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository parmap.

commit 0adaff8c57866d15b5f5061375c6f8667873938a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Oct 9 10:04:55 2014 +0200

    Set OCAMLBEST from /u/s/o/ocamlvars.mk in d/rules
---
 debian/changelog | 7 +++++--
 debian/rules     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a2a11f..793ade2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 parmap (1.0~rc4-2) UNRELEASED; urgency=low
 
-  * Add patch 0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
-    to be able to override OCAMLBEST from d/rules.
+  * Fix FTBFS on bytecode architectures.
+    - Add patch 0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
+      to be able to override OCAMLBEST from d/rules.
+    - Set OCAMLBEST from /u/s/o/ocamlvars.mk in d/rules so that mips*, ppc64el
+      and s390x are not considered as native architectures.
 
  -- Mehdi Dogguy <mehdi at debian.org>  Thu, 09 Oct 2014 09:38:21 +0200
 
diff --git a/debian/rules b/debian/rules
index cf7b5f2..f1d222b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ include /usr/share/ocaml/ocamlvars.mk
 PARMAP_DIR=$(CURDIR)/debian/tmp
 
 override_dh_auto_install:
-	$(MAKE) DESTDIR=$(PARMAP_DIR)/usr install
+	$(MAKE) OCAMLBEST=$(OCAMLBEST) DESTDIR=$(PARMAP_DIR)/usr install
 
 %:
 	dh --with ocaml $@

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