This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch debian/experimental
in repository ocaml.
commit 972001528147f4b05ae224abe985f0d8eb7b9699
Author: Ximin Luo <infini...@debian.org>
Date: Fri Jul 21 20:38:22 2017 +0200
Properly fix new natdynlink logic
- fix the bogus "double-if" conditional
- filter is more correct than findstring, the latter gives amd64 even if
only
freebsd-amd64 is in the list
---
debian/changelog | 6 ++++++
debian/ocamlinit.mk | 4 +---
debian/ocamlvars.mk | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 795f97a..36bc9d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (4.05.0-4) UNRELEASED; urgency=medium
+
+ * Fix new natdynlink logic, fixes FTBFS on some more arches.
+
+ -- Ximin Luo <infini...@debian.org> Fri, 21 Jul 2017 20:24:43 +0200
+
ocaml (4.05.0-3) experimental; urgency=medium
* Fix Makefile $-escaping syntax, fixes FTBFS on a bunch of arches.
diff --git a/debian/ocamlinit.mk b/debian/ocamlinit.mk
index a1ba209..e751aa9 100644
--- a/debian/ocamlinit.mk
+++ b/debian/ocamlinit.mk
@@ -50,14 +50,12 @@ endif
# Upstream Makefile is mildly buggy, sets NATDYNLINK for sparc64 with no opt
# support. This double-if should stay correct in all future situations.
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-ifeq ($(NATDYNLINK),true)
+ifeq ($(OCAML_HAVE_OCAMLOPT) $(NATDYNLINK),yes true)
OCAMLINIT_SED += -e 's/^DYN: //'
else
OCAMLINIT_SED += -e '/^DYN: /d'
OCAMLINIT_SED += -e '/\.cmxs$$/d'
endif
-endif
ifeq ($(PROFILING),true)
OCAMLINIT_SED += -e 's/^PROFILING: //'
diff --git a/debian/ocamlvars.mk b/debian/ocamlvars.mk
index 005ad45..4604a61 100644
--- a/debian/ocamlvars.mk
+++ b/debian/ocamlvars.mk
@@ -6,6 +6,6 @@ OCAMLMINOR := 0
OCAML_ABI := $(OCAMLMAJOR).$(OCAMLMINOR)
OCAML_STDLIB_DIR := /usr/lib/ocaml
OCAML_NATIVE_ARCHS := $(shell cat debian/native-archs)
-OCAML_OPT_ARCH := $(findstring $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
+OCAML_OPT_ARCH := $(filter $(DEB_BUILD_ARCH),$(OCAML_NATIVE_ARCHS))
OCAML_HAVE_OCAMLOPT := $(if $(OCAML_OPT_ARCH),yes,no)
OCAML_OCAMLDOC_DESTDIR_HTML =
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.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
