From f50fb6e627bdd58821944c9637638dfaa9ff81a5 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Mon, 30 Jan 2023 17:17:20 -0500 Subject: [PATCH] Merge bitcoin/bitcoin#26998: depends: ensure we are appending to sqlite cflags 56a03f1834a7437e3357923a1e45e512c9b2e6fc depends: ensure we are appending to sqlite cflags (fanquake) Pull request description: Otherwise we'll just override other flags passed in (i.e msan). Should fix https://cirrus-ci.com/task/6598922274078720?logs=ci#L3661. ACKs for top commit: achow101: ACK 56a03f1834a7437e3357923a1e45e512c9b2e6fc TheCharlatan: ACK 56a03f1834a7437e3357923a1e45e512c9b2e6fc Tree-SHA512: 5890018cfc5deaef18b0f01a3a0396f803e97f9a9785bf6873ef48bc13b74b644315f0f29cf11d3522964a6396f74e1f080bb4e412bc302956a651fed28b27df --- depends/packages/sqlite.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/depends/packages/sqlite.mk b/depends/packages/sqlite.mk index c8f3555ab2..a8ec89c6c6 100644 --- a/depends/packages/sqlite.mk +++ b/depends/packages/sqlite.mk @@ -12,7 +12,7 @@ $(package)_config_opts_freebsd=--with-pic $(package)_config_opts_netbsd=--with-pic $(package)_config_opts_openbsd=--with-pic $(package)_config_opts_debug=--enable-debug -$(package)_cflags=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED +$(package)_cflags+=-DSQLITE_DQS=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_OMIT_DEPRECATED $(package)_cflags+=-DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_JSON -DSQLITE_LIKE_DOESNT_MATCH_BLOBS $(package)_cflags+=-DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_AUTOINIT endef