This is an automated email from the git hooks/post-receive script.
mehdi pushed a commit to branch master
in repository parmap.
commit 8162a64cff4e631a7c05209719f190d73034601e
Author: Mehdi Dogguy <me...@debian.org>
Date: Thu Oct 9 09:39:27 2014 +0200
Add patch 0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch to be
able to override OCAMLBEST from d/rules.
---
debian/changelog | 7 +++
...MLBEST-to-native-when-ocamlopt-is-present.patch | 68 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 76 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 3c5282f..7a2a11f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +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.
+
+ -- Mehdi Dogguy <me...@debian.org> Thu, 09 Oct 2014 09:38:21 +0200
+
parmap (1.0~rc4-1) unstable; urgency=medium
* Initial release (Closes: #761132).
diff --git
a/debian/patches/0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
b/debian/patches/0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
new file mode 100644
index 0000000..efe2704
--- /dev/null
+++ b/debian/patches/0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
@@ -0,0 +1,68 @@
+From: Mehdi Dogguy <me...@debian.org>
+Date: Thu, 9 Oct 2014 09:36:03 +0200
+Subject: Set OCAMLBEST to native when ocamlopt is present
+
+The goal of this patch is mainly to have an OCAMLBEST variable in the
+Makefile that can be overriden externally when calling 'make'. This
+can be useful to override upstream's choice on when we should consider
+some architecture as a native architecture.
+---
+ Makefile.in | 9 ++-------
+ configure | 2 +-
+ m4/ocaml.m4 | 2 +-
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 7ae9cfd..3fda420 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -27,12 +27,7 @@ INSTALL = $(OCAMLFIND) install -destdir $(LIBDIR)
+ UNINSTALL = $(OCAMLFIND) remove -destdir $(LIBDIR)
+ endif
+
+-
+-ifeq ("@OCAMLBEST@","opt")
+- OCAMLBEST=native
+-else
+- OCAMLBEST=byte
+-endif
++OCAMLBEST ?= @OCAMLBEST@
+
+ DIST_DIR = $(NAME)-$(VERSION)
+ DIST_TARBALL = $(DIST_DIR).tar.gz
+@@ -45,7 +40,7 @@ OPTLIBS=
+ CMXSLIBS=
+ ALIBS=
+
+-ifeq ("@OCAMLBEST@","opt")
++ifeq ($(OCAMLBEST),native)
+ OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
+ CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
+ endif
+diff --git a/configure b/configure
+index 78a0825..a191063 100755
+--- a/configure
++++ b/configure
+@@ -2245,7 +2245,7 @@ $as_echo "$as_me: WARNING: Cannot find ocamlopt;
bytecode compilation only." >&2
+ $as_echo "versions differs from ocamlc; ocamlopt discarded." >&6; }
+ OCAMLOPT=no
+ else
+- OCAMLBEST=opt
++ OCAMLBEST=native
+ fi
+ fi
+
+diff --git a/m4/ocaml.m4 b/m4/ocaml.m4
+index e0eec61..98dc591 100644
+--- a/m4/ocaml.m4
++++ b/m4/ocaml.m4
+@@ -38,7 +38,7 @@ AC_DEFUN([AC_PROG_OCAML],
+ AC_MSG_RESULT([versions differs from ocamlc; ocamlopt discarded.])
+ OCAMLOPT=no
+ else
+- OCAMLBEST=opt
++ OCAMLBEST=native
+ fi
+ fi
+
+--
diff --git a/debian/patches/series b/debian/patches/series
index 2d33566..cf92aed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-Update-version-number-in-various-places.patch
+0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/parmap.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
