Skip to Content.
Sympa Menu

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

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 (6cad6d6809e006f8d14939fc71ccf30d4d7b3c94)
  • Date: Thu, 13 Nov 2008 01:18:47 -0600

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

database/sqlite/BUILD | 4 +++-
database/sqlite/CONFIGURE | 4 +++-
database/sqlite/DETAILS | 4 ++--
database/sqlite/HISTORY | 7 +++++++
database/sqlite/PRE_BUILD | 2 +-
database/sqlite/mk.diff | 20 --------------------
6 files changed, 16 insertions(+), 25 deletions(-)

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

sqlite: => 3.6.5

diff --git a/database/sqlite/BUILD b/database/sqlite/BUILD
index b076b4d..bfd25d7 100755
--- a/database/sqlite/BUILD
+++ b/database/sqlite/BUILD
@@ -1,5 +1,7 @@
if [[ $SQLITE_META == y ]];then
CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
fi &&
-OPTS="$OPTS $SQLITE_TSAFE" &&
+
+OPTS="$SQLITE_TSAFE $OPTS" &&
+
default_build
diff --git a/database/sqlite/CONFIGURE b/database/sqlite/CONFIGURE
index 3f9c270..b747df4 100755
--- a/database/sqlite/CONFIGURE
+++ b/database/sqlite/CONFIGURE
@@ -1,3 +1,5 @@
config_query SQLITE_META "enable column metadata?" y &&
+
config_query_option SQLITE_TSAFE "Build thread-safe SQLite?" y \
- "--enable-threadsafe" "--disable-threadsafe"
+ "--enable-threadsafe" \
+ "--disable-threadsafe"
diff --git a/database/sqlite/DETAILS b/database/sqlite/DETAILS
index 0b4594b..4ef3d30 100755
--- a/database/sqlite/DETAILS
+++ b/database/sqlite/DETAILS
@@ -1,6 +1,6 @@
SPELL=sqlite
- VERSION=3.6.4
-
SOURCE_HASH=sha512:9f8ee940630823bbf98632383a99d54b4a17ed265de023b1621c3e412a25653179358b755a79f5f2c324210dba0e0cdfa2f607e81a83866026da326a6f043cf6
+ VERSION=3.6.5
+
SOURCE_HASH=sha512:0e9cc2880fbff2bb2c6159d072aa6986c9c1a204c30bf52d7c183391a391fa4d15f9fde7476fbf60a2c047a1e8420b532297fdc71a3729b847c2e778fa9148af
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=http://sqlite.org/$SOURCE
diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 56bf86a..28d1b58 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,10 @@
+2008-11-13 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.6.5
+ * BUILD: put $OPTS in the end
+ * CONFIGURE: improved some readability
+ * PRE_BUILD: don't use a patch, $(OPTS) => $(_OPTS) instead
+ * mk.diff: removed
+
2008-10-25 Treeve Jelbert <treeve AT sourcemage.org>
* BUILD, CONFIGURE: extra option "enable column metadata?"

diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
index 9547fef..0efa151 100755
--- a/database/sqlite/PRE_BUILD
+++ b/database/sqlite/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/mk.diff"
+sed -i "s:OPTS:_OPTS:g" Makefile.in
diff --git a/database/sqlite/mk.diff b/database/sqlite/mk.diff
deleted file mode 100644
index 8e06fd6..0000000
--- a/database/sqlite/mk.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig 2008-08-05 23:58:48.000000000 +0400
-+++ Makefile.in 2008-08-06 16:10:20.490375400 +0400
-@@ -603,7 +603,7 @@
-
- parse.c: $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopcodes.awk
- cp $(TOP)/src/parse.y .
-- ./lemon$(BEXE) $(OPTS) $(OPT_FEATURE_FLAGS) parse.y
-+ ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) parse.y
- mv parse.h parse.h.temp
- $(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
-
-@@ -639,7 +639,7 @@
- $(LTCOMPILE) -c $(TOP)/src/tokenize.c
-
- keywordhash.h: $(TOP)/tool/mkkeywordhash.c
-- $(BCC) -o mkkeywordhash$(BEXE) $(OPTS) $(OPT_FEATURE_FLAGS)
$(TOP)/tool/mkkeywordhash.c
-+ $(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS)
$(TOP)/tool/mkkeywordhash.c
- ./mkkeywordhash$(BEXE) >keywordhash.h
-
- trigger.lo: $(TOP)/src/trigger.c $(HDR)



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6cad6d6809e006f8d14939fc71ccf30d4d7b3c94), Vlad Glagolev, 11/13/2008

Archive powered by MHonArc 2.6.24.

Top of Page