Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (dab4b62eb3d745de4b4ae71b840cf8f9e15edf09)

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 master grimoire by George Sherwood (dab4b62eb3d745de4b4ae71b840cf8f9e15edf09)
  • Date: Tue, 22 Mar 2011 20:39:38 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

database/sqlite/BUILD | 4 ++++
database/sqlite/CONFIGURE | 2 ++
database/sqlite/HISTORY | 5 +++++
database/sqlite/PRE_SUB_DEPENDS | 1 +
database/sqlite/REPAIR^all^PRE_SUB_DEPENDS | 1 +
database/sqlite/SUB_DEPENDS | 2 ++
6 files changed, 15 insertions(+)

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

sqlite: Added new option required by firefox 4.0.
ENABLE_UNLOCK_NOTIFY

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index 42369d8..fd20cb4 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -6,6 +6,10 @@ if [[ $SQLITE_SECURE_DELETE == y ]]; then
CFLAGS="-DSQLITE_SECURE_DELETE $CFLAGS"
fi &&

+if [[ $SQLITE_ENABLE_UNLOCK == y ]]; then
+ CFLAGS="-DSQLITE_ENABLE_UNLOCK_NOTIFY $CFLAGS"
+fi &&
+
LDFLAGS="-ldl $LDFLAGS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&
OPTS="$SQLITE_TSAFE $OPTS" &&
diff --git a/database/sqlite/CONFIGURE b/database/sqlite/CONFIGURE
index 615eb77..5e50ae5 100755
--- a/database/sqlite/CONFIGURE
+++ b/database/sqlite/CONFIGURE
@@ -2,6 +2,8 @@ config_query SQLITE_META "Enable column metadata?" y &&

config_query SQLITE_SECURE_DELETE "Compile with SQLITE_SECURE_DELETE?" n &&

+config_query SQLITE_ENABLE_UNLOCK "Compile with SQLITE_ENABLE_UNLOCK_NOTIFY"
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 b3bf06a..0e31764 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,8 @@
+2011-03-22 George Sherwood <gsherwood AT sourcemage.org>
+ * PRE_SUB_DEPENDS: Added new sub_depends for firefox4
+ * SUB_DEPENDS: Added new sub_depends for firefox4
+ * REPARE^all^PRE_SUB_DEPENDS: Updated
+
2011-02-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: added tea version
* PREPARE: added, to use tea version
diff --git a/database/sqlite/PRE_SUB_DEPENDS b/database/sqlite/PRE_SUB_DEPENDS
index 76eff71..b6d23df 100755
--- a/database/sqlite/PRE_SUB_DEPENDS
+++ b/database/sqlite/PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
TCL) [[ $SQLITE_VERSION == tea ]] ;;
TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1;
fi ;;
SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
+ENABLE_UNLOCK_NOTIFY) if [[ $SQLITE_ENABLE_UNLOCK != "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 76eff71..b6d23df 100755
--- a/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
+++ b/database/sqlite/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
TCL) [[ $SQLITE_VERSION == tea ]] ;;
TSAFE) if [[ $SQLITE_TSAFE != "--enable-threadsafe" ]]; then return 1;
fi ;;
SECURE_DELETE) if [[ $SQLITE_SECURE_DELETE != "y" ]]; then return 1; fi ;;
+ENABLE_UNLOCK_NOTIFY) if [[ $SQLITE_ENABLE_UNLOCK != "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 a28e3ec..f343e17 100755
--- a/database/sqlite/SUB_DEPENDS
+++ b/database/sqlite/SUB_DEPENDS
@@ -7,6 +7,8 @@ case $THIS_SUB_DEPENDS in
SQLITE_TSAFE="--enable-threadsafe" ;;
SECURE_DELETE) message "SECURE_DELETE requested, forcing it" &&
SQLITE_SECURE_DELETE=y ;;
+ENABLE_UNLOCK_NOTIFY) message "ENABLE UNLOCK NOTIFY requested, forcing it" &&
+ SQLITE_ENABLE_UNLOCK=y ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (dab4b62eb3d745de4b4ae71b840cf8f9e15edf09), George Sherwood, 03/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page