Skip to Content.
Sympa Menu

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

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 (ba8596f56fe1ceeb9233466671f465259fb4ca43)
  • Date: Tue, 24 Feb 2009 13:26:05 -0600

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

database/sqlite/HISTORY | 4 ++++
database/sqlite/PRE_BUILD | 2 +-
database/sqlite/sqlite-makefile.patch | 27 +++++++++++++++++++++++----
3 files changed, 28 insertions(+), 5 deletions(-)

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

sqlite: yet another compilation fix

diff --git a/database/sqlite/HISTORY b/database/sqlite/HISTORY
index 69327c2..61f286d 100644
--- a/database/sqlite/HISTORY
+++ b/database/sqlite/HISTORY
@@ -1,3 +1,7 @@
+2009-02-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: SPELL > SCRIPT; quoting paths
+ * sqlite-makefile.patch: really fix compilation
+
2009-02-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 3.6.11
* PRE_BUILD: Added patch
diff --git a/database/sqlite/PRE_BUILD b/database/sqlite/PRE_BUILD
index 3435152..1732efa 100755
--- a/database/sqlite/PRE_BUILD
+++ b/database/sqlite/PRE_BUILD
@@ -1,6 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < $SCRIPT_DIRECTORY/sqlite-makefile.patch &&
+patch -p0 < "$SPELL_DIRECTORY/sqlite-makefile.patch" &&

sed -i "s:OPTS:_OPTS:g" Makefile.in
diff --git a/database/sqlite/sqlite-makefile.patch
b/database/sqlite/sqlite-makefile.patch
index cb36349..ce0f906 100644
--- a/database/sqlite/sqlite-makefile.patch
+++ b/database/sqlite/sqlite-makefile.patch
@@ -1,6 +1,25 @@
---- Makefile.in 2009/02/03 16:51:25 1.258
-+++ Makefile.in 2009/02/18 04:34:00 1.259
-@@ -765,9 +765,11 @@
+--- Makefile.in.orig 2009-02-15 16:07:08.000000000 +0300
++++ Makefile.in 2009-02-24 22:23:28.691378458 +0300
+@@ -163,7 +163,7 @@
+
+ # Object files for the SQLite library (non-amalgamation).
+ #
+-OBJS0 = alter.lo analyze.lo attach.lo auth.lo bitvec.lo btmutex.lo \
++OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.lo bitvec.lo
btmutex.lo \
+ btree.lo build.lo callback.lo complete.lo date.lo \
+ delete.lo expr.lo fault.lo func.lo global.lo \
+ hash.lo journal.lo insert.lo legacy.lo loadext.lo \
+@@ -518,6 +518,9 @@
+ auth.lo: $(TOP)/src/auth.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/auth.c
+
++backup.lo: $(TOP)/src/backup.c $(HDR)
++ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/backup.c
++
+ bitvec.lo: $(TOP)/src/bitvec.c $(HDR)
+ $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/bitvec.c
+
+@@ -765,9 +768,11 @@
$(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL)


@@ -13,7 +32,7 @@
$(INSTALL) -d $(DESTDIR)$(bindir)
$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
$(INSTALL) -d $(DESTDIR)$(includedir)
-@@ -778,7 +780,7 @@
+@@ -778,7 +783,7 @@

pkgIndex.tcl:
echo 'package ifneeded sqlite3 $(RELEASE) [list load
$(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ba8596f56fe1ceeb9233466671f465259fb4ca43), Vlad Glagolev, 02/24/2009

Archive powered by MHonArc 2.6.24.

Top of Page