[Pkg-ocaml-maint-commits] [parmap] 01/02: Do not build ALIBS (parmap.a) on bytecode architectures.

Mehdi Dogguy mehdi at moszumanska.debian.org
Thu Oct 9 13:21:33 UTC 2014


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

mehdi pushed a commit to branch master
in repository parmap.

commit d3036ef94e172a8ed2e249148d78c6185d4a485a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Oct 9 15:16:02 2014 +0200

    Do not build ALIBS (parmap.a) on bytecode architectures.
---
 debian/changelog                                   |  7 ++++++
 ...LIBS-should-be-built-only-on-native-archs.patch | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 33 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2214bec..f35b8c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+parmap (1.0~rc4-3) UNRELEASED; urgency=low
+
+  * Do not build ALIBS (parmap.a) on bytecode architectures.
+    - add 0003-ALIBS-should-be-built-only-on-native-archs.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 09 Oct 2014 15:13:36 +0200
+
 parmap (1.0~rc4-2) unstable; urgency=medium
 
   * Fix FTBFS on bytecode architectures.
diff --git a/debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch b/debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch
new file mode 100644
index 0000000..cd1726a
--- /dev/null
+++ b/debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch
@@ -0,0 +1,25 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Thu, 9 Oct 2014 15:13:19 +0200
+Subject: ALIBS should be built only on native archs
+
+---
+ Makefile.in |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 3fda420..373ebc6 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -43,10 +43,9 @@ ALIBS=
+ ifeq ($(OCAMLBEST),native)
+   OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
+   CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
++  ALIBS = $(BYTELIBS:%.cma=%.a)
+ endif
+ 
+-ALIBS = $(BYTELIBS:%.cma=%.a)
+-
+ all:
+ 	$(OCAMLBUILD) $(OBFLAGS) $(BYTELIBS) $(OPTLIBS) $(CMXSLIBS) $(ALIBS)
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index cf92aed..28ab363 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Update-version-number-in-various-places.patch
 0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
+0003-ALIBS-should-be-built-only-on-native-archs.patch

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



More information about the Pkg-ocaml-maint-commits mailing list