Remove superfluous -lpthread from publish_osx.sh. Ticket #2801.

Fix a bug in mkdll.sh. (CVS 4570)

FossilOrigin-Name: 8d6e8fd381d26b9f14464f545c37363218206391

diff --git a/manifest b/manifest
index 5b06afe8d6970e856958059a7840cda639643175..d934b5429e3f8395c569b6f2e375b89fd8bdacd6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Omit\sthe\ssuperfluous\s-lpthread\soption\sin\spublish.sh.\s\sTicket\s#2800.\s(CVS\s4569)
-D 2007-11-27T18:45:32
+C Remove\ssuperfluous\s-lpthread\sfrom\spublish_osx.sh.\sTicket\s#2801.\nFix\sa\sbug\sin\smkdll.sh.\s(CVS\s4570)
+D 2007-11-27T21:44:30
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -65,14 +65,14 @@ F ext/icu/icu.c 61a345d8126686aa3487aa8d2d0f68abd655f7a4
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 56abb507100ed2d4261f6dd1653dec3cf4066387
 F main.mk 297e32b77abde73e5638e048d474a86617bc40af
-F mkdll.sh bb631e62bfa5a44082d755fa43445c7f495be8c2
+F mkdll.sh 5f8438dcac98e795d7df6529159a1ec566de0183
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 1a866b53637dab137191341cc875575a5ca110fb
 F mkopcodec.awk 3fb9bf077053c968451f4dd03d11661ac373f9d1
 F mkopcodeh.awk 799a299eaf3173c0f8ac0bd7c4b49c0f4d4590ca
 F mkso.sh 24bde4c09e6fe80f718db3c31c068f45e13a2f2c
 F publish.sh ea1178b310dd69e24b18c71ecf43af40381f1e35
-F publish_osx.sh efe4cb6502e81139ac77bc1f5c1b682ebfee1e79
+F publish_osx.sh eca87df1e3d43d128d97d3261fd48b3d6877996e
 F spec.template b2f6c4e488cbc3b993a57deba22cbc36203c4da3
 F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
 F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
@@ -593,7 +593,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 9bd7c31496d1d2959761c09a4cfa94662891b81c
-R d910629fdc7143bbd347e6eb23b379d8
+P 4f09f233f0603696aac80f1a4f86bcc803a00daf
+R 3be5fb77281a8e7163111b23a1f8b7d1
 U drh
-Z a938369259e91bb2323f566d51a3c72d
+Z 1771ab6251ed57e44bbb1065a231547d

diff --git a/manifest.uuid b/manifest.uuid
index 1643dbcd1cc4b3063e57eef51106161f36c89774..b165a8380c7d4894765ec3d69f758c1738c43b92 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f09f233f0603696aac80f1a4f86bcc803a00daf
\ No newline at end of file
+8d6e8fd381d26b9f14464f545c37363218206391
\ No newline at end of file

diff --git a/mkdll.sh b/mkdll.sh
index d41d0fcd6cf98614bdd6483a7f294a54d8f70b3b..b03fabdd8e371313bcfb9f24cbed20a67ba179b0 100644 (file)
--- a/mkdll.sh
+++ b/mkdll.sh
@@ -9,6 +9,7 @@
 make sqlite3.c
 make fts3amal.c
 cat fts3amal.c >>sqlite3.c
+cat fts3amal.c >>tclsqlite3.c
 PATH=$PATH:/opt/mingw/bin
 TCLDIR=/home/drh/tcltk/846/win/846win
 TCLSTUBLIB=$TCLDIR/libtcl84stub.a

diff --git a/publish_osx.sh b/publish_osx.sh
index 572d7b300dca0bd6c2c6d3407336a25c294a036b..388f930dec865a1320ed93ea49541d6337d5a969 100644 (file)
--- a/publish_osx.sh
+++ b/publish_osx.sh
@@ -29,7 +29,7 @@ cat fts3amal.c >>sqlite3.c
 CFLAGS="-Os -DSQLITE_ENABLE_FTS3=1 -DSQLITE_THREADSAFE=0"
 NAME=sqlite3-$VERS-osx-x86.bin
 echo '***** '"COMPILING $NAME..."
-gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o $NAME -ldl -lpthread
+gcc $CFLAGS -Itsrc sqlite3.c tsrc/shell.c -o $NAME -ldl
 strip $NAME
 chmod 644 $NAME
 gzip $NAME