This is an automated email from the git hooks/post-receive script. mehdi pushed a commit to branch master in repository menhir.
commit 7cd12f822d2fe5e638f556cea2031bc511d8cc26 Author: Mehdi Dogguy <me...@debian.org> Date: Sun Jan 17 21:13:39 2016 +0100 Refresh patches --- debian/changelog | 3 +++ .../0001-Remove-some-invalid-characters.patch | 3 +++ ...yte-plugin-to-ocamlbuild-when-TARGET-byte.patch | 25 ++++++++++++++++++++++ ...-Use-CURDIR-instead-of-.-during-bootstrap.patch | 21 ------------------ debian/patches/series | 2 +- 5 files changed, 32 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3dd0ab6..a7599e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ menhir (20151112.dfsg-1) UNRELEASED; urgency=medium * New upstream release. + - Refresh patches + - Add 0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch + to avoid FTBFS on bytecode architectures. -- Mehdi Dogguy <me...@debian.org> Sun, 17 Jan 2016 20:50:29 +0100 diff --git a/debian/patches/0001-Remove-some-invalid-characters.patch b/debian/patches/0001-Remove-some-invalid-characters.patch index d5dba8d..0d3dcf2 100644 --- a/debian/patches/0001-Remove-some-invalid-characters.patch +++ b/debian/patches/0001-Remove-some-invalid-characters.patch @@ -19,3 +19,6 @@ index e241b91..ac2940c 100644 .PP This manual page was written by Samuel Mimram <smim...@debian.org>, for the Debian project (but may be used by others). +-- +2.7.0.rc3 + diff --git a/debian/patches/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch b/debian/patches/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch new file mode 100644 index 0000000..3853c5d --- /dev/null +++ b/debian/patches/0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch @@ -0,0 +1,25 @@ +From: Mehdi Dogguy <me...@debian.org> +Date: Sun, 17 Jan 2016 21:10:32 +0100 +Subject: Pass -byte-plugin to ocamlbuild when TARGET=byte + +--- + src/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/Makefile b/src/Makefile +index e3af30f..e6a523e 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -20,6 +20,9 @@ endif + # Ocamlbuild tool and settings. + + OCAMLBUILD := ocamlbuild -classic-display -j 0 -cflags "-safe-string -bin-annot" ++ifeq ($(TARGET),byte) ++OCAMLBUILD := $(OCAMLBUILD) -byte-plugin ++endif + + # ---------------------------------------------------------------------------- + # For everyday development. +-- +2.7.0.rc3 + diff --git a/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch b/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch deleted file mode 100644 index 2c04b61..0000000 --- a/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Mehdi Dogguy <me...@debian.org> -Date: Thu, 27 Mar 2014 20:45:19 +0100 -Subject: Use CURDIR instead of '.' during bootstrap - ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 6fc070d..599fc4e 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -60,7 +60,7 @@ stage1: - # Stage 2. - # Build Menhir using Menhir (from stage 1). - --FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib . --strict --fixed-exception -+FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --stdlib $(CURDIR) --strict --fixed-exception - - stage2: - @$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \ diff --git a/debian/patches/series b/debian/patches/series index baab023..8abc548 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ 0001-Remove-some-invalid-characters.patch -0002-Use-CURDIR-instead-of-.-during-bootstrap.patch +0002-Pass-byte-plugin-to-ocamlbuild-when-TARGET-byte.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/menhir.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