Disable zlib in SQLite (#731)

It was being picked up on Android, and led to a second copy of zlib, the system's, being loaded alongside ours, something which rarely leads to hugs & puppies ;).
koreader · Sep 8, 2018 · 5da954e · 5da954e
1 parent 1772343
commit 5da954e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/thirdparty/dropbear/CMakeLists.txt b/thirdparty/dropbear/CMakeLists.txt
@@ -42,7 +42,7 @@ include(ExternalProject)
 set(DROPBEAR_VER "2018.76")
 ExternalProject_Add(
     ${PROJECT_NAME}
-    URL https://matt.ucc.asn.au/dropbear/releases/dropbear-${DROPBEAR_VER}.tar.bz2
+    URL https://gentoo.osuosl.org/distfiles/dropbear-${DROPBEAR_VER}.tar.bz2
     URL_MD5 c3912f7fcdcc57c99937e4a79480d2c2
     DOWNLOAD_DIR ${KO_DOWNLOAD_DIR}
     PATCH_COMMAND COMMAND ${PATCH_CMD1} COMMAND ${PATCH_CMD2} COMMAND

diff --git a/thirdparty/sqlite/CMakeLists.txt b/thirdparty/sqlite/CMakeLists.txt
@@ -15,7 +15,10 @@ assert_var_defined(CHOST)
 ep_get_binary_dir(BINARY_DIR)
 
 set(CFG_CMD sh -c "CC=\"${CC}\"")
-set(CFG_CMD "${CFG_CMD} CPPFLAGS=\"${CPPFLAGS} -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA\"")
+set(CFG_CMD "${CFG_CMD} CPPFLAGS=\"${CPPFLAGS} -DNDEBUG -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_USE_ALLOCA\"")
+# Explicitly disable zlib, because it's only optionally used by the shell & extensions, and we disable both of those.
+# This should hopefully prevent Android from picking it up...
+set(CFG_CMD "${CFG_CMD} ac_cv_header_zlib_h=no")
 set(CFG_CMD "${CFG_CMD} CFLAGS=\"${CFLAGS} -fno-fast-math\"")
 set(CFG_CMD "${CFG_CMD} LDFLAGS=\"${LDFLAGS}\"")
 set(CFG_CMD "${CFG_CMD} ./configure")
@@ -25,7 +28,9 @@ set(CFG_CMD "${CFG_CMD} --disable-static")
 set(CFG_CMD "${CFG_CMD} --enable-shared")
 set(CFG_CMD "${CFG_CMD} --enable-threadsafe")
 set(CFG_CMD "${CFG_CMD} --disable-dynamic-extensions")
+set(CFG_CMD "${CFG_CMD} --disable-editline")
 set(CFG_CMD "${CFG_CMD} --disable-readline")
+set(CFG_CMD "${CFG_CMD} --disable-static-shell")
 
 include(ExternalProject)
 set(SQLITE_VER "3240000")