bug 1174747 - Fix sqlite3 build on iOS. r=glandium draft
authorTed Mielczarek <ted@mielczarek.org>
Thu, 07 May 2015 08:39:13 -0400
changeset 274820 2693c2ebf336fcf542360415ccb9a11c31195eb5
parent 274819 efb5419372262a70dcc3ad707265abe31a491046
child 274821 363cf302c7573042d31f12e81e18e386ed56c969
push id3129
push usertmielczarek@mozilla.com
push dateTue, 30 Jun 2015 19:50:34 +0000
reviewersglandium
bugs1174747
milestone41.0a1
bug 1174747 - Fix sqlite3 build on iOS. r=glandium
db/sqlite3/src/moz.build
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -48,16 +48,20 @@ DEFINES['SQLITE_MAX_SCHEMA_RETRY'] = 25
 # because we don't support Win9x.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['SQLITE_WIN32_GETVERSIONEX'] = 0
 
 # -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
+
 # 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'