Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.48 grimoire by George Sherwood (ceef7c700b9a24a543ccee390e48a80c456f50ba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.48 grimoire by George Sherwood (ceef7c700b9a24a543ccee390e48a80c456f50ba)
  • Date: Sun, 12 Sep 2010 15:50:38 -0500

GIT changes to stable-rc-0.48 grimoire by George Sherwood
<gsherwood AT sourcemage.org>:

database/sqlite/BUILD | 4 ++++
database/sqlite/CONFIGURE | 2 ++
database/sqlite/HISTORY | 8 ++++++++
database/sqlite/PRE_SUB_DEPENDS | 3 ++-
database/sqlite/REPAIR^all^PRE_SUB_DEPENDS | 3 ++-
database/sqlite/SUB_DEPENDS | 2 ++
6 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit ceef7c700b9a24a543ccee390e48a80c456f50ba
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: Hopefully have it right this time. I think many of these
PRE_SUB_DEPENDS need to be looked at.
(cherry picked from commit 5269af3642570c489b8d7736975de9921a31c789)

commit 645a5f192d798a7b52282a0d45f968a8adcb5164
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: Fix logic in PRE_SUB_DEPENDS. This is why sqlite was
not getting queued when casting xulrunner
(cherry picked from commit 895e1fe67613672eaeece37cd2c9472dd8a3e581)

commit 96812aaa2a9b4b39f8913e04958cb816e9d9357d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: added option SECURE_DELETE to *SUB_DEPENDS
(cherry picked from commit a3810d41ac02d7dd70de9f3d86fdc521360e9405)

commit f683b030db4cda00bf96762aae51c933a2d91f93
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: George Sherwood <gsherwood AT sourcemage.org>

sqlite: added option SQLITE_SECURE_DELETE

seems xulrunner needs it
after testing i ann SUB_DEPENDS
(cherry picked from commit 575eeb59f7be4f9fafd5d8a56a9056b28d4f8353)

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index a13b5ea..6b3242d 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -2,6 +2,10 @@ if [[ $SQLITE_META == y ]]; then
CFLAGS="-DSQLITE_ENABLE_COLUMN_METADATA=1 $CFLAGS"
fi &&

+if [[ $SQLITE_SECURE_DELETE == y ]]; then
+ CFLAGS="-DSQLITE_SECURE_DELETE $CFLAGS"
+fi &&
+
LDFLAGS="-ldl $LDFLAGS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&
OPTS="--enable-load-extension $SQLITE_TSAFE $OPTS" &&
diff --git a/database/sqlite/CONFIGURE b/database/sqlite/CONFIGURE
index 7db038a..816ddee 100755
--- a/database/sqlite/CONFIGURE
+++ b/database/sqlite/CONFIGURE
@@ -1,5 +1,7 @@
config_query SQLITE_META "Enable column metadata?" y &&

+config_query SQLITE_SECURE_DELETE "Compiled with SQLITE_SECURE_DELETE?" n &&
+
config_query_option SQLITE_TSAFE "Build thread-safe SQLite?" y \
"--enable-threadsafe" \
"--disable-threadsafe"
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index c11a59a..ac4185c 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,11 @@
+2010-09-12 George Sherwood <gsherwood AT sourcemage.org>
+ PRE_SUB_DEPENDS: Fixed logic
+ REPAIR^all^PRE_SUB_DEPENDS: Fixed logic
+
+2010-09-08 Ladislav Hagara <hgr AT vabo.cz>
+ * CONFIGURE, BUILD: added option SQLITE_SECURE_DELETE
+ * {,PRE_,REPAIR^all^PRE_}SUB_DEPENDS: added option SECURE_DELETE
+
2010-08-24 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 3.7.2

diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index df05602..637246f 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
TCL) is_depends_enabled $SPELL tcl ;;
- TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0;
fi ;;
+ TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1;
fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
index df05602..637246f 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,7 @@
case $THIS_SUB_DEPENDS in
TCL) is_depends_enabled $SPELL tcl ;;
- TSAFE) if [[ $SQLITE_TSAFE == "--enable-threadsafe" ]]; then return 0;
fi ;;
+ TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1;
fi ;;
+SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/database/sqlite/SUB_DEPENDS b/database/sqlite/SUB_DEPENDS
index 3877564..934f82a 100755
--- a/database/sqlite/SUB_DEPENDS
+++ b/database/sqlite/SUB_DEPENDS
@@ -3,6 +3,8 @@ case $THIS_SUB_DEPENDS in
depends tcl "--enable-tcl" ;;
TSAFE) message "Thread support requested, forcing it" &&
SQLITE_TSAFE="--enable-threadsafe" ;;
+SECURE_DELETE) message "SECURE_DELETE requested, forcing it" &&
+ SQLITE_SECURE_DELETE=y ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to stable-rc-0.48 grimoire by George Sherwood (ceef7c700b9a24a543ccee390e48a80c456f50ba), George Sherwood, 09/12/2010

Archive powered by MHonArc 2.6.24.

Top of Page