From 286f3e49c84c8990eb931d1dc9db66af06c8f119 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sun, 1 Jun 2025 09:09:10 +0100 Subject: [PATCH 1/2] guix: sqlite wants tcl --- contrib/guix/manifest.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 59837e9647e..ddc4d05ec33 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -19,6 +19,7 @@ ((gnu packages python-crypto) #:select (python-asn1crypto)) ((gnu packages python-science) #:select (python-scikit-build-core)) ((gnu packages python-xyz) #:select (python-pydantic-2)) + (gnu packages tcl) ((gnu packages tls) #:select (openssl)) ((gnu packages version-control) #:select (git-minimal)) (guix build-system cmake) @@ -547,6 +548,7 @@ inspecting signatures in Mach-O binaries.") cmake-minimal gnu-make ninja + tcl ;; Scripting python-minimal ;; (3.10) ;; Git From 1db74914706fcfafb22646288458604a4a7b6282 Mon Sep 17 00:00:00 2001 From: fanquake Date: Sat, 31 May 2025 11:07:48 +0100 Subject: [PATCH 2/2] depends: sqlite 3.50.4 Migrate to the new Autosetup build system (introduced in 3.48.0). See https://msteveb.github.io/autosetup/. Also: https://sqlite.org/releaselog/3_50_0.html. --- depends/packages/sqlite.mk | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk index 67b7719eb88..7bb39b268d1 100644 --- a/depends/packages/sqlite.mk +++ b/depends/packages/sqlite.mk @@ -1,35 +1,29 @@ package=sqlite -$(package)_version=3460100 -$(package)_download_path=https://sqlite.org/2024/ +$(package)_version=3500400 +$(package)_download_path=https://sqlite.org/2025/ $(package)_file_name=sqlite-autoconf-$($(package)_version).tar.gz -$(package)_sha256_hash=67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 +$(package)_sha256_hash=a3db587a1b92ee5ddac2f66b3edb41b26f9c867275782d46c3a088977d6a5b18 define $(package)_set_vars -$(package)_config_opts=--disable-shared --disable-readline --disable-dynamic-extensions --enable-option-checking -$(package)_config_opts+= --disable-rtree --disable-fts4 --disable-fts5 -# We avoid using `--enable-debug` because it overrides CFLAGS, a behavior we want to prevent. -$(package)_cppflags_debug += -DSQLITE_DEBUG -$(package)_cppflags+=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED -$(package)_cppflags+=-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -$(package)_cppflags+=-DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT -endef - -define $(package)_preprocess_cmds - cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub . +$(package)_config_opts = --disable-shared --disable-readline --disable-rtree +$(package)_config_opts += --disable-fts4 --disable-fts5 +$(package)_config_opts_debug += --debug +$(package)_cppflags += -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED +$(package)_cppflags += -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE_DOESNT_MATCH_BLOBS +$(package)_cppflags += -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT +$(package)_cppflags += -DSQLITE_OMIT_LOAD_EXTENSION endef +# Remove --with-pic, which is applied globally to configure +# invocations but is incompatible with Autosetup define $(package)_config_cmds - $($(package)_autoconf) + $$(filter-out --with-pic,$($(package)_autoconf)) endef define $(package)_build_cmds - $(MAKE) libsqlite3.la + $(MAKE) libsqlite3.a endef define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS -endef - -define $(package)_postprocess_cmds - rm lib/*.la + $(MAKE) DESTDIR=$($(package)_staging_dir) install-headers install-lib endef