commit 6e9258b7b1900505463c8030f807fe32465434e7
parent 41c023eeef45227aff4d31bb4ea958f572857d77
Author: Iván Ávalos <avalos@disroot.org>
Date: Wed, 11 Mar 2026 09:04:29 +0100
refactor sqlite flags in meson.build
Diffstat:
| M | meson.build | | | 64 | ++++++++++++++++++++++++++++++++++------------------------------ |
1 file changed, 34 insertions(+), 30 deletions(-)
diff --git a/meson.build b/meson.build
@@ -16,35 +16,6 @@ flags = [
'-fno-omit-frame-pointer',
]
-if host_machine.system() == 'android'
- flags += [
- '-DHAVE_USLEEP=1',
- '-DSQLITE_HAVE_ISNAN',
- '-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576',
- '-DSQLITE_THREADSAFE=2',
- '-DSQLITE_TEMP_STORE=3',
- '-DSQLITE_POWERSAFE_OVERWRITE=1',
- '-DSQLITE_DEFAULT_FILE_FORMAT=4',
- '-DSQLITE_DEFAULT_AUTOVACUUM=1',
- '-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1',
- '-DSQLITE_ENABLE_FTS3',
- '-DSQLITE_ENABLE_FTS3_PARENTHESIS',
- '-DSQLITE_ENABLE_FTS4',
- '-DSQLITE_ENABLE_FTS4_PARENTHESIS',
- '-DSQLITE_ENABLE_FTS5',
- '-DSQLITE_ENABLE_FTS5_PARENTHESIS',
- '-DSQLITE_ENABLE_JSON1',
- '-DSQLITE_ENABLE_RTREE=1',
- '-DSQLITE_UNTESTABLE',
- '-DSQLITE_OMIT_COMPILEOPTION_DIAGS',
- '-DSQLITE_DEFAULT_FILE_PERMISSIONS=0600',
- '-DSQLITE_DEFAULT_MEMSTATUS=0',
- '-DSQLITE_MAX_EXPR_DEPTH=0',
- '-DSQLITE_USE_ALLOCA',
- '-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE',
- ]
-endif
-
add_project_arguments(flags, language : 'c')
add_project_arguments(flags, language : 'c', native : true)
@@ -104,7 +75,39 @@ quickjs = static_library('quickjs', 'quickjs/quickjs.c')
if host_machine.system() == 'ios'
sqlite3_dep = cc.find_library('sqlite3', required : true)
else
- sqlite3 = static_library('sqlite3', 'sqlite3/sqlite3.c')
+ sqlite_cargs = []
+ if host_machine.system() == 'android'
+ # flags taken from AOSP
+ sqlite_cargs += [
+ '-DNDEBUG=1',
+ '-DHAVE_USLEEP=1',
+ '-DSQLITE_HAVE_ISNAN',
+ '-DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576',
+ '-DSQLITE_THREADSAFE=2',
+ '-DSQLITE_TEMP_STORE=3',
+ '-DSQLITE_POWERSAFE_OVERWRITE=1',
+ '-DSQLITE_DEFAULT_FILE_FORMAT=4',
+ '-DSQLITE_DEFAULT_AUTOVACUUM=1',
+ '-DSQLITE_ENABLE_MEMORY_MANAGEMENT=1',
+ '-DSQLITE_ENABLE_FTS3',
+ '-DSQLITE_ENABLE_FTS3_PARENTHESIS',
+ '-DSQLITE_ENABLE_FTS4',
+ '-DSQLITE_ENABLE_FTS4_PARENTHESIS',
+ '-DSQLITE_ENABLE_FTS5',
+ '-DSQLITE_ENABLE_FTS5_PARENTHESIS',
+ '-DSQLITE_ENABLE_JSON1',
+ '-DSQLITE_ENABLE_RTREE=1',
+ '-DSQLITE_UNTESTABLE',
+ '-DSQLITE_OMIT_COMPILEOPTION_DIAGS',
+ '-DSQLITE_DEFAULT_FILE_PERMISSIONS=0600',
+ '-DSQLITE_DEFAULT_MEMSTATUS=0',
+ '-DSQLITE_MAX_EXPR_DEPTH=0',
+ '-DSQLITE_USE_ALLOCA',
+ '-DSQLITE_ENABLE_BATCH_ATOMIC_WRITE',
+ ]
+ endif
+
+ sqlite3 = static_library('sqlite3', 'sqlite3/sqlite3.c', c_args : sqlite_cargs)
endif
# avoid warning but compile more slowly on non-cross builds
@@ -262,6 +265,7 @@ if host_machine.system() == 'ios'
else
talerwalletcore_cargs = []
if host_machine.system() == 'android'
+ # no cURL, Android is using native networking
talerwalletcore_cargs += ['-DNO_CURL']
endif
talerwalletcore_lib = shared_library('talerwalletcore', 'taler_wallet_core_lib.c',
