sqlite.patch 3.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128
  1. Index: sqlite-2.8.17/configure
  2. --- sqlite-2.8.17/configure.orig 2005-04-24 00:43:23 +0200
  3. +++ sqlite-2.8.17/configure 2006-12-18 09:51:03 +0100
  4. @@ -20450,7 +20450,10 @@
  5. TARGET_HAVE_READLINE=0
  6. fi
  7. -
  8. +if [ "$ac_cv_lib_readline_readline" = "no" ]
  9. +then
  10. + TARGET_HAVE_READLINE=0
  11. +fi
  12. #########
  13. # Figure out whether or not we have a "usleep()" function.
  14. Index: sqlite-3.3.10/Makefile.in
  15. --- sqlite-3.3.10/Makefile.in.orig 2006-10-03 14:40:42 +0200
  16. +++ sqlite-3.3.10/Makefile.in 2006-12-18 09:51:03 +0100
  17. @@ -132,6 +132,12 @@
  18. vdbe.lo vdbeapi.lo vdbeaux.lo vdbefifo.lo vdbemem.lo \
  19. where.lo utf.lo legacy.lo vtab.lo
  20. +# FTS1 support
  21. +ifdef FTS1
  22. +TCC += -DSQLITE_ENABLE_FTS1
  23. +LIBOBJ += fts1.lo fts1_hash.lo fts1_porter.lo fts1_tokenizer1.lo
  24. +endif
  25. +
  26. # All of the source code files.
  27. #
  28. SRC = \
  29. @@ -481,6 +487,14 @@
  30. -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
  31. libsqlite3.la $(LIBTCL)
  32. +fts1.lo: $(TOP)/ext/fts1/fts1.c $(HDR)
  33. + $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1.c
  34. +fts1_hash.lo: $(TOP)/ext/fts1/fts1_hash.c $(HDR)
  35. + $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_hash.c
  36. +fts1_porter.lo: $(TOP)/ext/fts1/fts1_porter.c $(HDR)
  37. + $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_porter.c
  38. +fts1_tokenizer1.lo: $(TOP)/ext/fts1/fts1_tokenizer1.c $(HDR)
  39. + $(LTCOMPILE) -c $(TOP)/ext/fts1/fts1_tokenizer1.c
  40. fulltest: testfixture$(TEXE) sqlite3$(TEXE)
  41. ./testfixture $(TOP)/test/all.test
  42. Index: sqlite-3.3.10/configure
  43. --- sqlite-3.3.10/configure.orig 2006-10-03 14:42:27 +0200
  44. +++ sqlite-3.3.10/configure 2006-12-18 09:51:03 +0100
  45. @@ -20472,6 +20472,10 @@
  46. TARGET_HAVE_READLINE=0
  47. fi
  48. +if [ "$ac_cv_lib_readline_readline" = "no" ]
  49. +then
  50. + TARGET_HAVE_READLINE=0
  51. +fi
  52. #########
  53. Index: sqlite-3.3.10/ext/fts1/fts1.c
  54. --- sqlite-3.3.10/ext/fts1/fts1.c.orig 2006-10-08 13:16:32 +0200
  55. +++ sqlite-3.3.10/ext/fts1/fts1.c 2006-12-18 09:51:03 +0100
  56. @@ -19,11 +19,7 @@
  57. #endif
  58. #include <assert.h>
  59. -#if !defined(__APPLE__)
  60. -#include <malloc.h>
  61. -#else
  62. #include <stdlib.h>
  63. -#endif
  64. #include <stdio.h>
  65. #include <string.h>
  66. #include <ctype.h>
  67. Index: sqlite-3.3.10/ext/fts1/fts1_porter.c
  68. --- sqlite-3.3.10/ext/fts1/fts1_porter.c.orig 2006-10-01 20:01:13 +0200
  69. +++ sqlite-3.3.10/ext/fts1/fts1_porter.c 2006-12-18 09:51:03 +0100
  70. @@ -26,11 +26,7 @@
  71. #include <assert.h>
  72. -#if !defined(__APPLE__)
  73. -#include <malloc.h>
  74. -#else
  75. #include <stdlib.h>
  76. -#endif
  77. #include <stdio.h>
  78. #include <string.h>
  79. #include <ctype.h>
  80. Index: sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c
  81. --- sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c.orig 2006-09-30 15:57:33 +0200
  82. +++ sqlite-3.3.10/ext/fts1/fts1_tokenizer1.c 2006-12-18 09:51:03 +0100
  83. @@ -18,11 +18,7 @@
  84. #include <assert.h>
  85. -#if !defined(__APPLE__)
  86. -#include <malloc.h>
  87. -#else
  88. #include <stdlib.h>
  89. -#endif
  90. #include <stdio.h>
  91. #include <string.h>
  92. #include <ctype.h>
  93. Index: sqlite-3.3.10/sqlite3.pc.in
  94. --- sqlite-3.3.10/sqlite3.pc.in.orig 2004-07-19 06:25:47 +0200
  95. +++ sqlite-3.3.10/sqlite3.pc.in 2006-12-18 09:51:03 +0100
  96. @@ -8,5 +8,5 @@
  97. Name: SQLite
  98. Description: SQL database engine
  99. Version: @VERSION@
  100. -Libs: -L${libdir} -lsqlite3
  101. +Libs: -L${libdir} -lsqlite3 @TARGET_LIBS@
  102. Cflags: -I${includedir}
  103. Index: sqliteodbc-0.70/Makefile.in
  104. --- sqliteodbc-0.70/Makefile.in.orig 2006-07-03 07:51:27 +0200
  105. +++ sqliteodbc-0.70/Makefile.in 2006-12-18 09:51:12 +0100
  106. @@ -6,7 +6,7 @@
  107. CC = @CC@
  108. INSTALL = @INSTALL@
  109. LIBTOOL = ./libtool
  110. -CFLAGS= @CFLAGS@ -DDRIVER_VER_INFO=\"@VER_INFO@\"
  111. +CFLAGS= @CFLAGS@ @CPPFLAGS@ -DDRIVER_VER_INFO=\"@VER_INFO@\"
  112. SQLITE_INC = @SQLITE_INC@
  113. SQLITE_LIB = @SQLITE_LIB@
  114. SQLITE_FLAGS = -DHAVE_LIBVERSION=@SQLITE_LIBVERSION@ \