summaryrefslogtreecommitdiff
path: root/dev-db/sqlite/files
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2025-02-09 13:18:49 +0100
committerJakov Smolić <jsmolic@gentoo.org>2025-02-09 13:23:00 +0100
commitb705f20869835f7148406c1138f9d22d9b6455ed (patch)
tree01cdd09c9abc9cc1b38d5c9f12f2e0b3f43dd725 /dev-db/sqlite/files
parent775f6a4833835e6670364bf8f602409821fc0f63 (diff)
downloadgentoo-b705f20869835f7148406c1138f9d22d9b6455ed.tar.gz
gentoo-b705f20869835f7148406c1138f9d22d9b6455ed.tar.bz2
gentoo-b705f20869835f7148406c1138f9d22d9b6455ed.zip
dev-db/sqlite: add 3.49.0
Replaced some SQLITE_ENABLE flags with their --configure-flag counterparts and add upstream patch for CPPFLAGS which fixes feature flags not being detected during the build Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Diffstat (limited to 'dev-db/sqlite/files')
-rw-r--r--dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch75
1 files changed, 75 insertions, 0 deletions
diff --git a/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch b/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
new file mode 100644
index 000000000000..13c6eafc390f
--- /dev/null
+++ b/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
@@ -0,0 +1,75 @@
+From 3e06f2d79b15754999892a4ded6a7585520294a6 Mon Sep 17 00:00:00 2001
+From: stephan <stephan@noemail.net>
+Date: Sun, 9 Feb 2025 01:25:00 +0000
+Subject: [PATCH] configure: when transfering ENABLE/OMIT flags from CFLAGS to
+ OPT_FEATURE_FLAGS, also do the same for CPPFLAGS and remove those ENABLE/OMIT
+ flags from CFLAGS/CPPFLAGS to mimic legacy build behavior. Strip ENABLE/OMIT
+ flags from BUILD_CFLAGS but do not transfer those to OPT_FEATURE_FLAGS, also
+ to mimic legacy behavior. This is the second part of a fix discussed at
+ [forum:9801e54665afd728|forum post 9801e54665afd728].
+
+FossilOrigin-Name: 16d307cc6c1e203900e7a2dc0730fc0e453946622a2114a07d64ebb99045cfbf
+---
+ autosetup/sqlite-config.tcl | 36 ++++++++++++++++++++++++++++++------
+ manifest | 14 +++++++-------
+ manifest.uuid | 2 +-
+ 3 files changed, 38 insertions(+), 14 deletions(-)
+
+diff --git a/autosetup/sqlite-config.tcl b/autosetup/sqlite-config.tcl
+index cabb32aac0..2a73548662 100644
+--- a/autosetup/sqlite-config.tcl
++++ b/autosetup/sqlite-config.tcl
+@@ -230,23 +230,47 @@ proc sqlite-setup-default-cflags {} {
+ # BUILD_CFLAGS is the CFLAGS for CC_FOR_BUILD.
+ define BUILD_CFLAGS [proj-get-env BUILD_CFLAGS {-g}]
+
+- # Copy all CFLAGS entries matching -DSQLITE_OMIT* and
++ # Copy all CFLAGS and CPPFLAGS entries matching -DSQLITE_OMIT* and
+ # -DSQLITE_ENABLE* to OPT_FEATURE_FLAGS. This behavior is derived
+ # from the legacy build and was missing the 3.48.0 release (the
+ # initial Autosetup port).
+ # https://sqlite.org/forum/forumpost/9801e54665afd728
+ #
++ # Handling of CPPFLAGS, as well as removing ENABLE/OMIT from
++ # CFLAGS/CPPFLAGS, was missing in the 3.49.0 release as well.
++ #
+ # If any configure flags for features are in conflict with
+- # CFLAGS-specified feature flags, all bets are off. There are no
+- # guarantees about which one will take precedence.
+- foreach cf [get-define CFLAGS ""] {
++ # CFLAGS/CPPFLAGS-specified feature flags, all bets are off. There
++ # are no guarantees about which one will take precedence.
++ foreach flagDef {CFLAGS CPPFLAGS} {
++ set tmp ""
++ foreach cf [get-define $flagDef ""] {
++ switch -glob -- $cf {
++ -DSQLITE_OMIT* -
++ -DSQLITE_ENABLE* {
++ sqlite-add-feature-flag $cf
++ }
++ default {
++ lappend tmp $cf
++ }
++ }
++ }
++ define $flagDef $tmp
++ }
++
++ # Strip all SQLITE_ENABLE/OMIT flags from BUILD_CFLAGS,
++ # for compatibility with the legacy build.
++ set tmp ""
++ foreach cf [get-define BUILD_CFLAGS ""] {
+ switch -glob -- $cf {
+ -DSQLITE_OMIT* -
+- -DSQLITE_ENABLE* {
+- sqlite-add-feature-flag $cf
++ -DSQLITE_ENABLE* {}
++ default {
++ lappend tmp $cf
+ }
+ }
+ }
++ define BUILD_CFLAGS $tmp
+ }
+
+ ########################################################################