aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris "Koying" Browet <cbro@semperpax.com>2014-11-20 15:30:00 +0100
committerChris "Koying" Browet <cbro@semperpax.com>2014-11-25 13:45:02 +0100
commitad7207a9fcf9cc744ca88a03953843f8c7f19b04 (patch)
treeba1cebb60dd9227e1d9ad82c55bb6ea64e879a13
parent327f4a3f9e66992f8d5d1300ed68d1021da2057e (diff)
FIX: [sqlite] fix sqlite when built in 32bits and executed on 64bits
-rw-r--r--tools/depends/target/sqlite3/Makefile3
-rw-r--r--tools/depends/target/sqlite3/fix-32bits-on-64bits.patch11
2 files changed, 14 insertions, 0 deletions
diff --git a/tools/depends/target/sqlite3/Makefile b/tools/depends/target/sqlite3/Makefile
index 9bc17fce92..28725e0c85 100644
--- a/tools/depends/target/sqlite3/Makefile
+++ b/tools/depends/target/sqlite3/Makefile
@@ -27,6 +27,9 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ifeq ($(OS),android)
+ cd $(PLATFORM); patch -p0 < ../fix-32bits-on-64bits.patch
+endif
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
diff --git a/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch b/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch
new file mode 100644
index 0000000000..cf4d75be1b
--- /dev/null
+++ b/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch
@@ -0,0 +1,11 @@
+--- sqlite3.c.orig 2014-11-19 13:14:16.633721369 +0100
++++ sqlite3.c 2014-11-19 13:23:23.733711563 +0100
+@@ -25301,7 +25301,7 @@
+ #if OS_VXWORKS
+ struct vxworksFileId *pId; /* Unique file ID for vxworks. */
+ #else
+- ino_t ino; /* Inode number */
++ unsigned long long ino; /* Inode number */
+ #endif
+ };
+