Just applying the patch as you've suggested will cause problems as the PHP tree have some fixes inside libsqlite that were not yet (or never even submitted) added to the external library.
Ilia On June 21, 2004 02:52 pm, [EMAIL PROTECTED] wrote: > This is a resend of the following message but without the attachment which > was rejected as too large for the list (it's about 18000 lines). Wez > should have received the patch since the message was addressed to him as > well as the list. Anyone else who'd like the patch, please let me know and > I'll send it directly to you. (Sorry, I don't have anyplace to post it for > easy download.) > > Wez Furlong <[EMAIL PROTECTED]> writes: > > A unified diff against HEAD would be preferable. > > A unified diff against HEAD is attached. Unfortunately I wasn't able to > build from HEAD due to some problem with flex and Zend/flex.skl supposedly > having a "bad line". Instead, I ran the patch file against the RC3 > distribution and have (briefly) tested it. I'll be using that version for > my testing until release of PHP5-final, so sqlite will get much more > extensively tested. > > The ATTACH problem is gone; it now passes the simple test I posted earlier. > > To apply this patch: > cd ext/sqlite/libsqlite > patch -p0 < sqlite-2.8.11-2.8.14.patch > > NOTE... I'm not sure that applying the patch is the right way to make this > change. Firstly, the patch is quite large since it includes the generated > parse.c and parse.h files which contain file names, thus have numerous > changes. More importantly, since I'm not developing for windows, the > _previously existing_ config_static.w32.h and other *w32* files are > unaffected by the patch; I left them exactly as they were. I don't know > the consequences of that. Instead of applying the patch, I'd suggest > getting here the way I did: > > From http://www.sqlite.org/download.html, obtain sqlite-2.4.18.tar.gz. In > a temporary location, run configure and make (on Linux and separately, it > appears, on Windows as well, assuming that's how the *w32* files are > generated). Copy the generated files into the ext/sqlite/libsqlite tree, > excluding test* and md5.c. (See note below about other files which could > be excluded.) > > > Make sure you test it by applying it to a fresh checkout once you have > > generated the diff. > > I have done so. It patches without errors. > > > Also, compare the current bundled lib with the official distro; I > > deliberately omitted several files that were not needed by PHP, in order > > to reduce the size of the bundle; please make sure you don't stick those > > in the update. > > The excluded files are test* and md5.c. It appears that you could also > exclude parse.y and *.in. I don't know the necessity of the *w32* files or > the project file *.dsp. > > Patch is attached if you'd like to use it. > > Cheers, > > Derrell -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
