diff options
| author | Hiroki Tagato <tagattie@FreeBSD.org> | 2024-06-23 08:09:07 +0900 |
|---|---|---|
| committer | Hiroki Tagato <tagattie@FreeBSD.org> | 2024-06-23 08:12:06 +0900 |
| commit | 65456c4820cabf881f62cb2d3048d792cf4c121d (patch) | |
| tree | 95fbaca05aad7d6b513954b51565f825ff099da7 | |
| parent | devel/libexplain: fix build with llvm15+ from base (diff) | |
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
| -rw-r--r-- | devel/electron29/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c | 11 |
1 files changed, 10 insertions, 1 deletions
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); |