Apply Tizen patch

Change-Id: I2aecb482de68a71a2cee73747029ce2690f04d20
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 5e6bad5..b48787b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,20 @@
 
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE -DSQLITE_DEFAULT_AUTOVACUUM=1 -DSQLITE_DEFAULT_PAGE_SIZE=4096 -DSQLITE_SLP_FEATURE
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ \
+                               -DSQLITE_ENABLE_FTS3 \
+                               -DSQLITE_ENABLE_RTREE \
+                               -DSQLITE_ENABLE_COLUMN_METADATA \
+                               -DSQLITE_ENABLE_MEMORY_MANAGEMENT \
+                               -DSQLITE_DEFAULT_AUTOVACUUM=1 \
+                               -DSQLITE_DEFAULT_PAGE_SIZE=4096 \
+                               -Dfdatasync=fdatasync \
+                               -DSQLITE_TIZEN_FEATURE \
+                               -DSQLITE_TEMP_STORE=2 \
+                               -DHAVE_USLEEP=1 \
+                               -DSQLITE_DEFAULT_JOURNAL_SIZE_LIMIT=1048576 \
+                               -DSQLITE_DEFAULT_FILE_FORMAT=4 \
+                               -DSQLITE_POWERSAFE_OVERWRITE=1 \
+                               -DSQLITE_ENABLE_ATOMIC_WRITE \
+                               -DSQLITE_ENABLE_FTS4
 
 lib_LTLIBRARIES = libsqlite3.la
 libsqlite3_la_SOURCES = sqlite3.c

diff --git a/packaging/sqlite.spec b/packaging/sqlite.spec
index 7edcc5a..f99c373 100644 (file)
--- a/packaging/sqlite.spec
+++ b/packaging/sqlite.spec
@@ -75,7 +75,10 @@ cp %{SOURCE1001} .
 CFLAGS=`echo %{optflags} |sed -e 's/-ffast-math//g'`
 chmod +x autogen.sh
 %autogen
-%configure --disable-static --enable-threadsafe
+%configure -disable-dependency-tracking \
+       --enable-shared=yes \
+       --enable-static=no \
+       --enable-threadsafe
 make
 
 %install

diff --git a/sqlite3.c b/sqlite3.c
index b1af6ee..d00272e 100644 (file)
--- a/sqlite3.c
+++ b/sqlite3.c
@@ -46432,11 +46432,12 @@ act_like_temp_file:
     pPager->journalMode = PAGER_JOURNALMODE_OFF;
   }else if( memDb ){
     pPager->journalMode = PAGER_JOURNALMODE_MEMORY;
-#ifdef SQLITE_SLP_FEATURE
-  }else {
+  }
+#ifdef SQLITE_TIZEN_FEATURE
+  else {
     pPager->journalMode = PAGER_JOURNALMODE_PERSIST;
-#endif
   }
+#endif
   /* pPager->xBusyHandler = 0; */
   /* pPager->pBusyHandlerArg = 0; */
   pPager->xReiniter = xReinit;