diff mbox series

[v2] sqlite3: upgrade 3.48.0 -> 3.50.4

Message ID 20251002151353.88813-1-anna-lena.marx@inovex.de
State New
Headers show
Series [v2] sqlite3: upgrade 3.48.0 -> 3.50.4 | expand

Commit Message

Anna-Lena Marx Oct. 2, 2025, 3:13 p.m. UTC 
With the upgrade to 3.50.4, some configure options changed
as the project switched from `autotools` to `autosetup`.
The PACKAGECONFIG "dyn_ext" is not longer available.
Besides, the default CONFIGUREOPTS "target", "exec_prefix"
and "oldincludedir" became invalid.

Changelog: https://sqlite.org/releaselog/3_50_4.html

Signed-off-by: Anna-Lena Marx <anna-lena.marx@inovex.de>
---
 meta/recipes-support/sqlite/sqlite3.inc       | 14 ++++++---
 .../0001-hack-disable-rpath-in-sqlite3.patch  | 31 +++++++++++++++++++
 .../{sqlite3_3.48.0.bb => sqlite3_3.50.4.bb}  |  6 ++--
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 meta/recipes-support/sqlite/sqlite3/0001-hack-disable-rpath-in-sqlite3.patch
 rename meta/recipes-support/sqlite/{sqlite3_3.48.0.bb => sqlite3_3.50.4.bb} (51%)

Comments

Alexander Kanavin Oct. 2, 2025, 3:23 p.m. UTC | #1 
On Thu, 2 Oct 2025 at 17:14, Anna-Lena Marx via lists.openembedded.org
<anna-lena.marx=inovex.de@lists.openembedded.org> wrote:
> +Subject: [PATCH] hack: disable rpath in sqlite3
> +
> +sqlite3 does not implement disabling rpath as an option right now.
> +This hack uncomments parts of the partially existing structure
> +to do so for disabling it for Yocto.
> +
> +Upstream-Status: Pending

This seems to indicate the patch is a work in progress? Will there be
a non-hack version, suitable for upstream submission? Should there be
an upstream ticket at least?

Please do not misuse Pending by not putting any further comment into
it; it must have an explanation of what is pending, or better yet,
develop the patch so it can have a different status, e.g.
Inappropriate [reason] or Submitted [where].

Alex
diff mbox series

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 28a33282ae..591d00e7a5 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -23,8 +23,8 @@  CVE_PRODUCT = "sqlite"
 inherit autotools pkgconfig siteinfo
 
 # enable those which are enabled by default in configure
-PACKAGECONFIG ?= "fts4 fts5 rtree dyn_ext"
-PACKAGECONFIG:class-native ?= "fts4 fts5 rtree dyn_ext"
+PACKAGECONFIG ?= "fts4 fts5 rtree"
+PACKAGECONFIG:class-native ?= "fts4 fts5 rtree"
 
 PACKAGECONFIG[editline] = "--enable-editline,--disable-editline,libedit"
 PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline ncurses"
@@ -33,15 +33,21 @@  PACKAGECONFIG[fts4] = "--enable-fts4,--disable-fts4"
 PACKAGECONFIG[fts5] = "--enable-fts5,--disable-fts5"
 PACKAGECONFIG[rtree] = "--enable-rtree,--disable-rtree"
 PACKAGECONFIG[session] = "--enable-session,--disable-session"
-PACKAGECONFIG[dyn_ext] = "--enable-dynamic-extensions,--disable-dynamic-extensions"
 PACKAGECONFIG[zlib] = ",,zlib"
 
 CACHED_CONFIGUREVARS += "${@bb.utils.contains('PACKAGECONFIG', 'zlib', '', 'ac_cv_search_deflate=no',d)}"
 
+# The configure options target, exec_prefix and oldincludedir
+# are not supported by sqlite3 anymore.
+CONFIGUREOPTS:remove = "--target=${TARGET_SYS}"
+CONFIGUREOPTS:remove = "--exec_prefix=${exec_prefix}"
+CONFIGUREOPTS:remove = "--oldincludedir=${includedir}"
+
 EXTRA_OECONF = " \
     --enable-shared \
     --enable-threadsafe \
     --disable-static-shell \
+    --soname=legacy \
 "
 
 # pread() is in POSIX.1-2001 so any reasonable system must surely support it
@@ -51,7 +57,7 @@  CFLAGS += "-DUSE_PREAD"
 CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA"
 
 # Unless SQLITE_BYTEORDER is predefined, the code falls back to build time
-# huristics, which are not always correct
+# heuristics, which are not always correct
 CFLAGS += "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'le', '-DSQLITE_BYTEORDER=1234', '-DSQLITE_BYTEORDER=4321', d)}"
 
 PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN}-dbg lib${BPN}-staticdev ${PN}"
diff --git a/meta/recipes-support/sqlite/sqlite3/0001-hack-disable-rpath-in-sqlite3.patch b/meta/recipes-support/sqlite/sqlite3/0001-hack-disable-rpath-in-sqlite3.patch
new file mode 100644
index 0000000000..4170c10ed8
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3/0001-hack-disable-rpath-in-sqlite3.patch
@@ -0,0 +1,31 @@ 
+From c50f1a09056bd3e74b937a00216bc3148c25f16f Mon Sep 17 00:00:00 2001
+From: Anna-Lena Marx <anna-lena.marx@inovex.de>
+Date: Thu, 2 Oct 2025 16:11:10 +0200
+Subject: [PATCH] hack: disable rpath in sqlite3
+
+sqlite3 does not implement disabling rpath as an option right now.
+This hack uncomments parts of the partially existing structure
+to do so for disabling it for Yocto.
+
+Upstream-Status: Pending
+
+Signed-off-by: Anna-Lena Marx <anna-lena.marx@inovex.de>
+---
+ autosetup/sqlite-config.tcl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
+index 85fe414..d1b24de 100644
+--- a/autosetup/sqlite-config.tcl
++++ b/autosetup/sqlite-config.tcl
+@@ -2131,8 +2131,8 @@ proc sqlite-handle-rpath {} {
+ #  if {[proj-opt-truthy rpath]} {
+ #    proj-check-rpath
+ #  } else {
+-#    msg-result "Disabling use of rpath."
+-#    define LDFLAGS_RPATH ""
++   msg-result "Disabling use of rpath."
++   define LDFLAGS_RPATH ""
+ #  }
+ }
+ 
diff --git a/meta/recipes-support/sqlite/sqlite3_3.48.0.bb b/meta/recipes-support/sqlite/sqlite3_3.50.4.bb
similarity index 51%
rename from meta/recipes-support/sqlite/sqlite3_3.48.0.bb
rename to meta/recipes-support/sqlite/sqlite3_3.50.4.bb
index bd2ac6614d..65052ae069 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.48.0.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.50.4.bb
@@ -3,6 +3,8 @@  require sqlite3.inc
 LICENSE = "PD"
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=786d3dc581eff03f4fd9e4a77ed00c66"
 
-SRC_URI = "http://www.sqlite.org/2025/sqlite-autoconf-${SQLITE_PV}.tar.gz"
-SRC_URI[sha256sum] = "ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5"
+SRC_URI = "http://www.sqlite.org/2025/sqlite-autoconf-${SQLITE_PV}.tar.gz \
+           file://0001-hack-disable-rpath-in-sqlite3.patch \
+           "
+SRC_URI[sha256sum] = "a3db587a1b92ee5ddac2f66b3edb41b26f9c867275782d46c3a088977d6a5b18"