mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#32655: depends: sqlite 3.50.4; switch to autosetup

Browse Source 
1db7491470 depends: sqlite 3.50.4 (fanquake)
286f3e49c8 guix: sqlite wants tcl (fanquake)

Pull request description:

  Migrate to SQLite `3.50.4` in depends; switching to its new [Autosetup](https://msteveb.github.io/autosetup/) build system.

ACKs for top commit:
  TheCharlatan:
    ACK 1db7491470
  willcl-ark:
    tACK 1db7491470

Tree-SHA512: 2932fcde866e4eb7bae6a7c4fa0ef7a6dfcc4d2fdf239b0a0c224e064086ca8bda62d159f89dd7273db232e609a0d28c625756628b885abcfbc0940d067f4d20
This commit is contained in:
merge-script committed 2025-11-25 10:49:26 +00:00
2 parents ff8c2f3749 1db7491470
commit 5fe753b56f
2 files changed
+17 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

contrib/guix/manifest.scm
+2
View File
@@ -19,6 +19,7 @@
((gnu packages python-crypto) #:select (python-asn1crypto)) ((gnu packages python-crypto) #:select (python-asn1crypto))
((gnu packages python-science) #:select (python-scikit-build-core)) ((gnu packages python-science) #:select (python-scikit-build-core))
((gnu packages python-xyz) #:select (python-pydantic-2)) ((gnu packages python-xyz) #:select (python-pydantic-2))
(gnu packages tcl)
((gnu packages tls) #:select (openssl)) ((gnu packages tls) #:select (openssl))
((gnu packages version-control) #:select (git-minimal)) ((gnu packages version-control) #:select (git-minimal))
(guix build-system cmake) (guix build-system cmake)
@@ -548,6 +549,7 @@ inspecting signatures in Mach-O binaries.")
cmake-minimal cmake-minimal
gnu-make gnu-make
ninja ninja
tcl
;; Scripting ;; Scripting
python-minimal ;; (3.10) python-minimal ;; (3.10)
;; Git ;; Git
depends/packages/sqlite.mk
+15 -21
View File
@@ -1,35 +1,29 @@
package=sqlite package=sqlite
$(package)_version=3460100 $(package)_version=3500400
$(package)_download_path=https://sqlite.org/2024/ $(package)_download_path=https://sqlite.org/2025/
$(package)_file_name=sqlite-autoconf-$($(package)_version).tar.gz $(package)_file_name=sqlite-autoconf-$($(package)_version).tar.gz
$(package)_sha256_hash=67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071 $(package)_sha256_hash=a3db587a1b92ee5ddac2f66b3edb41b26f9c867275782d46c3a088977d6a5b18
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--disable-shared --disable-readline --disable-dynamic-extensions --enable-option-checking $(package)_config_opts = --disable-shared --disable-readline --disable-rtree
$(package)_config_opts+= --disable-rtree --disable-fts4 --disable-fts5 $(package)_config_opts += --disable-fts4 --disable-fts5
# We avoid using `--enable-debug` because it overrides CFLAGS, a behavior we want to prevent. $(package)_config_opts_debug += --debug
$(package)_cppflags_debug += -DSQLITE_DEBUG $(package)_cppflags += -DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED
$(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_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_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT $(package)_cppflags += -DSQLITE_OMIT_LOAD_EXTENSION
endef
define $(package)_preprocess_cmds
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
endef endef
# Remove --with-pic, which is applied globally to configure
# invocations but is incompatible with Autosetup
define $(package)_config_cmds define $(package)_config_cmds
$($(package)_autoconf) $$(filter-out --with-pic,$($(package)_autoconf))
endef endef
define $(package)_build_cmds define $(package)_build_cmds
$(MAKE) libsqlite3.la $(MAKE) libsqlite3.a
endef endef
define $(package)_stage_cmds define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install-libLTLIBRARIES install-includeHEADERS $(MAKE) DESTDIR=$($(package)_staging_dir) install-headers install-lib
endef
define $(package)_postprocess_cmds
rm lib/*.la
endef endef