From 41735b2e65ccd15d224f19d0079a004f1b4b72d0 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 17 Feb 2025 07:05:38 +0000 Subject: [PATCH] dev-db/sqlite: Sync with Gentoo It's from Gentoo commit 792d9b35c36dbb8ab61ef7765ed5c39dd920a9f1. --- .../files/sqlite-3.49.0-icu-tests.patch | 29 +++++++++++++++++++ .../dev-db/sqlite/sqlite-3.49.0.ebuild | 9 +++--- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-icu-tests.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-icu-tests.patch b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-icu-tests.patch new file mode 100644 index 0000000000..8211d1a146 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/files/sqlite-3.49.0-icu-tests.patch @@ -0,0 +1,29 @@ +https://sqlite.org/forum/forumpost/f93323a743 +https://sqlite.org/src/info/5964616dc9de9323 +--- a/test/like3.test ++++ b/test/like3.test +@@ -302,15 +302,23 @@ + } + + #------------------------------------------------------------------------- + reset_db + ++# See forum thread https://sqlite.org/forum/info/d7b90d92ffbfc61f + foreach enc { + UTF-8 + UTF-16le + UTF-16be + } { ++ ifcapable icu { ++ if {$enc=="UTF-8"} { ++ # The invalid UTF8 used in these tests is incompatible with ICU ++ # https://sqlite.org/forum/forumpost/2ca8a09a7e ++ continue ++ } ++ } + foreach {tn expr} { + 1 "CAST (X'FF' AS TEXT)" + 2 "CAST (X'FFBF' AS TEXT)" + 3 "CAST (X'FFBFBF' AS TEXT)" + 4 "CAST (X'FFBFBFBF' AS TEXT)" + diff --git a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.49.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.49.0.ebuild index d8e44a4179..12a1086d07 100644 --- a/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.49.0.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-db/sqlite/sqlite-3.49.0.ebuild @@ -53,6 +53,8 @@ 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 + # https://sqlite.org/forum/forumpost/f93323a743 + "${FILESDIR}"/${PN}-3.49.0-icu-tests.patch ) _fossil_fetch() { @@ -141,9 +143,6 @@ src_unpack() { } src_prepare() { - - # Avoid stripping during the install phase - sed -i -e 's/$(INSTALL) -s /$(INSTALL) /' main.mk || die default multilib_copy_sources @@ -327,9 +326,9 @@ multilib_src_configure() { options+=( --soname=legacy ) # https://sqlite.org/forum/forumpost/4f4d06a9f6683bb9 - tc-export CC + tc-export_build_env BUILD_CC - CC_FOR_BUILD=${CC} econf "${options[@]}" + CC_FOR_BUILD=${BUILD_CC} econf "${options[@]}" } multilib_src_compile() {