Bug 1252937 - Build sqlite with -DSQLITE_ENABLE_FTS3_TOKENIZER to get the two-argument version of fts3_tokenizer() function back. r=asuth
authoraceman <acelists@atlas.sk>
Thu, 03 Mar 2016 11:10:00 -0500
changeset 324968 8c722751004948a62ec4a3fd602d585b4f888902
parent 324967 ff7425016da80e34232335b28a0fdd10e94e8251
child 324969 3b4044bc67e93e1720c6c4f40ccc8d069c4d41ea
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersasuth
bugs1252937
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1252937 - Build sqlite with -DSQLITE_ENABLE_FTS3_TOKENIZER to get the two-argument version of fts3_tokenizer() function back. r=asuth
db/sqlite3/src/moz.build
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -55,16 +55,20 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
 # -DSQLITE_ENABLE_LOCKING_STYLE=1 to help with AFP folders
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['SQLITE_ENABLE_LOCKING_STYLE'] = 1
 
 # sqlite defaults this to on on __APPLE_ but it breaks on newer iOS SDKs
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
     DEFINES['SQLITE_ENABLE_LOCKING_STYLE'] = 0
 
+# Thunderbird needs the 2-argument version of fts3_tokenizer()
+if CONFIG['MOZ_THUNDERBIRD'] or CONFIG['MOZ_SUITE']:
+    DEFINES['SQLITE_ENABLE_FTS3_TOKENIZER'] = 1
+
 # Turn on SQLite's assertions in debug builds.
 if CONFIG['MOZ_DEBUG']:
     DEFINES['SQLITE_DEBUG'] = 1
 
 if CONFIG['OS_TARGET'] == 'Android':
     # default to user readable only to fit Android security model
     DEFINES['SQLITE_DEFAULT_FILE_PERMISSIONS'] = '0600'