From: drh <drh@noemail.net>
Date: Tue, 5 Aug 2008 21:42:37 +0000 (+0000)
Subject: Revise build scripts in set SQLITE_ENABLE_COLUMN_METADATA on DLLs. (CVS 5539)
X-Git-Tag: version-3.6.10~638
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66f9de030e7428da1745d6544133235b7b01340a;p=thirdparty%2Fsqlite.git

Revise build scripts in set SQLITE_ENABLE_COLUMN_METADATA on DLLs. (CVS 5539)

FossilOrigin-Name: ce5daa0359a05f992546f23a3fe8285ffb132204
---

diff --git a/manifest b/manifest
index e6bb212c67..35e5e8875a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sreference\sto\ssnprintf()\sin\stest8.c.\s(CVS\s5538)
-D 2008-08-05T21:36:07
+C Revise\sbuild\sscripts\sin\sset\sSQLITE_ENABLE_COLUMN_METADATA\son\sDLLs.\s(CVS\s5539)
+D 2008-08-05T21:42:37
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2713ea64947be3b35f35d9a3158bb8299c90b019
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -77,13 +77,13 @@ F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
 F main.mk eace65a99d12045ca496069dc707405a63197006
-F mkdll.sh ce8c8cc3528d63eda1702eb65b17c2d710eb3b89
+F mkdll.sh 79d1ed6ae221c10589dd969f130f8a3cccfffbb7
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
 F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1
 F mkopcodeh.awk 513946ce4429bf2723aef0d640eb4d2493deb68e
-F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
-F publish.sh 5efba7d327e0acf6633136f7f096c88aaa26df73
+F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
+F publish.sh 9627b915d2bfd736c768f3707fbd583733799f60
 F publish_osx.sh 2ad2ee7d50632dff99949edc9c162dbb052f7534
 F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in c322c6244c6395955dca34d87955aabde7df7623
@@ -617,7 +617,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c4e9b824062ba82a8db01cd82e3e681de1940208
-R d668f4d0e581aa72cbf7ada1bb89b25c
+P 32d32b743642c2f6d9e4f8845a9cd07e4f83f4cd
+R 5539a6792926c886cda0a8d37de9907c
 U drh
-Z 6745878cb5281dcc7fff4d9cfbc49816
+Z dc18ba5e2f63ddf7d939b1c61274639f
diff --git a/manifest.uuid b/manifest.uuid
index e1f5b787e8..f68cbe1cf8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-32d32b743642c2f6d9e4f8845a9cd07e4f83f4cd
\ No newline at end of file
+ce5daa0359a05f992546f23a3fe8285ffb132204
\ No newline at end of file
diff --git a/mkdll.sh b/mkdll.sh
index b7e38206b6..ec56fcd96c 100644
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -10,8 +10,10 @@ make sqlite3.c
 PATH=$PATH:/opt/mingw/bin
 TCLDIR=/home/drh/tcltk/846/win/846win
 TCLSTUBLIB=$TCLDIR/libtcl84stub.a
-OPTS='-DUSE_TCL_STUBS=1 -DSQLITE_THREADSAFE=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
+OPTS='-DUSE_TCL_STUBS=1 -DBUILD_sqlite=1 -DSQLITE_OS_WIN=1'
+OPTS="$OPTS -DSQLITE_THREADSAFE=1"
 OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
+OPTS="$OPTS -DSQLITE_ENABLE_COLUMN_METADATA=1"
 CC="i386-mingw32msvc-gcc -Os $OPTS -Itsrc -I$TCLDIR"
 NM="i386-mingw32msvc-nm"
 CMD="$CC -c sqlite3.c"
diff --git a/mkso.sh b/mkso.sh
index 9050d74255..6f2e8e25ed 100644
--- a/mkso.sh
+++ b/mkso.sh
@@ -12,6 +12,9 @@ rm shell.c
 TCLDIR=/home/drh/tcltk/846/linux/846linux
 TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
 OPTS='-DUSE_TCL_STUBS=1 -DNDEBUG=1 -DHAVE_DLOPEN=1'
+OPTS="$OPTS -DSQLITE_THREADSAFE=1"
+OPTS="$OPTS -DSQLITE_ENABLE_FTS3=1"
+OPTS="$OPTS -DSQLITE_ENABLE_COLUMN_METADATA=1"
 for i in *.c; do
   if test $i != 'keywordhash.c'; then
     CMD="cc -fPIC $OPTS -O2 -I. -I$TCLDIR -c $i"
diff --git a/publish.sh b/publish.sh
index dca30b7a91..370dc6a0bc 100644
--- a/publish.sh
+++ b/publish.sh
@@ -54,6 +54,7 @@ TCLDIR=/home/drh/tcltk/846/linux/846linux
 TCLSTUBLIB=$TCLDIR/libtclstub8.4g.a
 CFLAGS="-Os -DSQLITE_ENABLE_FTS3=3 -DSQLITE_ENABLE_RTREE=1"
 CFLAGS="$CFLAGS -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1"
+CFLAGS="$CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1"
 echo '***** BUILDING shared libraries for linux'
 gcc $CFLAGS -shared tclsqlite3.c $TCLSTUBLIB -o tclsqlite3.so -lpthread
 strip tclsqlite3.so