Source: sqlite3
Version: 3.9.1-1
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

Hi,

since the upload of 3.9.1-1, sqlite3 fails to cross build from source.
You can find an example failing build log at
https://jenkins.debian.net/job/rebootstrap_mips_gcc5_nobiarch/42/console.
For some reason, it started executing the lemon code generator on the
host architecture. In theory, the Debian-specific patch 30-cross.patch
should already cover for this case. However, it misses one invocation of
lemon. After applying the attached patch, sqlite3 builds fine again.

Helmut
diff --minimal -Nru sqlite3-3.9.1/debian/changelog 
sqlite3-3.9.1/debian/changelog
--- sqlite3-3.9.1/debian/changelog
+++ sqlite3-3.9.1/debian/changelog
@@ -1,3 +1,11 @@
+sqlite3 (3.9.1-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Update 30-cross.patch to cover all lemon invocations
+    (closes: #-1).
+
+ -- Helmut Grohne <hel...@subdivi.de>  Thu, 22 Oct 2015 20:16:58 +0200
+
 sqlite3 (3.9.1-1) unstable; urgency=low
 
   * New upstream release.
diff --minimal -Nru sqlite3-3.9.1/debian/patches/30-cross.patch 
sqlite3-3.9.1/debian/patches/30-cross.patch
--- sqlite3-3.9.1/debian/patches/30-cross.patch
+++ sqlite3-3.9.1/debian/patches/30-cross.patch
@@ -37,7 +37,20 @@
        mv parse.h parse.h.temp
        $(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
  
-@@ -974,7 +984,10 @@
+@@ -1017,10 +1027,10 @@
+    $(TOP)/ext/fts5/fts5_varint.c \
+    $(TOP)/ext/fts5/fts5_vocab.c  \
+ 
+-fts5parse.c:  $(TOP)/ext/fts5/fts5parse.y lemon 
++fts5parse.c:  $(TOP)/ext/fts5/fts5parse.y $(LEMON_FOR_BUILD)
+       cp $(TOP)/ext/fts5/fts5parse.y .
+       rm -f fts5parse.h
+-      ./lemon $(OPTS) fts5parse.y
++      ./$(LEMON_FOR_BUILD) $(OPTS) fts5parse.y
+ 
+ fts5parse.h: fts5parse.c
+ 
+@@ -1194,7 +1204,10 @@
        rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
        rm -f sqlite3.h opcodes.*
        rm -rf .libs .deps

Reply via email to