Skip to content

Commit

Permalink
Merge pull request #15091 from pkerling/sqlite-update
Browse files Browse the repository at this point in the history
Update sqlite to 3.26.0
  • Loading branch information
MartijnKaijser committed Dec 20, 2018
2 parents 196e418 + 74cd466 commit 4cf1f37
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
10 changes: 3 additions & 7 deletions 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

Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions tools/depends/target/sqlite3/fix-32bits-on-64bits.patch

This file was deleted.

0 comments on commit 4cf1f37

Please sign in to comment.