75bcd1ebd6
This commit includes reverts of the last attempt to bump sqlite: git revert --no-editc4c282f8ec014174f00d835b5659eadb481210e9296744b0f4939244b828f0a272ef14274c36578fand the following new changes: The autoconf-based configure script until version 3.48.0 enabled rtree support by default: https://github.com/sqlite/sqlite/blob/version-3.48.0/autoconf/configure.ac#L180 while the autosetup-based needs -DSQLITE_ENABLE_RTREE https://github.com/sqlite/sqlite/blob/version-3.50.4/autosetup/sqlite-config.tcl#L763 Added Config.in option for RTREE support and enabled it for gdal to provide a needed dependency: https://github.com/OSGeo/gdal/blob/v3.11.4/cmake/helpers/CheckDependentLibraries.cmake#L277 Added upstream patch to fix forced addition of rpath and added configure option --disable-rpath to target build. Added configure option --soname=legacy to fix wrong library name which breaks linking of kodi:7f2281bd7cAdded configure option --disable-shared for static builds. Added build fixes for BR2_m68k_cf. Removed SQLITE_CONF_OPTS and readline support from host build to avoid dependencies. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Tested-by: Julien Olivain <ju.o@free.fr> Signed-off-by: Julien Olivain <ju.o@free.fr> (cherry picked from commit2cc346e763) Signed-off-by: Thomas Perale <thomas.perale@mind.be>
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
Add the --disable-rpath configure script flag to address
|
|
|
|
Upstream: https://sqlite.org/src/info/a59d9bb25e
|
|
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
|
|
Index: autosetup/sqlite-config.tcl
|
|
==================================================================
|
|
--- a/autosetup/sqlite-config.tcl
|
|
+++ b/autosetup/sqlite-config.tcl
|
|
@@ -334,12 +334,12 @@
|
|
# canonical build!
|
|
static-shell=1
|
|
=> {Link the sqlite3 shell app against the DLL instead of embedding sqlite3.c}
|
|
}
|
|
{canonical autoconf} {
|
|
- # A potential TODO without a current use case:
|
|
- #rpath=1 => {Disable use of the rpath linker flag}
|
|
+ rpath=1 => {Disable use of the rpath linker flag}
|
|
+
|
|
# soname: https://sqlite.org/src/forumpost/5a3b44f510df8ded
|
|
soname:=legacy
|
|
=> {SONAME for libsqlite3.so. "none", or not using this flag, sets no
|
|
soname. "legacy" sets it to its historical value of
|
|
libsqlite3.so.0. A value matching the glob "libsqlite3.*" sets
|
|
@@ -2138,25 +2138,25 @@
|
|
}
|
|
|
|
########################################################################
|
|
# Handle the --enable/disable-rpath flag.
|
|
proc sqlite-handle-rpath {} {
|
|
- proj-check-rpath
|
|
# autosetup/cc-shared.tcl sets the rpath flag definition in
|
|
# [get-define SH_LINKRPATH], but it does so on a per-platform basis
|
|
# rather than as a compiler check. Though we should do a proper
|
|
# compiler check (as proj-check-rpath does), we may want to consider
|
|
# adopting its approach of clearing the rpath flags for environments
|
|
# for which sqlite-env-is-unix-on-windows returns a non-empty
|
|
# string.
|
|
|
|
-# if {[proj-opt-truthy rpath]} {
|
|
-# proj-check-rpath
|
|
-# } else {
|
|
-# msg-result "Disabling use of rpath."
|
|
-# define LDFLAGS_RPATH ""
|
|
-# }
|
|
+ # https://sqlite.org/forum/forumpost/13cac3b56516f849
|
|
+ if {[proj-opt-truthy rpath]} {
|
|
+ proj-check-rpath
|
|
+ } else {
|
|
+ msg-result "Disabling use of rpath."
|
|
+ define LDFLAGS_RPATH ""
|
|
+ }
|
|
}
|
|
|
|
########################################################################
|
|
# If the --dump-defines configure flag is provided then emit a list of
|
|
# all [define] values to config.defines.txt, else do nothing.
|
|
|