From ec86bd30903cfc36c8cdb0bdd8928bf3ad875f6d Mon Sep 17 00:00:00 2001 From: Jannick Date: Wed, 5 Aug 2020 19:40:45 +0200 Subject: [PATCH] sqlite3: cleanup configure feature flags for better maintenance * PKGBUILD: - prefer configure flag '--enable-all' which comprises --enable-json1, --enable-fts4, --enable-fts5 - add configure flag --enable-rtree and remove CPP flag '-DSQLITE_ENABLE_RTREE=1' (NB: In sqlite 3.32.3 --enable-rtree is not implied by --enable-all in contrast to the documentation. Once this bug is fixed --enable-rtree can be removed here.) --- mingw-w64-sqlite3/PKGBUILD | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/mingw-w64-sqlite3/PKGBUILD b/mingw-w64-sqlite3/PKGBUILD index 486682384f..d78c76e5a1 100644 --- a/mingw-w64-sqlite3/PKGBUILD +++ b/mingw-w64-sqlite3/PKGBUILD @@ -45,14 +45,13 @@ build() { -DSQLITE_USE_MALLOC_H=1 \ -DSQLITE_USE_MSIZE=1 \ -DSQLITE_DISABLE_DIRSYNC=1 \ - -DSQLITE_ENABLE_RTREE=1 \ -DSQLITE_ENABLE_DBSTAT_VTAB=1 \ -DSQLITE_SOUNDEX=1 \ " CFLAGS+=" -fexceptions -fno-strict-aliasing ${SQLITE_OPTIONS}" - ../sqlite-src-${_amalgamationver}/configure \ + ../sqlite-src-${_amalgamationver}/configure -C \ --prefix=${MINGW_PREFIX} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -60,9 +59,8 @@ build() { --enable-threadsafe \ --disable-editline \ --enable-readline \ - --enable-json1 \ - --enable-fts4 \ - --enable-fts5 \ + --enable-all \ + --enable-rtree \ --enable-session \ --with-readline-inc=-I${MINGW_PREFIX}/include \ --with-tcl=${MINGW_PREFIX}/lib \