From 296744b0f4be307ad4a58b1bb0054e22c6a3b15e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 19 Feb 2025 23:10:33 +0100 Subject: [PATCH] Revert "package/sqlite: bump version to 3.49.0" sqlite 3.49.0 has changed its buildsystem, causing a lot of breakage along the lines. Although a few fixes have already been applied (and reverted in the previous commits), there are remaining pain-points that are not trivial to fix in a timely manner : - the buildsystem forces an rpath to /usr/lib, and it is not obvious how to prevent that (excepyt with patching), - there is an optional dependency to zlib that is not accounted for, neither in the target nor in the host variants; this causes issues when the build host has libz-devel (or similar) already installed, in whicxh case sqlite detets it and links with it; as it is missing an rpath to $(HOST_DIR)/lib, this causesw a build failure when another package pulls in zlib. See: https://autobuild.buildroot.org/results/1a81cb7c88a41a03767a1a201ee0628468f60766/build-end.log https://lore.kernel.org/buildroot/20250219195112.GA2631528@pevik/T/#mb7c7ac63902ed55623a5adf5d1db4a3f60db9fef Fixing the second issue would seem easy enough, but zlib could depend on ccache (when that is enabled), and ccqche depends on sqlite, so that would be a circular dependency. And there is no option in sqlite's configure script to forcefully disable use of zlib... A revert is the quickest solution to unbreak for the time being, as the next release is nearing due date. Another bump can be attempted later, that addresses all the remaining issues. This reverts commit db85638cea3414ca0293cbbb2352e5b0b63a2579. Signed-off-by: Yann E. MORIN Cc: Scott Fan Cc: Romain Naour Cc: Petr Vorel Acked-by: Romain Naour Signed-off-by: Julien Olivain --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index ddec2637b8..5b933fba8f 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4d8bfa0b55e36951f6e5a9fb8c99f3b58990ab785c57b4f84f37d163a0672759 sqlite-autoconf-3490000.tar.gz +sha256 ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 sqlite-autoconf-3480000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index a23f6e1d66..c8f12a427a 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.49.0 -SQLITE_TAR_VERSION = 3490000 +SQLITE_VERSION = 3.48.0 +SQLITE_TAR_VERSION = 3480000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2025 SQLITE_LICENSE = blessing