[Pkg-ocaml-maint-commits] [parmap] 01/02: Revert changes introduced in 1.0_rc4-2

Thu Oct 9 13:47:14 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 ab640cf37b89341acea45153ebd71d46485498eb
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Oct 9 15:27:55 2014 +0200

    Revert changes introduced in 1.0_rc4-2
---
 debian/changelog                                   |  3 +-
 ...IBS-should-be-built-only-on-native-archs.patch} |  6 +-
 ...MLBEST-to-native-when-ocamlopt-is-present.patch | 68 ----------------------
 debian/patches/series                              |  3 +-
 debian/rules                                       |  2 +-
 5 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f35b8c3..f57fda8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 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
+    - add 0002-ALIBS-should-be-built-only-on-native-archs.patch
+    - del 0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
 
  -- Mehdi Dogguy <mehdi at debian.org>  Thu, 09 Oct 2014 15:13:36 +0200
 
diff --git a/debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch b/debian/patches/0002-ALIBS-should-be-built-only-on-native-archs.patch
similarity index 86%
rename from debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch
rename to debian/patches/0002-ALIBS-should-be-built-only-on-native-archs.patch
index cd1726a..53e4f4c 100644
--- a/debian/patches/0003-ALIBS-should-be-built-only-on-native-archs.patch
+++ b/debian/patches/0002-ALIBS-should-be-built-only-on-native-archs.patch
@@ -7,11 +7,11 @@ Subject: ALIBS should be built only on native archs
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 3fda420..373ebc6 100644
+index 7ae9cfd..40d8a8d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -43,10 +43,9 @@ ALIBS=
- ifeq ($(OCAMLBEST),native)
+@@ -48,10 +48,9 @@ ALIBS=
+ ifeq ("@OCAMLBEST@","opt")
    OPTLIBS += $(BYTELIBS:%.cma=%.cmxa)
    CMXSLIBS += $(BYTELIBS:%.cma=%.cmxs)
 +  ALIBS = $(BYTELIBS:%.cma=%.a)
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
deleted file mode 100644
index efe2704..0000000
--- a/debian/patches/0002-Set-OCAMLBEST-to-native-when-ocamlopt-is-present.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Mehdi Dogguy <mehdi at 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 28ab363..9028be3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 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
+0002-ALIBS-should-be-built-only-on-native-archs.patch
diff --git a/debian/rules b/debian/rules
index f1d222b..cf7b5f2 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) OCAMLBEST=$(OCAMLBEST) DESTDIR=$(PARMAP_DIR)/usr install
+	$(MAKE) 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

