[Pkg-ocaml-maint-commits] [menhir] 01/03: Fix FTBFS on bytecode architectures

Mehdi Dogguy mehdi at moszumanska.debian.org
Thu Mar 27 19:58:36 UTC 2014


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

mehdi pushed a commit to branch master
in repository menhir.

commit c80ba059020cb329bfdef8a79dabde42f14c23f4
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Thu Mar 27 20:47:09 2014 +0100

    Fix FTBFS on bytecode architectures
---
 debian/changelog                                   |  7 +++++++
 ...-Use-CURDIR-instead-of-.-during-bootstrap.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d2aa0bd..dab93ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+menhir (20130911.dfsg-2) UNRELEASED; urgency=low
+
+  * Fix FTBFS on bytecode architectures.
+    - Add 0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Thu, 27 Mar 2014 20:46:08 +0100
+
 menhir (20130911.dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch b/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
new file mode 100644
index 0000000..838fa09
--- /dev/null
+++ b/debian/patches/0002-Use-CURDIR-instead-of-.-during-bootstrap.patch
@@ -0,0 +1,22 @@
+From: Mehdi Dogguy <mehdi at 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 cbf0388..a6b6f03 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 --error-recovery --stdlib . --strict --fixed-exception
++FLAGS := -v -lg 1 -la 1 -lc 1 --comment --infer --error-recovery --stdlib $(CURDIR) --strict --fixed-exception
+ 
+ stage2:
+ 	@$(OCAMLBUILD) -build-dir _stage2 -tag fancy_parser \
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index a1baaf9..baab023 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Remove-some-invalid-characters.patch
+0002-Use-CURDIR-instead-of-.-during-bootstrap.patch

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



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