This is an automated email from the git hooks/post-receive script. josch pushed a commit to branch master in repository ocp-indent.
commit 006f8b93c36511688a3f57191b0801b6e1f25224 Author: Johannes Schauer <jo...@debian.org> Date: Sun Jan 31 12:36:31 2016 +0100 release 1.5.2-2 to unstable to fix build failures on native architectures - fix native compilation by using two separate ocamlfind calls instead of calling it multiple times --- debian/changelog | 8 ++++++++ debian/patches/fix-Makefile.simple-install-cmo-and-o | 14 ++++++++++---- debian/patches/fix-Makefile.simple-install-cmx | 11 ----------- debian/patches/series | 1 - 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 016a717..faa9c23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ocp-indent (1.5.2-2) unstable; urgency=medium + + * fix native compilation by using two separate ocamlfind calls instead of + calling it multiple times (removing patch fix-Makefile.simple-install-cmx + and amending fix-Makefile.simple-install-cmo-and-o) + + -- Johannes Schauer <jo...@debian.org> Sun, 31 Jan 2016 12:21:07 +0100 + ocp-indent (1.5.2-1) unstable; urgency=medium * new upstream release diff --git a/debian/patches/fix-Makefile.simple-install-cmo-and-o b/debian/patches/fix-Makefile.simple-install-cmo-and-o index caa4eb2..5831935 100644 --- a/debian/patches/fix-Makefile.simple-install-cmo-and-o +++ b/debian/patches/fix-Makefile.simple-install-cmo-and-o @@ -1,14 +1,20 @@ --- a/Makefile.simple +++ b/Makefile.simple -@@ -68,9 +68,10 @@ install: META $(LIBS) $(BINS) +@@ -66,12 +66,15 @@ META: + .PHONY: install + install: META $(LIBS) $(BINS) ocamlfind remove $(LIB) || true ++ifeq ($(BEST),native) ocamlfind install $(LIB) \ $(LIBS:%=_build/src/%) META \ - _build/src/*.mli _build/src/*.cmi -+ _build/src/*.mli _build/src/*.cmi _build/src/*.cmo - ifeq ($(BEST),native) +-ifeq ($(BEST),native) ++ _build/src/*.mli _build/src/*.cmi _build/src/*.cmo _build/src/*.o _build/src/*.cmx cp _build/src/indentMain.native $(DESTDIR)/usr/bin/ocp-indent -+ ocamlfind install $(LIB) _build/src/*.o else ++ ocamlfind install $(LIB) \ ++ $(LIBS:%=_build/src/%) META \ ++ _build/src/*.mli _build/src/*.cmi _build/src/*.cmo cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent endif + cp tools/ocp-indent.el $(DESTDIR)/usr/share/emacs/site-lisp/ocp-indent.el diff --git a/debian/patches/fix-Makefile.simple-install-cmx b/debian/patches/fix-Makefile.simple-install-cmx deleted file mode 100644 index 0643c1c..0000000 --- a/debian/patches/fix-Makefile.simple-install-cmx +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.simple -+++ b/Makefile.simple -@@ -71,7 +71,7 @@ install: META $(LIBS) $(BINS) - _build/src/*.mli _build/src/*.cmi _build/src/*.cmo - ifeq ($(BEST),native) - cp _build/src/indentMain.native $(DESTDIR)/usr/bin/ocp-indent -- ocamlfind install $(LIB) _build/src/*.o -+ ocamlfind install $(LIB) _build/src/*.o _build/src/*.cmx - else - cp _build/src/indentMain.byte $(DESTDIR)/usr/bin/ocp-indent - endif diff --git a/debian/patches/series b/debian/patches/series index 1a20b91..0f7be90 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,4 +5,3 @@ fix-Makefile.simple-install-vim-emacs-indent fix-Makefile.simple-clean-symlinks fix-Makefile.simple-install-cmo-and-o fix-spelling -fix-Makefile.simple-install-cmx -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.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