mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-26 08:01:14 +02:00
dev-db/sqlite: Sync with Gentoo
It's from Gentoo commit 97cdc9794a1094a8e5a7dde46a7ac3757c335df7.
This commit is contained in:
Flatcar Buildbot
parent
56e6d7f8e5
commit
ed164e7f2b
@ -1,6 +1,6 @@
|
||||
DIST sqlite-doc-3460100.zip 10851427 BLAKE2B 7462e83ca84e3e9aac7236f575fd2bdddac7744ae700a63fe8fdc9d2df3157c59fd374d99a0526bd4d9f742005ee7a90f3d78057861d3c3fcba9f897630e48db SHA512 1ad7dfc938d182f69ea9367b4f5ead1d48b991626521249e8b58c9fb4c2553e348ce402de9cc81b0ad699d4c45c467de56a98ee39f9c3555c6fafff15fba41ce
|
||||
DIST sqlite-doc-3470200.zip 10957830 BLAKE2B cbc40dd440d1c5af4ad4333090a7306bd54ec43250a478b6900b8f74bd721035018ea7647f3a208d42cc0639827325be26a9412d17af7d390f4e584d4c6acf44 SHA512 48349d512b7cd9bc6f6a5da3a2b2285de159d4653667311adb0f5e6a970060db940a590c2d01b529afc1614065b22434d5b3ac4d8d0122d003d74926745ba56e
|
||||
DIST sqlite-doc-3480000.zip 11391112 BLAKE2B d28531e5d3ac7802700636a669f165cb9fa2a6077422b1ba956b6b9e29db48941489b5a3bc1c4936723e59343e00c3edc9310db9724d914a30ac9aca775dc70d SHA512 d7cad0da8598a3abcacf0e05ba4e285ad1d790691e571e431f920abf1bf27c5a416408ff60ff051b01a65662c0e60bb63b9ba73872851fe63f379e834c5a0f04
|
||||
DIST sqlite-doc-3490000.zip 11327988 BLAKE2B ecabc9b9217953874cc575ef06d93f3ef5da25d82c0837b827daca3ca1da54968d7f3f2498ec7fee22d43fb2a2bcc2077be396dfc5f6e4ee62e1493d7be20e9e SHA512 89823a426aba9db78597f99df6fe2162601d0133d7490c83c939414372c293e9f313bd2e46c5e5d4b19dd3846337f53eb788208c91a1fa7ffc768a0a5966da03
|
||||
DIST sqlite-src-3460100.zip 14276926 BLAKE2B df16ea944e317df8ed64fdfab289e3699ec71725ce55e2b30450adaeb41c061b4fba1eb8c41ba638b0edcd12b23264a1f9e413b69fd593c2b65fb1037d3fc8b2 SHA512 6d32a0db9f95d3cec34f02f3fd45b453bf7c422d4d4d9570790f641e7d190b8b31be8e8715afacc1b6e4417f15a4d15a0b28e608ae0b4b5f3054b075783b916e
|
||||
DIST sqlite-src-3470200.zip 14421983 BLAKE2B dcaea5be0099b2dad1b53403933f0037ace48b1f248040c1b5cc116ac2ad6c9b44c71b8efe3afd16bef01119b440d1a2ec9d553a22f855e0ba55793684f53d8d SHA512 a6280a02304bfae173d9e9ebf376b2d3624658f04af4d8e95d5a042e24cf0405a47c0a4023f4dbc2790716cd85e16b97fcc0a83c1534e6d554f4eb0bfb0a3ed3
|
||||
DIST sqlite-src-3480000.zip 14350897 BLAKE2B 1dafce5575cbf8eb4e7efb5c033322b887bcce38129756994da45b1d8e0cf136f337e6cb9fa3c4b5abcf1f68bff6763247bec1ad04975fc9de308e3b75fb4e54 SHA512 854832e9a5dc486a81934e36c1f1678ce50db55b8bd3c48ed2d569fb0bb7ce23d4b490c0a0f699274ff11ddf2000db4a620e064557084c54b217e7fdd836f4e1
|
||||
DIST sqlite-src-3490000.zip 14371111 BLAKE2B 895d8869b3bc0abeb5faf8cdd0de29e0d86f44fa6eafb154e0df4373161fe79c5e35d360100064778f0a3f57a232e15dc8ec73ef5e75d23a4c8ffc880d2c571d SHA512 a414c544ca4288ab475c449327b3e2136e9d01145fc8b9c723ccfd30e356cc90411ca74ae969f3fe4c8212cad4d0969b2f3a72922ee073049c25e4984336eb7c
|
||||
|
||||
75
sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
vendored
Normal file
75
sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-cppflags.patch
vendored
Normal file
@ -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
|
||||
}
|
||||
|
||||
########################################################################
|
||||
@ -24,7 +24,7 @@ else
|
||||
"
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
|
||||
#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
fi
|
||||
|
||||
LICENSE="public-domain"
|
||||
@ -51,6 +51,8 @@ fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.47.2-hwtime.h-Don-t-use-rdtsc-on-i486.patch
|
||||
# https://sqlite.org/forum/forumpost/3c2014fea4
|
||||
"${FILESDIR}"/${PN}-3.49.0-cppflags.patch
|
||||
)
|
||||
|
||||
_fossil_fetch() {
|
||||
@ -197,7 +199,8 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/compile.html#enable_fts5
|
||||
# https://sqlite.org/fts3.html
|
||||
# https://sqlite.org/fts5.html
|
||||
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
|
||||
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
|
||||
options+=( --enable-fts4 )
|
||||
options+=( --enable-fts5 )
|
||||
|
||||
# Support hidden columns.
|
||||
@ -206,7 +209,7 @@ multilib_src_configure() {
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/compile.html#enable_memsys5
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
options+=( --enable-memsys5 )
|
||||
|
||||
# Support sqlite3_normalized_sql() function.
|
||||
# https://sqlite.org/c3ref/expanded_sql.html
|
||||
@ -232,12 +235,12 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/compile.html#enable_geopoly
|
||||
# https://sqlite.org/rtree.html
|
||||
# https://sqlite.org/geopoly.html
|
||||
append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
|
||||
options+=( --enable-rtree --enable-geopoly )
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/compile.html#enable_session
|
||||
# https://sqlite.org/sessionintro.html
|
||||
append-cppflags -DSQLITE_ENABLE_SESSION
|
||||
options+=( --enable-session )
|
||||
|
||||
# Support scan status functions.
|
||||
# https://sqlite.org/compile.html#enable_stmt_scanstatus
|
||||
@ -281,8 +284,7 @@ multilib_src_configure() {
|
||||
if use icu; then
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
options+=( --with-icu-config )
|
||||
fi
|
||||
|
||||
options+=(
|
||||
@ -326,6 +328,7 @@ multilib_src_configure() {
|
||||
|
||||
# https://sqlite.org/forum/forumpost/4f4d06a9f6683bb9
|
||||
tc-export CC
|
||||
|
||||
CC_FOR_BUILD=${CC} econf "${options[@]}"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user