diff options
| author | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-27 22:51:37 +0100 |
|---|---|---|
| committer | Martijn Kaijser <machine.sanctum@gmail.com> | 2014-11-27 22:51:37 +0100 |
| commit | 4fbeb9ce211ff1c7e1729f0f6622797b34d1b9d2 (patch) | |
| tree | ab0adccc69714d6f4046ad66eb6472ea8f1c86be /tools/depends | |
| parent | ece00bc666a60f48ede67df02a248bcb7cd807eb (diff) | |
| parent | c98be5e323c597a85a4aca2c5d49f82ec88c2109 (diff) | |
Merge pull request #5773 from koying/fixdroidaarch64
FIX droid on aarch64 (Nexus 9 - Tegra K1 64bits)
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/sqlite3/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/target/sqlite3/fix-32bits-on-64bits.patch | 11 |
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 + }; + |