Attachment 251173 Details for Bug 279397 – Build www/chromium with proposed upstreamable fix.

[patch] Build www/chromium with proposed upstreamable fix.

www-chromium-Fix-sqlite3_shim.c-compilation-error.patch (text/plain), 2.62 KB, created by Florian Walpen on 2024-06-03 01:26:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Walpen

Created: 2024-06-03 01:26:53 UTC

Size: 2.62 KB

patch

obsolete

>From 30df3a2a1de454f7726252d4ca87713f0ce0df5d Mon Sep 17 00:00:00 2001
>From: Florian Walpen <dev@submerge.ch>
>Date: Mon, 3 Jun 2024 02:41:43 +0200
>Subject: [PATCH] www/chromium: Fix sqlite3_shim.c compilation error.
>
>SQLite upstream erroneously sets _XOPEN_SOURCE to restrict included system
>headers to POSIX with XSI extension. This conflicts with SQLITE_USE_ALLOCA
>(enabled by default) turning on alloca() from stdlib.h, which is not in POSIX:
>
>In file included from ../../third_party/sqlite/sqlite3_shim.c:16:
>../../third_party/sqlite/src/amalgamation/sqlite3.c:53619:21: error: call to undeclared function 'alloca'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
> 53619 |     u32 *aiValues = sqlite3StackAllocRaw(0, sizeof(p->u.aHash));
>       |                     ^
>../../third_party/sqlite/src/amalgamation/sqlite3.c:20536:38: note: expanded from macro 'sqlite3StackAllocRaw'
> 20536 | # define sqlite3StackAllocRaw(D,N)   alloca(N)
>       |                                      ^
>../../third_party/sqlite/src/amalgamation/sqlite3.c:53619:10: error: incompatible integer to pointer conversion initializing 'u32 *' (aka 'unsigned int *') with an expression of type 'int' [-Wint-conversion]
> 53619 |     u32 *aiValues = sqlite3StackAllocRaw(0, sizeof(p->u.aHash));
>       |          ^          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
>Reported by:	kib
>PR:		279397
>---
> ...h-third__party_sqlite_src_amalgamation_sqlite3.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
>index 60315a0018ee..b73c6690a0d9 100644
>--- a/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
>+++ b/www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c
>@@ -1,5 +1,14 @@
>---- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-05-21 18:07:39 UTC
>-+++ third_party/sqlite/src/amalgamation/sqlite3.c
>+--- third_party/sqlite/src/amalgamation/sqlite3.c.orig	2024-05-24 00:40:42.096813200 +0200
>++++ third_party/sqlite/src/amalgamation/sqlite3.c	2024-06-03 01:48:47.640404000 +0200
>+@@ -14119,7 +14119,7 @@ struct fts5_api {
>+ ** But _XOPEN_SOURCE define causes problems for Mac OS X, so omit
>+ ** it.
>+ */
>+-#if !defined(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__)
>++#if defined(_POSIX_C_SOURCE) && !defined(_XOPEN_SOURCE)
>+ #  define _XOPEN_SOURCE 600
>+ #endif
>+ 
> @@ -44777,7 +44777,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB
>    memset(zBuf, 0, nBuf);
>    randomnessPid = osGetpid(0);
>-- 
>2.45.1
>

Actions: View | Diff

Attachments on bug 279397: 251083 | 251127 | 251173