Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a227ffd27cab646519df37da5aff79188e8dbfb3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a227ffd27cab646519df37da5aff79188e8dbfb3)
  • Date: Fri, 19 Aug 2011 06:46:26 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/sqlite/BUILD | 15 +++++++++------
database/sqlite/DEPENDS | 2 +-
database/sqlite/HISTORY | 5 +++++
3 files changed, 15 insertions(+), 7 deletions(-)

New commits:
commit a227ffd27cab646519df37da5aff79188e8dbfb3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sqlite: post-update corrections

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index 323ab53..14e996a 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -12,15 +12,18 @@ fi &&

LDFLAGS="-ldl $LDFLAGS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&
-OPTS="$SQLITE_TSAFE $OPTS" &&
-
-if [[ $SQLITE_VERSION != tea ]]; then
- OPTS="--enable-dynamic-extensions $OPTS"
-fi &&
+OPTS="--enable-dynamic-extensions $SQLITE_TSAFE $OPTS" &&

default_build &&

-if [[ $SQLITE_VERSION = tea ]]; then
+if [[ $SQLITE_VERSION == tea ]]; then
+ # reset options to these
+ OPTS="--with-tcl=$INSTALL_ROOT/usr/lib" &&
+
+ if list_find "$SQLITE_TSAFE" "--enable-threadsafe"; then
+ OPTS="--enable-threads $OPTS"
+ fi &&
+
cd tea &&
default_build
fi
diff --git a/database/sqlite/DEPENDS b/database/sqlite/DEPENDS
index d73aa45..0c6207f 100755
--- a/database/sqlite/DEPENDS
+++ b/database/sqlite/DEPENDS
@@ -1,7 +1,7 @@
depends -sub CXX gcc &&

if [[ $SQLITE_VERSION == tea ]]; then
- depends tcl "--enable-tcl"
+ depends tcl
fi &&

optional_depends readline \
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index fe25c3f..6235138 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,8 @@
+2011-08-19 Vlad Glagolev <stealth AT sourcemage.org>
+ * BUILD: always enable dynamic extensions for sqlite binary (tea
library
+ is built for its own); corrected configure flags for tea version
+ * DEPENDS: tcl flag isn't required anymore
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (a227ffd27cab646519df37da5aff79188e8dbfb3), Vlad Glagolev, 08/19/2011

Archive powered by MHonArc 2.6.24.

Top of Page