diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2018-12-20 14:29:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 14:29:31 +0100 |
| commit | 4cf1f3739f04fb821c6f80bd6aaf099453e96eb8 (patch) | |
| tree | 7025c38c8ea30bad3004a0c563bdd1c2d3e2f6e6 /tools | |
| parent | 196e418b357b588f393b16bd403721abc907cc29 (diff) | |
| parent | 74cd46690ed423ba768431aa4c046f45a4f300f9 (diff) | |
Merge pull request #15091 from pkerling/sqlite-update
Update sqlite to 3.26.0
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/sqlite3/Makefile | 10 | ||||
| -rw-r--r-- | tools/depends/target/sqlite3/fix-32bits-on-64bits.patch | 11 |
2 files changed, 3 insertions, 18 deletions
diff --git a/tools/depends/target/sqlite3/Makefile b/tools/depends/target/sqlite3/Makefile index 2838a89f61..39e5334645 100644 --- a/tools/depends/target/sqlite3/Makefile +++ b/tools/depends/target/sqlite3/Makefile @@ -1,19 +1,18 @@ include ../../Makefile.include -DEPS= ../../Makefile.include Makefile fix-32bits-on-64bits.patch sqlite3.c.patch +DEPS= ../../Makefile.include Makefile sqlite3.c.patch # lib name, version LIBNAME=sqlite -VERSION=3140200 +VERSION=3260000 SOURCE=$(LIBNAME)-autoconf-$(VERSION) ARCHIVE=$(SOURCE).tar.gz # configuration settings export CXXFLAGS+=-DSQLITE_ENABLE_COLUMN_METADATA=1 export CFLAGS+=-DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_MMAP_SIZE=0x10000000 -export TCLLIBDIR=/dev/null CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ ./configure --prefix=$(PREFIX) --disable-shared \ - --enable-threadsafe --disable-tcl --disable-readline \ + --enable-threadsafe --disable-readline \ LIBDYLIB=$(PLATFORM)/.libs/lib$(LIBNAME)3.a @@ -25,9 +24,6 @@ $(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 # seems MAP_POPULATE is broken on aarch64 ifneq ($(OS),android) cd $(PLATFORM); patch -p1 < ../sqlite3.c.patch diff --git a/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch b/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch deleted file mode 100644 index cf4d75be1b..0000000000 --- a/tools/depends/target/sqlite3/fix-32bits-on-64bits.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - }; - |