Date: Sat, 22 Jun 2024 23:12:14 GMT From: Hiroki Tagato <tagattie@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 65456c4820ca - main - devel/electron29: fix build error regarding alloca in sqlite Message-ID: <202406222312.45MNCEHe073160@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=65456c4820cabf881f62cb2d3048d792cf4c121d commit 65456c4820cabf881f62cb2d3048d792cf4c121d Author: Hiroki Tagato <tagattie@FreeBSD.org> AuthorDate: 2024-06-22 23:09:07 +0000 Commit: Hiroki Tagato <tagattie@FreeBSD.org> CommitDate: 2024-06-22 23:12:06 +0000 devel/electron29: fix build error regarding alloca in sqlite The error was: In file included from ../../third_party/sqlite/sqlite3_shim.c:16: ../../third_party/sqlite/src/amalgamation/sqlite3.c:53602:21: warning: call to undeclared function 'alloca'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] 53602 | u32 *aiValues = sqlite3StackAllocRaw(0, sizeof(p->u.aHash)); | ^ ../../third_party/sqlite/src/amalgamation/sqlite3.c:20531:38: note: expanded from macro 'sqlite3StackAllocRaw' 20531 | # define sqlite3StackAllocRaw(D,N) alloca(N) | ^ ../../third_party/sqlite/src/amalgamation/sqlite3.c:53602:10: error: incompatible integer to pointer conversion initializing 'u32 *' (aka 'unsigned int *') with an expression of type 'int' [-Wint-conversion] 53602 | u32 *aiValues = sqlite3StackAllocRaw(0, sizeof(p->u.aHash)); | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PR: 279802 Reported by: Naram Qashat <cyberbotx@cyberbotx.com> Obtained from: https://cgit.freebsd.org/ports/commit/?id=4ba66b974729b45f6c2418d87d7403ef2e7b474d --- .../patch-third__party_sqlite_src_amalgamation_sqlite3.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/devel/electron29/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/devel/electron29/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index daff487c92a6..be4949074ad2 100644 --- a/devel/electron29/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/devel/electron29/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,5 +1,14 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-02-21 00:21:59 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2024-04-06 21:39:37 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c +@@ -14049,7 +14049,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(_XOPEN_SOURCE) && !defined(__DARWIN__) && !defined(__APPLE__) && !defined(__FreeBSD__) + # define _XOPEN_SOURCE 600 + #endif + @@ -44505,7 +44505,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406222312.45MNCEHe073160>