1 |
commit: 1de0c0836625f3a11d173ed910cefd6ebc1d8e56 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Wed Feb 27 22:09:21 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 22:35:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1de0c083 |
7 |
|
8 |
dev-db/sqlite: Delete old versions (<3.25.3). |
9 |
|
10 |
Bug: https://bugs.gentoo.org/672942 |
11 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
13 |
|
14 |
dev-db/sqlite/Manifest | 9 - |
15 |
.../sqlite-3.21.0-nonfull_archive-build.patch | 14 - |
16 |
.../files/sqlite-3.23.0-full_archive-build.patch | 407 --------------------- |
17 |
...to_table-valued_functions_within_triggers.patch | 24 -- |
18 |
.../files/sqlite-3.23.1-full_archive-tests.patch | 224 ------------ |
19 |
...to_table-valued_functions_within_triggers.patch | 14 - |
20 |
...ll_archive-archive_command_paths_handling.patch | 14 - |
21 |
.../files/sqlite-3.24.0-full_archive-build.patch | 407 --------------------- |
22 |
...ll_archive-archive_command_paths_handling.patch | 14 - |
23 |
...low_window_functions_in_recursive_queries.patch | 49 --- |
24 |
...low_window_functions_in_recursive_queries.patch | 19 - |
25 |
dev-db/sqlite/sqlite-3.23.1.ebuild | 309 ---------------- |
26 |
dev-db/sqlite/sqlite-3.24.0.ebuild | 308 ---------------- |
27 |
dev-db/sqlite/sqlite-3.25.2.ebuild | 322 ---------------- |
28 |
14 files changed, 2134 deletions(-) |
29 |
|
30 |
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest |
31 |
index 6729f474cde..e40683c22fb 100644 |
32 |
--- a/dev-db/sqlite/Manifest |
33 |
+++ b/dev-db/sqlite/Manifest |
34 |
@@ -1,20 +1,11 @@ |
35 |
-DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826 |
36 |
-DIST sqlite-autoconf-3240000.tar.gz 2699252 BLAKE2B c8beb3b90bdd06f76cafeba859cbf91cf4d0cb313fc9202d210ccbad5fca7f9a062ede63387e814d664f0ae38bcfa48db222f466dbcd429fecfb53cfdac155c4 SHA512 eaec866de26003ec36559aab15dd18dc0e6029453002a4eec5e176bb35a712b8b06c235436e6c1a226b67c7eb90d7a26c2b3b3d9a5e6e92a5af485236b77c878 |
37 |
-DIST sqlite-autoconf-3250200.tar.gz 2763876 BLAKE2B 3d97cc60edf8f91855215bd59260362665c8ec7699510f2e07c7ba57e10c400dcc99bb392e216f798bef1ffa7120b48ee62ce144a871741ef57b3aefeab875d6 SHA512 5ef9a6dfbb0822257af1a3a379785a95ab02edecbbb53b57074ddd0b8dc294fc07cbb9a8a7acc4e1640fb1743525ed6331fecebbddce01bc017330b20e127ad9 |
38 |
DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c6563e937a45d6ef4aae1b941d42c06cb8630210c33583f25e41f3f90b181ce47da650f81845ad88cafbf9c764164cf8b5d92e81 SHA512 5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5e0ba031a6744af89f7659206e28e7de2f0367bdb190b8412e453b43de4ba |
39 |
DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8 |
40 |
DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4 |
41 |
DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972 |
42 |
-DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471 |
43 |
-DIST sqlite-doc-3240000.zip 9030826 BLAKE2B 4444e3dd0ce782e19fa01c881e0b5453723419ef1cf95cbe751d759a264bbe288a5c23a2b6514ed459b99b11637349c02def68fed7df8625bfc161307e44564c SHA512 31e9046cea569d7ad1b3af176e1bb18cd59474afb6849871ead6e7c9c096f046162fb313a38684a8c944fad9f689c4c3c692be1d7dc6a8ef5a6685bbc7dfdab6 |
44 |
-DIST sqlite-doc-3250200.zip 9229732 BLAKE2B 9bc4499c2934d15428dd30e0522362a2c2e703061c293f1b657f01d3945612760be3b4f145ddf76d9cf87953fae26884646887e53c0c55683ce42bc239dcf952 SHA512 a0b764ca0eea0e9719d46b6e1f92db78578457c8331976d4712c56cd10fc062fd73629686a0e45dfdeb505fbfbe0c53652a5e64507702ff4e12b62a2fc8d8211 |
45 |
DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac |
46 |
DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade |
47 |
DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f |
48 |
DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f |
49 |
-DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b |
50 |
-DIST sqlite-src-3240000.zip 10980065 BLAKE2B 201a59cb34271e5ac79e96e4e2ea64f8b61aa99c44eedf61c0a21752ad4376caaf7980a6923dca66266b1a315d9867871d0d172c17907b4147c15431aa212a70 SHA512 812c2df7179abb1e445b5b3e161c940b120c53366a7b2c1f0bfc3599cd9921e5543ba39ca3f297eeaefec318f10c15f630f00f9cf04133c7cd419a04f3bbdd0e |
51 |
-DIST sqlite-src-3250200.zip 11381811 BLAKE2B 6183436f66c862c32d1dfd59ea4ccb5eaf3dd516ffcf9d7edf786e8fbf56eff3cb84d08e291b2e86fae25e537bed452aed693bdb0f0d6bb6581da86641013557 SHA512 7354af2d45c574ba867fab8aabc6ff903279f028aebed50c71019066df78f61a0b941564c572c87b0f3ed3e5783bf325a690a9957d775228fbbb293dd9a5ad37 |
52 |
DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65 |
53 |
DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3 |
54 |
DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945 |
55 |
|
56 |
diff --git a/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch b/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch |
57 |
deleted file mode 100644 |
58 |
index 06ea8b29053..00000000000 |
59 |
--- a/dev-db/sqlite/files/sqlite-3.21.0-nonfull_archive-build.patch |
60 |
+++ /dev/null |
61 |
@@ -1,14 +0,0 @@ |
62 |
-Fix building with dlopen() not available. |
63 |
- |
64 |
---- /configure.ac |
65 |
-+++ /configure.ac |
66 |
-@@ -102,6 +102,9 @@ |
67 |
- [], [enable_dynamic_extensions=yes]) |
68 |
- if test x"$enable_dynamic_extensions" != "xno"; then |
69 |
- AC_SEARCH_LIBS(dlopen, dl) |
70 |
-+ if test "${ac_cv_search_dlopen}" = "no" ; then |
71 |
-+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 |
72 |
-+ fi |
73 |
- else |
74 |
- DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1 |
75 |
- fi |
76 |
|
77 |
diff --git a/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch |
78 |
deleted file mode 100644 |
79 |
index f46df1c15a5..00000000000 |
80 |
--- a/dev-db/sqlite/files/sqlite-3.23.0-full_archive-build.patch |
81 |
+++ /dev/null |
82 |
@@ -1,407 +0,0 @@ |
83 |
-Move some code to libsqlite3.so to avoid duplication. |
84 |
-Link executables against libsqlite3.so. |
85 |
-Increase timeout for fuzzcheck. |
86 |
-Fix building with dlopen() not available. |
87 |
- |
88 |
---- /Makefile.in |
89 |
-+++ /Makefile.in |
90 |
-@@ -308,6 +308,9 @@ |
91 |
- # Source code for extensions |
92 |
- # |
93 |
- SRC += \ |
94 |
-+ $(TOP)/ext/expert/sqlite3expert.c \ |
95 |
-+ $(TOP)/ext/expert/sqlite3expert.h |
96 |
-+SRC += \ |
97 |
- $(TOP)/ext/fts1/fts1.c \ |
98 |
- $(TOP)/ext/fts1/fts1.h \ |
99 |
- $(TOP)/ext/fts1/fts1_hash.c \ |
100 |
-@@ -356,8 +359,11 @@ |
101 |
- $(TOP)/ext/rbu/sqlite3rbu.h \ |
102 |
- $(TOP)/ext/rbu/sqlite3rbu.c |
103 |
- SRC += \ |
104 |
-+ $(TOP)/ext/misc/appendvfs.c \ |
105 |
- $(TOP)/ext/misc/json1.c \ |
106 |
-- $(TOP)/ext/misc/stmt.c |
107 |
-+ $(TOP)/ext/misc/sqlar.c \ |
108 |
-+ $(TOP)/ext/misc/stmt.c \ |
109 |
-+ $(TOP)/ext/misc/zipfile.c |
110 |
- |
111 |
- # Generated source code files |
112 |
- # |
113 |
-@@ -426,7 +432,6 @@ |
114 |
- # Statically linked extensions |
115 |
- # |
116 |
- TESTSRC += \ |
117 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
118 |
- $(TOP)/ext/expert/test_expert.c \ |
119 |
- $(TOP)/ext/misc/amatch.c \ |
120 |
- $(TOP)/ext/misc/carray.c \ |
121 |
-@@ -449,8 +454,7 @@ |
122 |
- $(TOP)/ext/misc/spellfix.c \ |
123 |
- $(TOP)/ext/misc/totype.c \ |
124 |
- $(TOP)/ext/misc/unionvtab.c \ |
125 |
-- $(TOP)/ext/misc/wholenumber.c \ |
126 |
-- $(TOP)/ext/misc/zipfile.c |
127 |
-+ $(TOP)/ext/misc/wholenumber.c |
128 |
- |
129 |
- # Source code to the library files needed by the test fixture |
130 |
- # |
131 |
-@@ -613,25 +617,25 @@ |
132 |
- |
133 |
- libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
134 |
- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
135 |
-- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
136 |
-+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ |
137 |
- -rpath "$(TCLLIBDIR)" \ |
138 |
- -version-info "8:6:8" \ |
139 |
- -avoid-version |
140 |
- |
141 |
--sqlite3$(TEXE): shell.c sqlite3.c |
142 |
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ |
143 |
-- shell.c sqlite3.c \ |
144 |
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
145 |
-+sqlite3$(TEXE): shell.c libsqlite3.la |
146 |
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \ |
147 |
-+ shell.c libsqlite3.la \ |
148 |
-+ $(LIBREADLINE) |
149 |
- |
150 |
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h |
151 |
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) |
152 |
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la |
153 |
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la |
154 |
- |
155 |
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h |
156 |
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) |
157 |
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la |
158 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la |
159 |
- |
160 |
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo |
161 |
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la |
162 |
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ |
163 |
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) |
164 |
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la |
165 |
- |
166 |
- srcck1$(BEXE): $(TOP)/tool/srcck1.c |
167 |
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c |
168 |
-@@ -710,7 +714,7 @@ |
169 |
- # Rule to build the amalgamation |
170 |
- # |
171 |
- sqlite3.lo: sqlite3.c |
172 |
-- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c |
173 |
-+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c |
174 |
- |
175 |
- # Rules to build the LEMON compiler generator |
176 |
- # |
177 |
-@@ -1004,14 +1008,9 @@ |
178 |
- # Source files that go into making shell.c |
179 |
- SHELL_SRC = \ |
180 |
- $(TOP)/src/shell.c.in \ |
181 |
-- $(TOP)/ext/misc/appendvfs.c \ |
182 |
- $(TOP)/ext/misc/shathree.c \ |
183 |
- $(TOP)/ext/misc/fileio.c \ |
184 |
- $(TOP)/ext/misc/completion.c \ |
185 |
-- $(TOP)/ext/misc/sqlar.c \ |
186 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
187 |
-- $(TOP)/ext/expert/sqlite3expert.h \ |
188 |
-- $(TOP)/ext/misc/zipfile.c \ |
189 |
- $(TOP)/src/test_windirent.c |
190 |
- |
191 |
- shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl |
192 |
-@@ -1170,15 +1169,15 @@ |
193 |
- |
194 |
- # Fuzz testing |
195 |
- fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
196 |
-- ./fuzzcheck$(TEXE) $(FUZZDATA) |
197 |
-+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) |
198 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
199 |
- |
200 |
- fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
201 |
-- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) |
202 |
-+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) |
203 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
204 |
- |
205 |
- valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
206 |
-- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) |
207 |
-+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) |
208 |
- valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
209 |
- |
210 |
- # The veryquick.test TCL tests. |
211 |
-@@ -1209,24 +1208,23 @@ |
212 |
- smoketest: $(TESTPROGS) fuzzcheck$(TEXE) |
213 |
- ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) |
214 |
- |
215 |
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
216 |
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
217 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c |
218 |
- |
219 |
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c |
220 |
-- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) |
221 |
-+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la |
222 |
-+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) |
223 |
- |
224 |
--sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
225 |
-+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
226 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c |
227 |
- |
228 |
--sqltclsh$(TEXE): sqltclsh.c |
229 |
-- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) |
230 |
-+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la |
231 |
-+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) |
232 |
- |
233 |
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c |
234 |
-- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) |
235 |
-+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la |
236 |
-+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la |
237 |
- |
238 |
- CHECKER_DEPS =\ |
239 |
- $(TOP)/tool/mkccode.tcl \ |
240 |
-- sqlite3.c \ |
241 |
- $(TOP)/src/tclsqlite.c \ |
242 |
- $(TOP)/ext/repair/sqlite3_checker.tcl \ |
243 |
- $(TOP)/ext/repair/checkindex.c \ |
244 |
-@@ -1237,30 +1235,30 @@ |
245 |
- sqlite3_checker.c: $(CHECKER_DEPS) |
246 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ |
247 |
- |
248 |
--sqlite3_checker$(TEXE): sqlite3_checker.c |
249 |
-- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) |
250 |
-+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la |
251 |
-+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) |
252 |
- |
253 |
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo |
254 |
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la |
255 |
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ |
256 |
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) |
257 |
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la |
258 |
- |
259 |
--showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo |
260 |
-- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) |
261 |
-+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la |
262 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la |
263 |
- |
264 |
--showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo |
265 |
-- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) |
266 |
-+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la |
267 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la |
268 |
- |
269 |
--showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo |
270 |
-- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) |
271 |
-+showjournal$(TEXE): $(TOP)/tool/showjournal.c |
272 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c |
273 |
- |
274 |
--showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo |
275 |
-- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) |
276 |
-+showwal$(TEXE): $(TOP)/tool/showwal.c |
277 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c |
278 |
- |
279 |
- showshm$(TEXE): $(TOP)/tool/showshm.c |
280 |
- $(LTLINK) -o $@ $(TOP)/tool/showshm.c |
281 |
- |
282 |
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo |
283 |
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) |
284 |
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la |
285 |
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la |
286 |
- |
287 |
- rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo |
288 |
- $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) |
289 |
-@@ -1279,11 +1277,11 @@ |
290 |
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c |
291 |
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) |
292 |
- |
293 |
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo |
294 |
-- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) |
295 |
-+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la |
296 |
-+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la |
297 |
- |
298 |
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
299 |
-- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) |
300 |
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
301 |
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ |
302 |
- |
303 |
- # This target will fail if the SQLite amalgamation contains any exported |
304 |
- # symbols that do not begin with "sqlite3_". It is run as part of the |
305 |
---- /configure.ac |
306 |
-+++ /configure.ac |
307 |
-@@ -590,6 +590,9 @@ |
308 |
- if test "${use_loadextension}" = "yes" ; then |
309 |
- OPT_FEATURE_FLAGS="" |
310 |
- AC_SEARCH_LIBS(dlopen, dl) |
311 |
-+ if test "${ac_cv_search_dlopen}" = "no" ; then |
312 |
-+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
313 |
-+ fi |
314 |
- else |
315 |
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
316 |
- fi |
317 |
---- /ext/misc/sqlar.c |
318 |
-+++ /ext/misc/sqlar.c |
319 |
-@@ -14,6 +14,8 @@ |
320 |
- ** for working with sqlar archives and used by the shell tool's built-in |
321 |
- ** sqlar support. |
322 |
- */ |
323 |
-+#ifdef SQLITE_HAVE_ZLIB |
324 |
-+ |
325 |
- #include "sqlite3ext.h" |
326 |
- SQLITE_EXTENSION_INIT1 |
327 |
- #include <zlib.h> |
328 |
-@@ -119,3 +121,5 @@ |
329 |
- } |
330 |
- return rc; |
331 |
- } |
332 |
-+ |
333 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
334 |
---- /ext/misc/zipfile.c |
335 |
-+++ /ext/misc/zipfile.c |
336 |
-@@ -24,6 +24,8 @@ |
337 |
- ** * No support for zip64 extensions |
338 |
- ** * Only the "inflate/deflate" (zlib) compression method is supported |
339 |
- */ |
340 |
-+#ifdef SQLITE_HAVE_ZLIB |
341 |
-+ |
342 |
- #include "sqlite3ext.h" |
343 |
- SQLITE_EXTENSION_INIT1 |
344 |
- #include <stdio.h> |
345 |
-@@ -2175,3 +2177,5 @@ |
346 |
- (void)pzErrMsg; /* Unused parameter */ |
347 |
- return zipfileRegister(db); |
348 |
- } |
349 |
-+ |
350 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
351 |
---- /ext/repair/sqlite3_checker.c.in |
352 |
-+++ /ext/repair/sqlite3_checker.c.in |
353 |
-@@ -2,6 +2,7 @@ |
354 |
- ** Read an SQLite database file and analyze its space utilization. Generate |
355 |
- ** text on standard output. |
356 |
- */ |
357 |
-+#define SQLITE_CORE 1 |
358 |
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc |
359 |
- #define SQLITE_ENABLE_DBPAGE_VTAB 1 |
360 |
- #define SQLITE_ENABLE_JSON1 1 |
361 |
-@@ -14,7 +15,7 @@ |
362 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
363 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
364 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
365 |
--INCLUDE sqlite3.c |
366 |
-+#include "sqlite3.h" |
367 |
- INCLUDE $ROOT/src/tclsqlite.c |
368 |
- INCLUDE $ROOT/ext/misc/btreeinfo.c |
369 |
- INCLUDE $ROOT/ext/repair/checkindex.c |
370 |
---- /src/shell.c.in |
371 |
-+++ /src/shell.c.in |
372 |
-@@ -61,6 +61,7 @@ |
373 |
- #include <stdio.h> |
374 |
- #include <assert.h> |
375 |
- #include "sqlite3.h" |
376 |
-+#include "ext/expert/sqlite3expert.h" |
377 |
- typedef sqlite3_int64 i64; |
378 |
- typedef sqlite3_uint64 u64; |
379 |
- typedef unsigned char u8; |
380 |
-@@ -124,6 +125,10 @@ |
381 |
- # define SHELL_USE_LOCAL_GETLINE 1 |
382 |
- #endif |
383 |
- |
384 |
-+#ifdef SQLITE_HAVE_ZLIB |
385 |
-+#include <zlib.h> |
386 |
-+#endif |
387 |
-+ |
388 |
- |
389 |
- #if defined(_WIN32) || defined(WIN32) |
390 |
- # include <io.h> |
391 |
-@@ -966,13 +971,6 @@ |
392 |
- INCLUDE ../ext/misc/shathree.c |
393 |
- INCLUDE ../ext/misc/fileio.c |
394 |
- INCLUDE ../ext/misc/completion.c |
395 |
--INCLUDE ../ext/misc/appendvfs.c |
396 |
--#ifdef SQLITE_HAVE_ZLIB |
397 |
--INCLUDE ../ext/misc/zipfile.c |
398 |
--INCLUDE ../ext/misc/sqlar.c |
399 |
--#endif |
400 |
--INCLUDE ../ext/expert/sqlite3expert.h |
401 |
--INCLUDE ../ext/expert/sqlite3expert.c |
402 |
- |
403 |
- #if defined(SQLITE_ENABLE_SESSION) |
404 |
- /* |
405 |
-@@ -3522,7 +3520,9 @@ |
406 |
- sqlite3_shathree_init(p->db, 0, 0); |
407 |
- sqlite3_completion_init(p->db, 0, 0); |
408 |
- #ifdef SQLITE_HAVE_ZLIB |
409 |
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
410 |
- sqlite3_zipfile_init(p->db, 0, 0); |
411 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
412 |
- sqlite3_sqlar_init(p->db, 0, 0); |
413 |
- #endif |
414 |
- sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, |
415 |
-@@ -5411,6 +5411,7 @@ |
416 |
- goto end_ar_command; |
417 |
- } |
418 |
- sqlite3_fileio_init(cmd.db, 0, 0); |
419 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
420 |
- sqlite3_sqlar_init(cmd.db, 0, 0); |
421 |
- sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, |
422 |
- shellPutsFunc, 0, 0); |
423 |
-@@ -8367,6 +8368,7 @@ |
424 |
- #endif |
425 |
- } |
426 |
- data.out = stdout; |
427 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); |
428 |
- sqlite3_appendvfs_init(0,0,0); |
429 |
- |
430 |
- /* Go ahead and open the database file if it already exists. If the |
431 |
---- /tool/mksqlite3c.tcl |
432 |
-+++ /tool/mksqlite3c.tcl |
433 |
-@@ -116,6 +116,7 @@ |
434 |
- rtree.h |
435 |
- sqlite3session.h |
436 |
- sqlite3.h |
437 |
-+ sqlite3expert.h |
438 |
- sqlite3ext.h |
439 |
- sqlite3rbu.h |
440 |
- sqliteicu.h |
441 |
-@@ -400,6 +401,10 @@ |
442 |
- json1.c |
443 |
- fts5.c |
444 |
- stmt.c |
445 |
-+ appendvfs.c |
446 |
-+ sqlar.c |
447 |
-+ sqlite3expert.c |
448 |
-+ zipfile.c |
449 |
- } { |
450 |
- copy_file tsrc/$file |
451 |
- } |
452 |
---- /tool/sqlite3_analyzer.c.in |
453 |
-+++ /tool/sqlite3_analyzer.c.in |
454 |
-@@ -14,9 +14,6 @@ |
455 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
456 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
457 |
- #define SQLITE_OMIT_LOAD_EXTENSION 1 |
458 |
--#ifndef USE_EXTERNAL_SQLITE |
459 |
--INCLUDE sqlite3.c |
460 |
--#endif |
461 |
- INCLUDE $ROOT/src/tclsqlite.c |
462 |
- |
463 |
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ |
464 |
---- /tool/sqltclsh.c.in |
465 |
-+++ /tool/sqltclsh.c.in |
466 |
-@@ -27,19 +27,17 @@ |
467 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
468 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
469 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
470 |
--INCLUDE sqlite3.c |
471 |
--INCLUDE $ROOT/ext/misc/appendvfs.c |
472 |
--#ifdef SQLITE_HAVE_ZLIB |
473 |
--INCLUDE $ROOT/ext/misc/zipfile.c |
474 |
--INCLUDE $ROOT/ext/misc/sqlar.c |
475 |
--#endif |
476 |
-+#include "sqlite3.h" |
477 |
- INCLUDE $ROOT/src/tclsqlite.c |
478 |
- |
479 |
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ |
480 |
- (void)interp; |
481 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); |
482 |
- sqlite3_appendvfs_init(0,0,0); |
483 |
- #ifdef SQLITE_HAVE_ZLIB |
484 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
485 |
- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); |
486 |
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
487 |
- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); |
488 |
- #endif |
489 |
- |
490 |
|
491 |
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch |
492 |
deleted file mode 100644 |
493 |
index c97679daf7d..00000000000 |
494 |
--- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch |
495 |
+++ /dev/null |
496 |
@@ -1,24 +0,0 @@ |
497 |
-https://sqlite.org/src/info/b7178209152452e8 |
498 |
- |
499 |
---- /src/attach.c |
500 |
-+++ /src/attach.c |
501 |
-@@ -502,6 +502,9 @@ |
502 |
- if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; |
503 |
- if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; |
504 |
- #endif |
505 |
-+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ |
506 |
-+ return 1; |
507 |
-+ } |
508 |
- } |
509 |
- return 0; |
510 |
- } |
511 |
---- /test/triggerE.test |
512 |
-+++ /test/triggerE.test |
513 |
-@@ -57,6 +57,7 @@ |
514 |
- 7 { BEFORE DELETE ON t1 BEGIN SELECT * FROM t2 ORDER BY ?; END; } |
515 |
- 8 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = ?; END; } |
516 |
- 9 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = 1 WHERE d = ?; END; } |
517 |
-+ 10 { AFTER INSERT ON t1 BEGIN SELECT * FROM pragma_stats(?); END; } |
518 |
- } { |
519 |
- catchsql {drop trigger tr1} |
520 |
- do_catchsql_test 1.1.$tn "CREATE TRIGGER tr1 $defn" [list 1 $errmsg] |
521 |
|
522 |
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch |
523 |
deleted file mode 100644 |
524 |
index ef813f67e74..00000000000 |
525 |
--- a/dev-db/sqlite/files/sqlite-3.23.1-full_archive-tests.patch |
526 |
+++ /dev/null |
527 |
@@ -1,224 +0,0 @@ |
528 |
-https://sqlite.org/src/info/893e6089c875e947 |
529 |
-https://sqlite.org/src/info/576a8f69ae25883f |
530 |
-https://sqlite.org/src/info/de508e831a43f02c |
531 |
- |
532 |
---- /ext/fts3/fts3.c |
533 |
-+++ /ext/fts3/fts3.c |
534 |
-@@ -3963,7 +3963,7 @@ |
535 |
- |
536 |
- #ifdef SQLITE_TEST |
537 |
- if( rc==SQLITE_OK ){ |
538 |
-- rc = sqlite3Fts3ExprInitTestInterface(db); |
539 |
-+ rc = sqlite3Fts3ExprInitTestInterface(db, pHash); |
540 |
- } |
541 |
- #endif |
542 |
- |
543 |
---- /ext/fts3/fts3Int.h |
544 |
-+++ /ext/fts3/fts3Int.h |
545 |
-@@ -584,7 +584,7 @@ |
546 |
- ); |
547 |
- void sqlite3Fts3ExprFree(Fts3Expr *); |
548 |
- #ifdef SQLITE_TEST |
549 |
--int sqlite3Fts3ExprInitTestInterface(sqlite3 *db); |
550 |
-+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*); |
551 |
- int sqlite3Fts3InitTerm(sqlite3 *db); |
552 |
- #endif |
553 |
- |
554 |
---- /ext/fts3/fts3_expr.c |
555 |
-+++ /ext/fts3/fts3_expr.c |
556 |
-@@ -1109,34 +1109,6 @@ |
557 |
- #include <stdio.h> |
558 |
- |
559 |
- /* |
560 |
--** Function to query the hash-table of tokenizers (see README.tokenizers). |
561 |
--*/ |
562 |
--static int queryTestTokenizer( |
563 |
-- sqlite3 *db, |
564 |
-- const char *zName, |
565 |
-- const sqlite3_tokenizer_module **pp |
566 |
--){ |
567 |
-- int rc; |
568 |
-- sqlite3_stmt *pStmt; |
569 |
-- const char zSql[] = "SELECT fts3_tokenizer(?)"; |
570 |
-- |
571 |
-- *pp = 0; |
572 |
-- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0); |
573 |
-- if( rc!=SQLITE_OK ){ |
574 |
-- return rc; |
575 |
-- } |
576 |
-- |
577 |
-- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC); |
578 |
-- if( SQLITE_ROW==sqlite3_step(pStmt) ){ |
579 |
-- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){ |
580 |
-- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp)); |
581 |
-- } |
582 |
-- } |
583 |
-- |
584 |
-- return sqlite3_finalize(pStmt); |
585 |
--} |
586 |
-- |
587 |
--/* |
588 |
- ** Return a pointer to a buffer containing a text representation of the |
589 |
- ** expression passed as the first argument. The buffer is obtained from |
590 |
- ** sqlite3_malloc(). It is the responsibility of the caller to use |
591 |
-@@ -1203,12 +1175,12 @@ |
592 |
- ** |
593 |
- ** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2'); |
594 |
- */ |
595 |
--static void fts3ExprTest( |
596 |
-+static void fts3ExprTestCommon( |
597 |
-+ int bRebalance, |
598 |
- sqlite3_context *context, |
599 |
- int argc, |
600 |
- sqlite3_value **argv |
601 |
- ){ |
602 |
-- sqlite3_tokenizer_module const *pModule = 0; |
603 |
- sqlite3_tokenizer *pTokenizer = 0; |
604 |
- int rc; |
605 |
- char **azCol = 0; |
606 |
-@@ -1218,7 +1190,9 @@ |
607 |
- int ii; |
608 |
- Fts3Expr *pExpr; |
609 |
- char *zBuf = 0; |
610 |
-- sqlite3 *db = sqlite3_context_db_handle(context); |
611 |
-+ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context); |
612 |
-+ const char *zTokenizer = 0; |
613 |
-+ char *zErr = 0; |
614 |
- |
615 |
- if( argc<3 ){ |
616 |
- sqlite3_result_error(context, |
617 |
-@@ -1227,23 +1201,17 @@ |
618 |
- return; |
619 |
- } |
620 |
- |
621 |
-- rc = queryTestTokenizer(db, |
622 |
-- (const char *)sqlite3_value_text(argv[0]), &pModule); |
623 |
-- if( rc==SQLITE_NOMEM ){ |
624 |
-- sqlite3_result_error_nomem(context); |
625 |
-- goto exprtest_out; |
626 |
-- }else if( !pModule ){ |
627 |
-- sqlite3_result_error(context, "No such tokenizer module", -1); |
628 |
-- goto exprtest_out; |
629 |
-- } |
630 |
-- |
631 |
-- rc = pModule->xCreate(0, 0, &pTokenizer); |
632 |
-- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK ); |
633 |
-- if( rc==SQLITE_NOMEM ){ |
634 |
-- sqlite3_result_error_nomem(context); |
635 |
-- goto exprtest_out; |
636 |
-+ zTokenizer = (const char*)sqlite3_value_text(argv[0]); |
637 |
-+ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr); |
638 |
-+ if( rc!=SQLITE_OK ){ |
639 |
-+ if( rc==SQLITE_NOMEM ){ |
640 |
-+ sqlite3_result_error_nomem(context); |
641 |
-+ }else{ |
642 |
-+ sqlite3_result_error(context, zErr, -1); |
643 |
-+ } |
644 |
-+ sqlite3_free(zErr); |
645 |
-+ return; |
646 |
- } |
647 |
-- pTokenizer->pModule = pModule; |
648 |
- |
649 |
- zExpr = (const char *)sqlite3_value_text(argv[1]); |
650 |
- nExpr = sqlite3_value_bytes(argv[1]); |
651 |
-@@ -1257,7 +1225,7 @@ |
652 |
- azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]); |
653 |
- } |
654 |
- |
655 |
-- if( sqlite3_user_data(context) ){ |
656 |
-+ if( bRebalance ){ |
657 |
- char *zDummy = 0; |
658 |
- rc = sqlite3Fts3ExprParse( |
659 |
- pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy |
660 |
-@@ -1283,23 +1251,38 @@ |
661 |
- sqlite3Fts3ExprFree(pExpr); |
662 |
- |
663 |
- exprtest_out: |
664 |
-- if( pModule && pTokenizer ){ |
665 |
-- rc = pModule->xDestroy(pTokenizer); |
666 |
-+ if( pTokenizer ){ |
667 |
-+ rc = pTokenizer->pModule->xDestroy(pTokenizer); |
668 |
- } |
669 |
- sqlite3_free(azCol); |
670 |
- } |
671 |
- |
672 |
-+static void fts3ExprTest( |
673 |
-+ sqlite3_context *context, |
674 |
-+ int argc, |
675 |
-+ sqlite3_value **argv |
676 |
-+){ |
677 |
-+ fts3ExprTestCommon(0, context, argc, argv); |
678 |
-+} |
679 |
-+static void fts3ExprTestRebalance( |
680 |
-+ sqlite3_context *context, |
681 |
-+ int argc, |
682 |
-+ sqlite3_value **argv |
683 |
-+){ |
684 |
-+ fts3ExprTestCommon(1, context, argc, argv); |
685 |
-+} |
686 |
-+ |
687 |
- /* |
688 |
- ** Register the query expression parser test function fts3_exprtest() |
689 |
- ** with database connection db. |
690 |
- */ |
691 |
--int sqlite3Fts3ExprInitTestInterface(sqlite3* db){ |
692 |
-+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){ |
693 |
- int rc = sqlite3_create_function( |
694 |
-- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0 |
695 |
-+ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0 |
696 |
- ); |
697 |
- if( rc==SQLITE_OK ){ |
698 |
- rc = sqlite3_create_function(db, "fts3_exprtest_rebalance", |
699 |
-- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0 |
700 |
-+ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0 |
701 |
- ); |
702 |
- } |
703 |
- return rc; |
704 |
---- /test/fts3expr.test |
705 |
-+++ /test/fts3expr.test |
706 |
-@@ -409,7 +409,7 @@ |
707 |
- } {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}} |
708 |
- do_test fts3expr-5.2 { |
709 |
- catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') } |
710 |
--} {1 {No such tokenizer module}} |
711 |
-+} {1 {unknown tokenizer: doesnotexist}} |
712 |
- do_test fts3expr-5.3 { |
713 |
- catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') } |
714 |
- } {1 {Error parsing expression}} |
715 |
---- /test/fts3expr4.test |
716 |
-+++ /test/fts3expr4.test |
717 |
-@@ -29,7 +29,8 @@ |
718 |
- } |
719 |
- |
720 |
- proc do_icu_expr_test {tn expr res} { |
721 |
-- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]] |
722 |
-+ set res2 [list {*}$res] |
723 |
-+ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2] |
724 |
- } |
725 |
- |
726 |
- proc do_simple_expr_test {tn expr res} { |
727 |
---- /test/zipfile2.test |
728 |
-+++ /test/zipfile2.test |
729 |
-@@ -52,17 +52,15 @@ |
730 |
- CREATE VIRTUAL TABLE fff USING zipfile('test''zip'); |
731 |
- } |
732 |
- |
733 |
--if {$::tcl_platform(platform)=="windows"} { |
734 |
-- set res {1 {cannot open file: testdir}} |
735 |
--} else { |
736 |
-- set res {1 {error in fread()}} |
737 |
--} |
738 |
- do_test 2.0 { |
739 |
- forcedelete testdir |
740 |
- file mkdir testdir |
741 |
- execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') } |
742 |
-- catchsql { SELECT * FROM hhh } |
743 |
--} $res |
744 |
-+ lindex [catchsql { |
745 |
-+ SELECT * FROM hhh; |
746 |
-+ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data'); |
747 |
-+ }] 0 |
748 |
-+} 1 |
749 |
- |
750 |
- |
751 |
- set archive { |
752 |
|
753 |
diff --git a/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch b/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch |
754 |
deleted file mode 100644 |
755 |
index c60cd9c90dc..00000000000 |
756 |
--- a/dev-db/sqlite/files/sqlite-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch |
757 |
+++ /dev/null |
758 |
@@ -1,14 +0,0 @@ |
759 |
-https://sqlite.org/src/info/b7178209152452e8 |
760 |
- |
761 |
---- /sqlite3.c |
762 |
-+++ /sqlite3.c |
763 |
-@@ -102780,6 +102780,9 @@ |
764 |
- if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1; |
765 |
- if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1; |
766 |
- #endif |
767 |
-+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){ |
768 |
-+ return 1; |
769 |
-+ } |
770 |
- } |
771 |
- return 0; |
772 |
- } |
773 |
|
774 |
diff --git a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch b/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch |
775 |
deleted file mode 100644 |
776 |
index 5c27aa3465b..00000000000 |
777 |
--- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-archive_command_paths_handling.patch |
778 |
+++ /dev/null |
779 |
@@ -1,14 +0,0 @@ |
780 |
-https://sqlite.org/src/info/27291f2d7fd4dadf |
781 |
- |
782 |
---- /src/shell.c.in |
783 |
-+++ /src/shell.c.in |
784 |
-@@ -5284,7 +5284,8 @@ |
785 |
- "SELECT " |
786 |
- " ($dir || name)," |
787 |
- " writefile(($dir || name), %s, mode, mtime) " |
788 |
-- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"; |
789 |
-+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)" |
790 |
-+ " AND name NOT GLOB '*..[/\\]*'"; |
791 |
- |
792 |
- const char *azExtraArg[] = { |
793 |
- "sqlar_uncompress(data, sz)", |
794 |
|
795 |
diff --git a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch |
796 |
deleted file mode 100644 |
797 |
index 072b8049c14..00000000000 |
798 |
--- a/dev-db/sqlite/files/sqlite-3.24.0-full_archive-build.patch |
799 |
+++ /dev/null |
800 |
@@ -1,407 +0,0 @@ |
801 |
-Move some code to libsqlite3.so to avoid duplication. |
802 |
-Link executables against libsqlite3.so. |
803 |
-Increase timeout for fuzzcheck. |
804 |
-Fix building with dlopen() not available. |
805 |
- |
806 |
---- /Makefile.in |
807 |
-+++ /Makefile.in |
808 |
-@@ -309,6 +309,9 @@ |
809 |
- # Source code for extensions |
810 |
- # |
811 |
- SRC += \ |
812 |
-+ $(TOP)/ext/expert/sqlite3expert.c \ |
813 |
-+ $(TOP)/ext/expert/sqlite3expert.h |
814 |
-+SRC += \ |
815 |
- $(TOP)/ext/fts1/fts1.c \ |
816 |
- $(TOP)/ext/fts1/fts1.h \ |
817 |
- $(TOP)/ext/fts1/fts1_hash.c \ |
818 |
-@@ -357,8 +360,11 @@ |
819 |
- $(TOP)/ext/rbu/sqlite3rbu.h \ |
820 |
- $(TOP)/ext/rbu/sqlite3rbu.c |
821 |
- SRC += \ |
822 |
-+ $(TOP)/ext/misc/appendvfs.c \ |
823 |
- $(TOP)/ext/misc/json1.c \ |
824 |
-- $(TOP)/ext/misc/stmt.c |
825 |
-+ $(TOP)/ext/misc/sqlar.c \ |
826 |
-+ $(TOP)/ext/misc/stmt.c \ |
827 |
-+ $(TOP)/ext/misc/zipfile.c |
828 |
- |
829 |
- # Generated source code files |
830 |
- # |
831 |
-@@ -427,7 +433,6 @@ |
832 |
- # Statically linked extensions |
833 |
- # |
834 |
- TESTSRC += \ |
835 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
836 |
- $(TOP)/ext/expert/test_expert.c \ |
837 |
- $(TOP)/ext/misc/amatch.c \ |
838 |
- $(TOP)/ext/misc/carray.c \ |
839 |
-@@ -450,8 +455,7 @@ |
840 |
- $(TOP)/ext/misc/spellfix.c \ |
841 |
- $(TOP)/ext/misc/totype.c \ |
842 |
- $(TOP)/ext/misc/unionvtab.c \ |
843 |
-- $(TOP)/ext/misc/wholenumber.c \ |
844 |
-- $(TOP)/ext/misc/zipfile.c |
845 |
-+ $(TOP)/ext/misc/wholenumber.c |
846 |
- |
847 |
- # Source code to the library files needed by the test fixture |
848 |
- # |
849 |
-@@ -615,25 +619,25 @@ |
850 |
- |
851 |
- libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
852 |
- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
853 |
-- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
854 |
-+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ |
855 |
- -rpath "$(TCLLIBDIR)" \ |
856 |
- -version-info "8:6:8" \ |
857 |
- -avoid-version |
858 |
- |
859 |
--sqlite3$(TEXE): shell.c sqlite3.c |
860 |
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ |
861 |
-- shell.c sqlite3.c \ |
862 |
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
863 |
-+sqlite3$(TEXE): shell.c libsqlite3.la |
864 |
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \ |
865 |
-+ shell.c libsqlite3.la \ |
866 |
-+ $(LIBREADLINE) |
867 |
- |
868 |
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h |
869 |
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) |
870 |
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la |
871 |
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la |
872 |
- |
873 |
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h |
874 |
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) |
875 |
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la |
876 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la |
877 |
- |
878 |
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo |
879 |
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la |
880 |
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ |
881 |
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) |
882 |
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la |
883 |
- |
884 |
- srcck1$(BEXE): $(TOP)/tool/srcck1.c |
885 |
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c |
886 |
-@@ -712,7 +716,7 @@ |
887 |
- # Rule to build the amalgamation |
888 |
- # |
889 |
- sqlite3.lo: sqlite3.c |
890 |
-- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c |
891 |
-+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c |
892 |
- |
893 |
- # Rules to build the LEMON compiler generator |
894 |
- # |
895 |
-@@ -1009,14 +1013,9 @@ |
896 |
- # Source files that go into making shell.c |
897 |
- SHELL_SRC = \ |
898 |
- $(TOP)/src/shell.c.in \ |
899 |
-- $(TOP)/ext/misc/appendvfs.c \ |
900 |
- $(TOP)/ext/misc/shathree.c \ |
901 |
- $(TOP)/ext/misc/fileio.c \ |
902 |
- $(TOP)/ext/misc/completion.c \ |
903 |
-- $(TOP)/ext/misc/sqlar.c \ |
904 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
905 |
-- $(TOP)/ext/expert/sqlite3expert.h \ |
906 |
-- $(TOP)/ext/misc/zipfile.c \ |
907 |
- $(TOP)/src/test_windirent.c |
908 |
- |
909 |
- shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl |
910 |
-@@ -1175,15 +1174,15 @@ |
911 |
- |
912 |
- # Fuzz testing |
913 |
- fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
914 |
-- ./fuzzcheck$(TEXE) $(FUZZDATA) |
915 |
-+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) |
916 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
917 |
- |
918 |
- fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
919 |
-- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) |
920 |
-+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) |
921 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
922 |
- |
923 |
- valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
924 |
-- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) |
925 |
-+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) |
926 |
- valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
927 |
- |
928 |
- # The veryquick.test TCL tests. |
929 |
-@@ -1214,24 +1213,23 @@ |
930 |
- smoketest: $(TESTPROGS) fuzzcheck$(TEXE) |
931 |
- ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) |
932 |
- |
933 |
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
934 |
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
935 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c |
936 |
- |
937 |
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c |
938 |
-- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) |
939 |
-+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la |
940 |
-+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) |
941 |
- |
942 |
--sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
943 |
-+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
944 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c |
945 |
- |
946 |
--sqltclsh$(TEXE): sqltclsh.c |
947 |
-- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) |
948 |
-+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la |
949 |
-+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) |
950 |
- |
951 |
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c |
952 |
-- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) |
953 |
-+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la |
954 |
-+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la |
955 |
- |
956 |
- CHECKER_DEPS =\ |
957 |
- $(TOP)/tool/mkccode.tcl \ |
958 |
-- sqlite3.c \ |
959 |
- $(TOP)/src/tclsqlite.c \ |
960 |
- $(TOP)/ext/repair/sqlite3_checker.tcl \ |
961 |
- $(TOP)/ext/repair/checkindex.c \ |
962 |
-@@ -1242,30 +1240,30 @@ |
963 |
- sqlite3_checker.c: $(CHECKER_DEPS) |
964 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ |
965 |
- |
966 |
--sqlite3_checker$(TEXE): sqlite3_checker.c |
967 |
-- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) |
968 |
-+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la |
969 |
-+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) |
970 |
- |
971 |
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo |
972 |
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la |
973 |
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ |
974 |
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) |
975 |
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la |
976 |
- |
977 |
--showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo |
978 |
-- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) |
979 |
-+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la |
980 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la |
981 |
- |
982 |
--showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo |
983 |
-- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) |
984 |
-+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la |
985 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la |
986 |
- |
987 |
--showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo |
988 |
-- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) |
989 |
-+showjournal$(TEXE): $(TOP)/tool/showjournal.c |
990 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c |
991 |
- |
992 |
--showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo |
993 |
-- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) |
994 |
-+showwal$(TEXE): $(TOP)/tool/showwal.c |
995 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c |
996 |
- |
997 |
- showshm$(TEXE): $(TOP)/tool/showshm.c |
998 |
- $(LTLINK) -o $@ $(TOP)/tool/showshm.c |
999 |
- |
1000 |
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo |
1001 |
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) |
1002 |
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la |
1003 |
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la |
1004 |
- |
1005 |
- rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo |
1006 |
- $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS) |
1007 |
-@@ -1284,11 +1282,11 @@ |
1008 |
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c |
1009 |
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) |
1010 |
- |
1011 |
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo |
1012 |
-- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) |
1013 |
-+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la |
1014 |
-+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la |
1015 |
- |
1016 |
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
1017 |
-- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) |
1018 |
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
1019 |
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ |
1020 |
- |
1021 |
- # This target will fail if the SQLite amalgamation contains any exported |
1022 |
- # symbols that do not begin with "sqlite3_". It is run as part of the |
1023 |
---- /configure.ac |
1024 |
-+++ /configure.ac |
1025 |
-@@ -590,6 +590,9 @@ |
1026 |
- if test "${use_loadextension}" = "yes" ; then |
1027 |
- OPT_FEATURE_FLAGS="" |
1028 |
- AC_SEARCH_LIBS(dlopen, dl) |
1029 |
-+ if test "${ac_cv_search_dlopen}" = "no" ; then |
1030 |
-+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
1031 |
-+ fi |
1032 |
- else |
1033 |
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
1034 |
- fi |
1035 |
---- /ext/misc/sqlar.c |
1036 |
-+++ /ext/misc/sqlar.c |
1037 |
-@@ -14,6 +14,8 @@ |
1038 |
- ** for working with sqlar archives and used by the shell tool's built-in |
1039 |
- ** sqlar support. |
1040 |
- */ |
1041 |
-+#ifdef SQLITE_HAVE_ZLIB |
1042 |
-+ |
1043 |
- #include "sqlite3ext.h" |
1044 |
- SQLITE_EXTENSION_INIT1 |
1045 |
- #include <zlib.h> |
1046 |
-@@ -119,3 +121,5 @@ |
1047 |
- } |
1048 |
- return rc; |
1049 |
- } |
1050 |
-+ |
1051 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
1052 |
---- /ext/misc/zipfile.c |
1053 |
-+++ /ext/misc/zipfile.c |
1054 |
-@@ -24,6 +24,8 @@ |
1055 |
- ** * No support for zip64 extensions |
1056 |
- ** * Only the "inflate/deflate" (zlib) compression method is supported |
1057 |
- */ |
1058 |
-+#ifdef SQLITE_HAVE_ZLIB |
1059 |
-+ |
1060 |
- #include "sqlite3ext.h" |
1061 |
- SQLITE_EXTENSION_INIT1 |
1062 |
- #include <stdio.h> |
1063 |
-@@ -2175,3 +2177,5 @@ |
1064 |
- (void)pzErrMsg; /* Unused parameter */ |
1065 |
- return zipfileRegister(db); |
1066 |
- } |
1067 |
-+ |
1068 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
1069 |
---- /ext/repair/sqlite3_checker.c.in |
1070 |
-+++ /ext/repair/sqlite3_checker.c.in |
1071 |
-@@ -2,6 +2,7 @@ |
1072 |
- ** Read an SQLite database file and analyze its space utilization. Generate |
1073 |
- ** text on standard output. |
1074 |
- */ |
1075 |
-+#define SQLITE_CORE 1 |
1076 |
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc |
1077 |
- #define SQLITE_ENABLE_DBPAGE_VTAB 1 |
1078 |
- #define SQLITE_ENABLE_JSON1 1 |
1079 |
-@@ -14,7 +15,7 @@ |
1080 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
1081 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1082 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1083 |
--INCLUDE sqlite3.c |
1084 |
-+#include "sqlite3.h" |
1085 |
- INCLUDE $ROOT/src/tclsqlite.c |
1086 |
- INCLUDE $ROOT/ext/misc/btreeinfo.c |
1087 |
- INCLUDE $ROOT/ext/repair/checkindex.c |
1088 |
---- /src/shell.c.in |
1089 |
-+++ /src/shell.c.in |
1090 |
-@@ -61,6 +61,7 @@ |
1091 |
- #include <stdio.h> |
1092 |
- #include <assert.h> |
1093 |
- #include "sqlite3.h" |
1094 |
-+#include "ext/expert/sqlite3expert.h" |
1095 |
- typedef sqlite3_int64 i64; |
1096 |
- typedef sqlite3_uint64 u64; |
1097 |
- typedef unsigned char u8; |
1098 |
-@@ -124,6 +125,10 @@ |
1099 |
- # define SHELL_USE_LOCAL_GETLINE 1 |
1100 |
- #endif |
1101 |
- |
1102 |
-+#ifdef SQLITE_HAVE_ZLIB |
1103 |
-+#include <zlib.h> |
1104 |
-+#endif |
1105 |
-+ |
1106 |
- |
1107 |
- #if defined(_WIN32) || defined(WIN32) |
1108 |
- # include <io.h> |
1109 |
-@@ -939,13 +944,6 @@ |
1110 |
- INCLUDE ../ext/misc/shathree.c |
1111 |
- INCLUDE ../ext/misc/fileio.c |
1112 |
- INCLUDE ../ext/misc/completion.c |
1113 |
--INCLUDE ../ext/misc/appendvfs.c |
1114 |
--#ifdef SQLITE_HAVE_ZLIB |
1115 |
--INCLUDE ../ext/misc/zipfile.c |
1116 |
--INCLUDE ../ext/misc/sqlar.c |
1117 |
--#endif |
1118 |
--INCLUDE ../ext/expert/sqlite3expert.h |
1119 |
--INCLUDE ../ext/expert/sqlite3expert.c |
1120 |
- |
1121 |
- #if defined(SQLITE_ENABLE_SESSION) |
1122 |
- /* |
1123 |
-@@ -3632,7 +3630,9 @@ |
1124 |
- sqlite3_shathree_init(p->db, 0, 0); |
1125 |
- sqlite3_completion_init(p->db, 0, 0); |
1126 |
- #ifdef SQLITE_HAVE_ZLIB |
1127 |
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1128 |
- sqlite3_zipfile_init(p->db, 0, 0); |
1129 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1130 |
- sqlite3_sqlar_init(p->db, 0, 0); |
1131 |
- #endif |
1132 |
- sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, |
1133 |
-@@ -5523,6 +5523,7 @@ |
1134 |
- goto end_ar_command; |
1135 |
- } |
1136 |
- sqlite3_fileio_init(cmd.db, 0, 0); |
1137 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1138 |
- sqlite3_sqlar_init(cmd.db, 0, 0); |
1139 |
- sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, |
1140 |
- shellPutsFunc, 0, 0); |
1141 |
-@@ -8539,6 +8540,7 @@ |
1142 |
- #endif |
1143 |
- } |
1144 |
- data.out = stdout; |
1145 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1146 |
- sqlite3_appendvfs_init(0,0,0); |
1147 |
- |
1148 |
- /* Go ahead and open the database file if it already exists. If the |
1149 |
---- /tool/mksqlite3c.tcl |
1150 |
-+++ /tool/mksqlite3c.tcl |
1151 |
-@@ -116,6 +116,7 @@ |
1152 |
- rtree.h |
1153 |
- sqlite3session.h |
1154 |
- sqlite3.h |
1155 |
-+ sqlite3expert.h |
1156 |
- sqlite3ext.h |
1157 |
- sqlite3rbu.h |
1158 |
- sqliteicu.h |
1159 |
-@@ -401,6 +402,10 @@ |
1160 |
- json1.c |
1161 |
- fts5.c |
1162 |
- stmt.c |
1163 |
-+ appendvfs.c |
1164 |
-+ sqlar.c |
1165 |
-+ sqlite3expert.c |
1166 |
-+ zipfile.c |
1167 |
- } { |
1168 |
- copy_file tsrc/$file |
1169 |
- } |
1170 |
---- /tool/sqlite3_analyzer.c.in |
1171 |
-+++ /tool/sqlite3_analyzer.c.in |
1172 |
-@@ -14,9 +14,6 @@ |
1173 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1174 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1175 |
- #define SQLITE_OMIT_LOAD_EXTENSION 1 |
1176 |
--#ifndef USE_EXTERNAL_SQLITE |
1177 |
--INCLUDE sqlite3.c |
1178 |
--#endif |
1179 |
- INCLUDE $ROOT/src/tclsqlite.c |
1180 |
- |
1181 |
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ |
1182 |
---- /tool/sqltclsh.c.in |
1183 |
-+++ /tool/sqltclsh.c.in |
1184 |
-@@ -27,19 +27,17 @@ |
1185 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
1186 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1187 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1188 |
--INCLUDE sqlite3.c |
1189 |
--INCLUDE $ROOT/ext/misc/appendvfs.c |
1190 |
--#ifdef SQLITE_HAVE_ZLIB |
1191 |
--INCLUDE $ROOT/ext/misc/zipfile.c |
1192 |
--INCLUDE $ROOT/ext/misc/sqlar.c |
1193 |
--#endif |
1194 |
-+#include "sqlite3.h" |
1195 |
- INCLUDE $ROOT/src/tclsqlite.c |
1196 |
- |
1197 |
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ |
1198 |
- (void)interp; |
1199 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); |
1200 |
- sqlite3_appendvfs_init(0,0,0); |
1201 |
- #ifdef SQLITE_HAVE_ZLIB |
1202 |
-+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1203 |
- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); |
1204 |
-+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1205 |
- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); |
1206 |
- #endif |
1207 |
- |
1208 |
|
1209 |
diff --git a/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch b/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch |
1210 |
deleted file mode 100644 |
1211 |
index 69ab0482270..00000000000 |
1212 |
--- a/dev-db/sqlite/files/sqlite-3.24.0-nonfull_archive-archive_command_paths_handling.patch |
1213 |
+++ /dev/null |
1214 |
@@ -1,14 +0,0 @@ |
1215 |
-https://sqlite.org/src/info/27291f2d7fd4dadf |
1216 |
- |
1217 |
---- /shell.c |
1218 |
-+++ /shell.c |
1219 |
-@@ -12786,7 +12786,8 @@ |
1220 |
- "SELECT " |
1221 |
- " ($dir || name)," |
1222 |
- " writefile(($dir || name), %s, mode, mtime) " |
1223 |
-- "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)"; |
1224 |
-+ "FROM %s WHERE (%s) AND (data IS NULL OR $dirOnly = 0)" |
1225 |
-+ " AND name NOT GLOB '*..[/\\]*'"; |
1226 |
- |
1227 |
- const char *azExtraArg[] = { |
1228 |
- "sqlar_uncompress(data, sz)", |
1229 |
|
1230 |
diff --git a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch |
1231 |
deleted file mode 100644 |
1232 |
index 6b34e2e4f9d..00000000000 |
1233 |
--- a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch |
1234 |
+++ /dev/null |
1235 |
@@ -1,49 +0,0 @@ |
1236 |
-https://sqlite.org/src/info/e8275b415a2f03bee |
1237 |
-https://sqlite.org/src/info/7fc2994434c7d9ed |
1238 |
- |
1239 |
---- /src/select.c |
1240 |
-+++ /src/select.c |
1241 |
-@@ -2318,6 +2318,13 @@ |
1242 |
- Expr *pLimit; /* Saved LIMIT and OFFSET */ |
1243 |
- int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */ |
1244 |
- |
1245 |
-+#ifndef SQLITE_OMIT_WINDOWFUNC |
1246 |
-+ if( p->pWin ){ |
1247 |
-+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries"); |
1248 |
-+ return; |
1249 |
-+ } |
1250 |
-+#endif |
1251 |
-+ |
1252 |
- /* Obtain authorization to do a recursive query */ |
1253 |
- if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return; |
1254 |
- |
1255 |
---- /test/with1.test |
1256 |
-+++ /test/with1.test |
1257 |
-@@ -865,6 +865,27 @@ |
1258 |
- SELECT * FROM i; |
1259 |
- } {1 {recursive aggregate queries not supported}} |
1260 |
- |
1261 |
-+# Or window-function recursive queries. Ticket e8275b41. |
1262 |
-+# |
1263 |
-+ifcapable windowfunc { |
1264 |
-+ do_catchsql_test 16.2 { |
1265 |
-+ WITH RECURSIVE |
1266 |
-+ i(x) AS (VALUES(1) UNION SELECT count(*) OVER () FROM i) |
1267 |
-+ SELECT * FROM i; |
1268 |
-+ } {1 {cannot use window functions in recursive queries}} |
1269 |
-+ do_catchsql_test 16.3 { |
1270 |
-+ WITH RECURSIVE |
1271 |
-+ t(id, parent) AS (VALUES(1,2)), |
1272 |
-+ q(id, parent, rn) AS ( |
1273 |
-+ VALUES(1,2,3) |
1274 |
-+ UNION ALL |
1275 |
-+ SELECT t.*, ROW_NUMBER() OVER (ORDER BY t.id) AS rn |
1276 |
-+ FROM q JOIN t ON t.parent = q.id |
1277 |
-+ ) |
1278 |
-+ SELECT * FROM q; |
1279 |
-+ } {1 {cannot use window functions in recursive queries}} |
1280 |
-+} |
1281 |
-+ |
1282 |
- #------------------------------------------------------------------------- |
1283 |
- do_execsql_test 17.1 { |
1284 |
- WITH x(a) AS ( |
1285 |
|
1286 |
diff --git a/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch b/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch |
1287 |
deleted file mode 100644 |
1288 |
index 4ee3d477cfc..00000000000 |
1289 |
--- a/dev-db/sqlite/files/sqlite-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch |
1290 |
+++ /dev/null |
1291 |
@@ -1,19 +0,0 @@ |
1292 |
-https://sqlite.org/src/info/e8275b415a2f03bee |
1293 |
-https://sqlite.org/src/info/7fc2994434c7d9ed |
1294 |
- |
1295 |
---- /sqlite3.c |
1296 |
-+++ /sqlite3.c |
1297 |
-@@ -125441,6 +125441,13 @@ |
1298 |
- Expr *pLimit; /* Saved LIMIT and OFFSET */ |
1299 |
- int regLimit, regOffset; /* Registers used by LIMIT and OFFSET */ |
1300 |
- |
1301 |
-+#ifndef SQLITE_OMIT_WINDOWFUNC |
1302 |
-+ if( p->pWin ){ |
1303 |
-+ sqlite3ErrorMsg(pParse, "cannot use window functions in recursive queries"); |
1304 |
-+ return; |
1305 |
-+ } |
1306 |
-+#endif |
1307 |
-+ |
1308 |
- /* Obtain authorization to do a recursive query */ |
1309 |
- if( sqlite3AuthCheck(pParse, SQLITE_RECURSIVE, 0, 0, 0) ) return; |
1310 |
- |
1311 |
|
1312 |
diff --git a/dev-db/sqlite/sqlite-3.23.1.ebuild b/dev-db/sqlite/sqlite-3.23.1.ebuild |
1313 |
deleted file mode 100644 |
1314 |
index f0cc7198b25..00000000000 |
1315 |
--- a/dev-db/sqlite/sqlite-3.23.1.ebuild |
1316 |
+++ /dev/null |
1317 |
@@ -1,309 +0,0 @@ |
1318 |
-# Copyright 1999-2018 Gentoo Foundation |
1319 |
-# Distributed under the terms of the GNU General Public License v2 |
1320 |
- |
1321 |
-EAPI="6" |
1322 |
- |
1323 |
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator |
1324 |
- |
1325 |
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" |
1326 |
-DOC_PV="${SRC_PV}" |
1327 |
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" |
1328 |
- |
1329 |
-DESCRIPTION="A SQL Database Engine in a C Library" |
1330 |
-HOMEPAGE="https://sqlite.org/" |
1331 |
-SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) |
1332 |
- tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1333 |
- test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1334 |
- tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1335 |
- !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" |
1336 |
- |
1337 |
-LICENSE="public-domain" |
1338 |
-SLOT="3" |
1339 |
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1340 |
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
1341 |
- |
1342 |
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
1343 |
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
1344 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
1345 |
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
1346 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
1347 |
-DEPEND="${RDEPEND} |
1348 |
- doc? ( app-arch/unzip ) |
1349 |
- tcl? ( app-arch/unzip ) |
1350 |
- test? ( |
1351 |
- app-arch/unzip |
1352 |
- >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] |
1353 |
- ) |
1354 |
- tools? ( app-arch/unzip )" |
1355 |
- |
1356 |
-full_archive() { |
1357 |
- use tcl || use test || use tools |
1358 |
-} |
1359 |
- |
1360 |
-pkg_setup() { |
1361 |
- if full_archive; then |
1362 |
- S="${WORKDIR}/${PN}-src-${SRC_PV}" |
1363 |
- else |
1364 |
- S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" |
1365 |
- fi |
1366 |
-} |
1367 |
- |
1368 |
-src_prepare() { |
1369 |
- if full_archive; then |
1370 |
- eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch" |
1371 |
- eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" |
1372 |
- eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch" |
1373 |
- |
1374 |
- eapply_user |
1375 |
- |
1376 |
- # Fix AC_CHECK_FUNCS. |
1377 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1378 |
- sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" |
1379 |
- else |
1380 |
- eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" |
1381 |
- eapply "${FILESDIR}/${PN}-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch" |
1382 |
- |
1383 |
- eapply_user |
1384 |
- |
1385 |
- # Fix AC_CHECK_FUNCS. |
1386 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1387 |
- sed \ |
1388 |
- -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ |
1389 |
- -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ |
1390 |
- -i configure.ac || die "sed failed" |
1391 |
- fi |
1392 |
- |
1393 |
- eautoreconf |
1394 |
- |
1395 |
- multilib_copy_sources |
1396 |
-} |
1397 |
- |
1398 |
-multilib_src_configure() { |
1399 |
- local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() |
1400 |
- |
1401 |
- options+=( |
1402 |
- --enable-$(full_archive && echo load-extension || echo dynamic-extensions) |
1403 |
- --enable-threadsafe |
1404 |
- ) |
1405 |
- if ! full_archive; then |
1406 |
- options+=(--disable-static-shell) |
1407 |
- fi |
1408 |
- |
1409 |
- # Support detection of misuse of SQLite API. |
1410 |
- # https://sqlite.org/compile.html#enable_api_armor |
1411 |
- append-cppflags -DSQLITE_ENABLE_API_ARMOR |
1412 |
- |
1413 |
- # Support column metadata functions. |
1414 |
- # https://sqlite.org/c3ref/column_database_name.html |
1415 |
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
1416 |
- |
1417 |
- # Support sqlite_dbpage virtual table. |
1418 |
- # https://sqlite.org/compile.html#enable_dbpage_vtab |
1419 |
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
1420 |
- |
1421 |
- # Support dbstat virtual table. |
1422 |
- # https://sqlite.org/dbstat.html |
1423 |
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
1424 |
- |
1425 |
- # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
1426 |
- # https://sqlite.org/compile.html#enable_deserialize |
1427 |
- # https://sqlite.org/c3ref/serialize.html |
1428 |
- # https://sqlite.org/c3ref/deserialize.html |
1429 |
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
1430 |
- |
1431 |
- # Support comments in output of EXPLAIN. |
1432 |
- # https://sqlite.org/compile.html#enable_explain_comments |
1433 |
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
1434 |
- |
1435 |
- # Support Full-Text Search versions 3, 4 and 5. |
1436 |
- # https://sqlite.org/fts3.html |
1437 |
- # https://sqlite.org/fts5.html |
1438 |
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
1439 |
- options+=(--enable-fts5) |
1440 |
- |
1441 |
- # Support hidden columns. |
1442 |
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
1443 |
- |
1444 |
- # Support JSON1 extension. |
1445 |
- # https://sqlite.org/json1.html |
1446 |
- append-cppflags -DSQLITE_ENABLE_JSON1 |
1447 |
- |
1448 |
- # Support memsys5 memory allocator. |
1449 |
- # https://sqlite.org/malloc.html#memsys5 |
1450 |
- append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
1451 |
- |
1452 |
- # Support sqlite_offset() function. |
1453 |
- # https://sqlite.org/lang_corefunc.html#sqlite_offset |
1454 |
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
1455 |
- |
1456 |
- # Support pre-update hook functions. |
1457 |
- # https://sqlite.org/c3ref/preupdate_count.html |
1458 |
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
1459 |
- |
1460 |
- # Support Resumable Bulk Update extension. |
1461 |
- # https://sqlite.org/rbu.html |
1462 |
- append-cppflags -DSQLITE_ENABLE_RBU |
1463 |
- |
1464 |
- # Support R*Trees. |
1465 |
- # https://sqlite.org/rtree.html |
1466 |
- append-cppflags -DSQLITE_ENABLE_RTREE |
1467 |
- |
1468 |
- # Support scan status functions. |
1469 |
- # https://sqlite.org/c3ref/stmt_scanstatus.html |
1470 |
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
1471 |
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
1472 |
- |
1473 |
- # Support sqlite_stmt virtual table. |
1474 |
- # https://sqlite.org/stmt.html |
1475 |
- append-cppflags -DSQLITE_ENABLE_STMTVTAB |
1476 |
- |
1477 |
- # Support Session extension. |
1478 |
- # https://sqlite.org/sessionintro.html |
1479 |
- options+=(--enable-session) |
1480 |
- |
1481 |
- # Support unknown() function. |
1482 |
- # https://sqlite.org/compile.html#enable_unknown_sql_function |
1483 |
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
1484 |
- |
1485 |
- # Support unlock notification. |
1486 |
- # https://sqlite.org/unlock_notify.html |
1487 |
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
1488 |
- |
1489 |
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
1490 |
- # https://sqlite.org/compile.html#enable_update_delete_limit |
1491 |
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
1492 |
- |
1493 |
- # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. |
1494 |
- # https://sqlite.org/pragma.html#pragma_function_list |
1495 |
- # https://sqlite.org/pragma.html#pragma_module_list |
1496 |
- # https://sqlite.org/pragma.html#pragma_pragma_list |
1497 |
- append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS |
1498 |
- |
1499 |
- # Support soundex() function. |
1500 |
- # https://sqlite.org/lang_corefunc.html#soundex |
1501 |
- append-cppflags -DSQLITE_SOUNDEX |
1502 |
- |
1503 |
- # debug USE flag. |
1504 |
- if full_archive; then |
1505 |
- options+=($(use_enable debug)) |
1506 |
- else |
1507 |
- if use debug; then |
1508 |
- append-cppflags -DSQLITE_DEBUG |
1509 |
- else |
1510 |
- append-cppflags -DNDEBUG |
1511 |
- fi |
1512 |
- fi |
1513 |
- |
1514 |
- # icu USE flag. |
1515 |
- if use icu; then |
1516 |
- # Support ICU extension. |
1517 |
- # https://sqlite.org/compile.html#enable_icu |
1518 |
- append-cppflags -DSQLITE_ENABLE_ICU |
1519 |
- if full_archive; then |
1520 |
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1521 |
- else |
1522 |
- sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1523 |
- fi |
1524 |
- fi |
1525 |
- |
1526 |
- # readline USE flag. |
1527 |
- options+=( |
1528 |
- --disable-editline |
1529 |
- $(use_enable readline) |
1530 |
- ) |
1531 |
- if full_archive && use readline; then |
1532 |
- options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") |
1533 |
- fi |
1534 |
- |
1535 |
- # secure-delete USE flag. |
1536 |
- if use secure-delete; then |
1537 |
- # Enable secure_delete pragma by default. |
1538 |
- # https://sqlite.org/pragma.html#pragma_secure_delete |
1539 |
- append-cppflags -DSQLITE_SECURE_DELETE |
1540 |
- fi |
1541 |
- |
1542 |
- # static-libs USE flag. |
1543 |
- options+=($(use_enable static-libs static)) |
1544 |
- |
1545 |
- # tcl, test, tools USE flags. |
1546 |
- if full_archive; then |
1547 |
- options+=(--enable-tcl) |
1548 |
- fi |
1549 |
- |
1550 |
- if [[ "${CHOST}" == *-mint* ]]; then |
1551 |
- append-cppflags -DSQLITE_OMIT_WAL |
1552 |
- fi |
1553 |
- |
1554 |
- if [[ "${ABI}" == "x86" ]]; then |
1555 |
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
1556 |
- append-cflags -mfpmath=sse |
1557 |
- else |
1558 |
- append-cflags -ffloat-store |
1559 |
- fi |
1560 |
- fi |
1561 |
- |
1562 |
- econf "${options[@]}" |
1563 |
-} |
1564 |
- |
1565 |
-multilib_src_compile() { |
1566 |
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
1567 |
- |
1568 |
- if use tools && multilib_is_native_abi; then |
1569 |
- emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
1570 |
- fi |
1571 |
-} |
1572 |
- |
1573 |
-multilib_src_test() { |
1574 |
- if [[ "${EUID}" -eq 0 ]]; then |
1575 |
- ewarn "Skipping tests due to root permissions" |
1576 |
- return |
1577 |
- fi |
1578 |
- |
1579 |
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
1580 |
-} |
1581 |
- |
1582 |
-multilib_src_install() { |
1583 |
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
1584 |
- |
1585 |
- if use tools && multilib_is_native_abi; then |
1586 |
- install_tool() { |
1587 |
- if [[ -f ".libs/${1}" ]]; then |
1588 |
- newbin ".libs/${1}" "${2}" |
1589 |
- else |
1590 |
- newbin "${1}" "${2}" |
1591 |
- fi |
1592 |
- } |
1593 |
- |
1594 |
- install_tool changeset sqlite3-changeset |
1595 |
- install_tool dbdump sqlite3-db-dump |
1596 |
- install_tool dbhash sqlite3-db-hash |
1597 |
- install_tool rbu sqlite3-rbu |
1598 |
- install_tool scrub sqlite3-scrub |
1599 |
- install_tool showdb sqlite3-show-db |
1600 |
- install_tool showjournal sqlite3-show-journal |
1601 |
- install_tool showshm sqlite3-show-shm |
1602 |
- install_tool showstat4 sqlite3-show-stat4 |
1603 |
- install_tool showwal sqlite3-show-wal |
1604 |
- install_tool sqldiff sqlite3-diff |
1605 |
- install_tool sqlite3_analyzer sqlite3-analyzer |
1606 |
- install_tool sqlite3_checker sqlite3-checker |
1607 |
- install_tool sqlite3_expert sqlite3-expert |
1608 |
- install_tool sqltclsh sqlite3-tclsh |
1609 |
- |
1610 |
- unset -f install_tool |
1611 |
- fi |
1612 |
-} |
1613 |
- |
1614 |
-multilib_src_install_all() { |
1615 |
- prune_libtool_files |
1616 |
- |
1617 |
- doman sqlite3.1 |
1618 |
- |
1619 |
- if use doc; then |
1620 |
- rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} |
1621 |
- ( |
1622 |
- docinto html |
1623 |
- dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* |
1624 |
- ) |
1625 |
- fi |
1626 |
-} |
1627 |
|
1628 |
diff --git a/dev-db/sqlite/sqlite-3.24.0.ebuild b/dev-db/sqlite/sqlite-3.24.0.ebuild |
1629 |
deleted file mode 100644 |
1630 |
index 40a4b400b2c..00000000000 |
1631 |
--- a/dev-db/sqlite/sqlite-3.24.0.ebuild |
1632 |
+++ /dev/null |
1633 |
@@ -1,308 +0,0 @@ |
1634 |
-# Copyright 1999-2018 Gentoo Foundation |
1635 |
-# Distributed under the terms of the GNU General Public License v2 |
1636 |
- |
1637 |
-EAPI="6" |
1638 |
- |
1639 |
-inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator |
1640 |
- |
1641 |
-SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))" |
1642 |
-DOC_PV="${SRC_PV}" |
1643 |
-# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))" |
1644 |
- |
1645 |
-DESCRIPTION="SQL database engine" |
1646 |
-HOMEPAGE="https://sqlite.org/" |
1647 |
-SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) |
1648 |
- tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1649 |
- test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1650 |
- tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1651 |
- !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" |
1652 |
- |
1653 |
-LICENSE="public-domain" |
1654 |
-SLOT="3" |
1655 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1656 |
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
1657 |
- |
1658 |
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
1659 |
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
1660 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
1661 |
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
1662 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
1663 |
-DEPEND="${RDEPEND} |
1664 |
- doc? ( app-arch/unzip ) |
1665 |
- tcl? ( app-arch/unzip ) |
1666 |
- test? ( |
1667 |
- app-arch/unzip |
1668 |
- >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] |
1669 |
- ) |
1670 |
- tools? ( app-arch/unzip )" |
1671 |
- |
1672 |
-full_archive() { |
1673 |
- use tcl || use test || use tools |
1674 |
-} |
1675 |
- |
1676 |
-pkg_setup() { |
1677 |
- if full_archive; then |
1678 |
- S="${WORKDIR}/${PN}-src-${SRC_PV}" |
1679 |
- else |
1680 |
- S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" |
1681 |
- fi |
1682 |
-} |
1683 |
- |
1684 |
-src_prepare() { |
1685 |
- if full_archive; then |
1686 |
- eapply "${FILESDIR}/${PN}-3.24.0-full_archive-build.patch" |
1687 |
- eapply "${FILESDIR}/${PN}-3.24.0-full_archive-archive_command_paths_handling.patch" |
1688 |
- |
1689 |
- eapply_user |
1690 |
- |
1691 |
- # Fix AC_CHECK_FUNCS. |
1692 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1693 |
- sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" |
1694 |
- else |
1695 |
- eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch" |
1696 |
- eapply "${FILESDIR}/${PN}-3.24.0-nonfull_archive-archive_command_paths_handling.patch" |
1697 |
- |
1698 |
- eapply_user |
1699 |
- |
1700 |
- # Fix AC_CHECK_FUNCS. |
1701 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1702 |
- sed \ |
1703 |
- -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ |
1704 |
- -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ |
1705 |
- -i configure.ac || die "sed failed" |
1706 |
- fi |
1707 |
- |
1708 |
- eautoreconf |
1709 |
- |
1710 |
- multilib_copy_sources |
1711 |
-} |
1712 |
- |
1713 |
-multilib_src_configure() { |
1714 |
- local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() |
1715 |
- |
1716 |
- options+=( |
1717 |
- --enable-$(full_archive && echo load-extension || echo dynamic-extensions) |
1718 |
- --enable-threadsafe |
1719 |
- ) |
1720 |
- if ! full_archive; then |
1721 |
- options+=(--disable-static-shell) |
1722 |
- fi |
1723 |
- |
1724 |
- # Support detection of misuse of SQLite API. |
1725 |
- # https://sqlite.org/compile.html#enable_api_armor |
1726 |
- append-cppflags -DSQLITE_ENABLE_API_ARMOR |
1727 |
- |
1728 |
- # Support column metadata functions. |
1729 |
- # https://sqlite.org/c3ref/column_database_name.html |
1730 |
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
1731 |
- |
1732 |
- # Support sqlite_dbpage virtual table. |
1733 |
- # https://sqlite.org/compile.html#enable_dbpage_vtab |
1734 |
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
1735 |
- |
1736 |
- # Support dbstat virtual table. |
1737 |
- # https://sqlite.org/dbstat.html |
1738 |
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
1739 |
- |
1740 |
- # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
1741 |
- # https://sqlite.org/compile.html#enable_deserialize |
1742 |
- # https://sqlite.org/c3ref/serialize.html |
1743 |
- # https://sqlite.org/c3ref/deserialize.html |
1744 |
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
1745 |
- |
1746 |
- # Support comments in output of EXPLAIN. |
1747 |
- # https://sqlite.org/compile.html#enable_explain_comments |
1748 |
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
1749 |
- |
1750 |
- # Support Full-Text Search versions 3, 4 and 5. |
1751 |
- # https://sqlite.org/fts3.html |
1752 |
- # https://sqlite.org/fts5.html |
1753 |
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
1754 |
- options+=(--enable-fts5) |
1755 |
- |
1756 |
- # Support hidden columns. |
1757 |
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
1758 |
- |
1759 |
- # Support JSON1 extension. |
1760 |
- # https://sqlite.org/json1.html |
1761 |
- append-cppflags -DSQLITE_ENABLE_JSON1 |
1762 |
- |
1763 |
- # Support memsys5 memory allocator. |
1764 |
- # https://sqlite.org/malloc.html#memsys5 |
1765 |
- append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
1766 |
- |
1767 |
- # Support sqlite_offset() function. |
1768 |
- # https://sqlite.org/lang_corefunc.html#sqlite_offset |
1769 |
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
1770 |
- |
1771 |
- # Support pre-update hook functions. |
1772 |
- # https://sqlite.org/c3ref/preupdate_count.html |
1773 |
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
1774 |
- |
1775 |
- # Support Resumable Bulk Update extension. |
1776 |
- # https://sqlite.org/rbu.html |
1777 |
- append-cppflags -DSQLITE_ENABLE_RBU |
1778 |
- |
1779 |
- # Support R*Trees. |
1780 |
- # https://sqlite.org/rtree.html |
1781 |
- append-cppflags -DSQLITE_ENABLE_RTREE |
1782 |
- |
1783 |
- # Support scan status functions. |
1784 |
- # https://sqlite.org/c3ref/stmt_scanstatus.html |
1785 |
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
1786 |
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
1787 |
- |
1788 |
- # Support sqlite_stmt virtual table. |
1789 |
- # https://sqlite.org/stmt.html |
1790 |
- append-cppflags -DSQLITE_ENABLE_STMTVTAB |
1791 |
- |
1792 |
- # Support Session extension. |
1793 |
- # https://sqlite.org/sessionintro.html |
1794 |
- options+=(--enable-session) |
1795 |
- |
1796 |
- # Support unknown() function. |
1797 |
- # https://sqlite.org/compile.html#enable_unknown_sql_function |
1798 |
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
1799 |
- |
1800 |
- # Support unlock notification. |
1801 |
- # https://sqlite.org/unlock_notify.html |
1802 |
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
1803 |
- |
1804 |
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
1805 |
- # https://sqlite.org/compile.html#enable_update_delete_limit |
1806 |
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
1807 |
- |
1808 |
- # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. |
1809 |
- # https://sqlite.org/pragma.html#pragma_function_list |
1810 |
- # https://sqlite.org/pragma.html#pragma_module_list |
1811 |
- # https://sqlite.org/pragma.html#pragma_pragma_list |
1812 |
- append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS |
1813 |
- |
1814 |
- # Support soundex() function. |
1815 |
- # https://sqlite.org/lang_corefunc.html#soundex |
1816 |
- append-cppflags -DSQLITE_SOUNDEX |
1817 |
- |
1818 |
- # debug USE flag. |
1819 |
- if full_archive; then |
1820 |
- options+=($(use_enable debug)) |
1821 |
- else |
1822 |
- if use debug; then |
1823 |
- append-cppflags -DSQLITE_DEBUG |
1824 |
- else |
1825 |
- append-cppflags -DNDEBUG |
1826 |
- fi |
1827 |
- fi |
1828 |
- |
1829 |
- # icu USE flag. |
1830 |
- if use icu; then |
1831 |
- # Support ICU extension. |
1832 |
- # https://sqlite.org/compile.html#enable_icu |
1833 |
- append-cppflags -DSQLITE_ENABLE_ICU |
1834 |
- if full_archive; then |
1835 |
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1836 |
- else |
1837 |
- sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1838 |
- fi |
1839 |
- fi |
1840 |
- |
1841 |
- # readline USE flag. |
1842 |
- options+=( |
1843 |
- --disable-editline |
1844 |
- $(use_enable readline) |
1845 |
- ) |
1846 |
- if full_archive && use readline; then |
1847 |
- options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") |
1848 |
- fi |
1849 |
- |
1850 |
- # secure-delete USE flag. |
1851 |
- if use secure-delete; then |
1852 |
- # Enable secure_delete pragma by default. |
1853 |
- # https://sqlite.org/pragma.html#pragma_secure_delete |
1854 |
- append-cppflags -DSQLITE_SECURE_DELETE |
1855 |
- fi |
1856 |
- |
1857 |
- # static-libs USE flag. |
1858 |
- options+=($(use_enable static-libs static)) |
1859 |
- |
1860 |
- # tcl, test, tools USE flags. |
1861 |
- if full_archive; then |
1862 |
- options+=(--enable-tcl) |
1863 |
- fi |
1864 |
- |
1865 |
- if [[ "${CHOST}" == *-mint* ]]; then |
1866 |
- append-cppflags -DSQLITE_OMIT_WAL |
1867 |
- fi |
1868 |
- |
1869 |
- if [[ "${ABI}" == "x86" ]]; then |
1870 |
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
1871 |
- append-cflags -mfpmath=sse |
1872 |
- else |
1873 |
- append-cflags -ffloat-store |
1874 |
- fi |
1875 |
- fi |
1876 |
- |
1877 |
- econf "${options[@]}" |
1878 |
-} |
1879 |
- |
1880 |
-multilib_src_compile() { |
1881 |
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
1882 |
- |
1883 |
- if use tools && multilib_is_native_abi; then |
1884 |
- emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
1885 |
- fi |
1886 |
-} |
1887 |
- |
1888 |
-multilib_src_test() { |
1889 |
- if [[ "${EUID}" -eq 0 ]]; then |
1890 |
- ewarn "Skipping tests due to root permissions" |
1891 |
- return |
1892 |
- fi |
1893 |
- |
1894 |
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
1895 |
-} |
1896 |
- |
1897 |
-multilib_src_install() { |
1898 |
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
1899 |
- |
1900 |
- if use tools && multilib_is_native_abi; then |
1901 |
- install_tool() { |
1902 |
- if [[ -f ".libs/${1}" ]]; then |
1903 |
- newbin ".libs/${1}" "${2}" |
1904 |
- else |
1905 |
- newbin "${1}" "${2}" |
1906 |
- fi |
1907 |
- } |
1908 |
- |
1909 |
- install_tool changeset sqlite3-changeset |
1910 |
- install_tool dbdump sqlite3-db-dump |
1911 |
- install_tool dbhash sqlite3-db-hash |
1912 |
- install_tool rbu sqlite3-rbu |
1913 |
- install_tool scrub sqlite3-scrub |
1914 |
- install_tool showdb sqlite3-show-db |
1915 |
- install_tool showjournal sqlite3-show-journal |
1916 |
- install_tool showshm sqlite3-show-shm |
1917 |
- install_tool showstat4 sqlite3-show-stat4 |
1918 |
- install_tool showwal sqlite3-show-wal |
1919 |
- install_tool sqldiff sqlite3-diff |
1920 |
- install_tool sqlite3_analyzer sqlite3-analyzer |
1921 |
- install_tool sqlite3_checker sqlite3-checker |
1922 |
- install_tool sqlite3_expert sqlite3-expert |
1923 |
- install_tool sqltclsh sqlite3-tclsh |
1924 |
- |
1925 |
- unset -f install_tool |
1926 |
- fi |
1927 |
-} |
1928 |
- |
1929 |
-multilib_src_install_all() { |
1930 |
- prune_libtool_files |
1931 |
- |
1932 |
- doman sqlite3.1 |
1933 |
- |
1934 |
- if use doc; then |
1935 |
- rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} |
1936 |
- ( |
1937 |
- docinto html |
1938 |
- dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* |
1939 |
- ) |
1940 |
- fi |
1941 |
-} |
1942 |
|
1943 |
diff --git a/dev-db/sqlite/sqlite-3.25.2.ebuild b/dev-db/sqlite/sqlite-3.25.2.ebuild |
1944 |
deleted file mode 100644 |
1945 |
index 9ca3d39f36c..00000000000 |
1946 |
--- a/dev-db/sqlite/sqlite-3.25.2.ebuild |
1947 |
+++ /dev/null |
1948 |
@@ -1,322 +0,0 @@ |
1949 |
-# Copyright 1999-2018 Arfrever Frehtes Taifersar Arahesis and others |
1950 |
-# Distributed under the terms of the GNU General Public License v2 |
1951 |
- |
1952 |
-EAPI="7" |
1953 |
- |
1954 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
1955 |
- |
1956 |
-SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" |
1957 |
-DOC_PV="${SRC_PV}" |
1958 |
-# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" |
1959 |
- |
1960 |
-DESCRIPTION="SQL database engine" |
1961 |
-HOMEPAGE="https://sqlite.org/" |
1962 |
-SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip ) |
1963 |
- tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1964 |
- test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1965 |
- tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip ) |
1966 |
- !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" |
1967 |
- |
1968 |
-LICENSE="public-domain" |
1969 |
-SLOT="3" |
1970 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1971 |
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
1972 |
-RESTRICT="!test? ( test )" |
1973 |
- |
1974 |
-BDEPEND="doc? ( app-arch/unzip ) |
1975 |
- tcl? ( |
1976 |
- app-arch/unzip |
1977 |
- >=dev-lang/tcl-8.6:0 |
1978 |
- ) |
1979 |
- test? ( |
1980 |
- app-arch/unzip |
1981 |
- >=dev-lang/tcl-8.6:0 |
1982 |
- ) |
1983 |
- tools? ( |
1984 |
- app-arch/unzip |
1985 |
- >=dev-lang/tcl-8.6:0 |
1986 |
- )" |
1987 |
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
1988 |
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
1989 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
1990 |
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
1991 |
- tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
1992 |
-DEPEND="${RDEPEND} |
1993 |
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
1994 |
- |
1995 |
-full_archive() { |
1996 |
- use tcl || use test || use tools |
1997 |
-} |
1998 |
- |
1999 |
-pkg_setup() { |
2000 |
- if full_archive; then |
2001 |
- S="${WORKDIR}/${PN}-src-${SRC_PV}" |
2002 |
- else |
2003 |
- S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" |
2004 |
- fi |
2005 |
-} |
2006 |
- |
2007 |
-src_prepare() { |
2008 |
- if full_archive; then |
2009 |
- eapply "${FILESDIR}/${PN}-3.25.0-full_archive-build.patch" |
2010 |
- eapply "${FILESDIR}/${PN}-3.25.2-full_archive-disallow_window_functions_in_recursive_queries.patch" |
2011 |
- eapply "${FILESDIR}/${PN}-3.25.2-full_archive-tests.patch" |
2012 |
- |
2013 |
- eapply_user |
2014 |
- |
2015 |
- # Fix AC_CHECK_FUNCS. |
2016 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
2017 |
- sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" |
2018 |
- else |
2019 |
- eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch" |
2020 |
- eapply "${FILESDIR}/${PN}-3.25.2-nonfull_archive-disallow_window_functions_in_recursive_queries.patch" |
2021 |
- |
2022 |
- eapply_user |
2023 |
- |
2024 |
- # Fix AC_CHECK_FUNCS. |
2025 |
- # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
2026 |
- sed \ |
2027 |
- -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ |
2028 |
- -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ |
2029 |
- -i configure.ac || die "sed failed" |
2030 |
- fi |
2031 |
- |
2032 |
- eautoreconf |
2033 |
- |
2034 |
- multilib_copy_sources |
2035 |
-} |
2036 |
- |
2037 |
-multilib_src_configure() { |
2038 |
- local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() |
2039 |
- |
2040 |
- options+=( |
2041 |
- --enable-$(full_archive && echo load-extension || echo dynamic-extensions) |
2042 |
- --enable-threadsafe |
2043 |
- ) |
2044 |
- if ! full_archive; then |
2045 |
- options+=(--disable-static-shell) |
2046 |
- fi |
2047 |
- |
2048 |
- # Support detection of misuse of SQLite API. |
2049 |
- # https://sqlite.org/compile.html#enable_api_armor |
2050 |
- append-cppflags -DSQLITE_ENABLE_API_ARMOR |
2051 |
- |
2052 |
- # Support column metadata functions. |
2053 |
- # https://sqlite.org/c3ref/column_database_name.html |
2054 |
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
2055 |
- |
2056 |
- # Support sqlite_dbpage virtual table. |
2057 |
- # https://sqlite.org/compile.html#enable_dbpage_vtab |
2058 |
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
2059 |
- |
2060 |
- # Support dbstat virtual table. |
2061 |
- # https://sqlite.org/dbstat.html |
2062 |
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
2063 |
- |
2064 |
- # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
2065 |
- # https://sqlite.org/compile.html#enable_deserialize |
2066 |
- # https://sqlite.org/c3ref/serialize.html |
2067 |
- # https://sqlite.org/c3ref/deserialize.html |
2068 |
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
2069 |
- |
2070 |
- # Support comments in output of EXPLAIN. |
2071 |
- # https://sqlite.org/compile.html#enable_explain_comments |
2072 |
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
2073 |
- |
2074 |
- # Support Full-Text Search versions 3, 4 and 5. |
2075 |
- # https://sqlite.org/fts3.html |
2076 |
- # https://sqlite.org/fts5.html |
2077 |
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
2078 |
- options+=(--enable-fts5) |
2079 |
- |
2080 |
- # Support hidden columns. |
2081 |
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
2082 |
- |
2083 |
- # Support JSON1 extension. |
2084 |
- # https://sqlite.org/json1.html |
2085 |
- append-cppflags -DSQLITE_ENABLE_JSON1 |
2086 |
- |
2087 |
- # Support memsys5 memory allocator. |
2088 |
- # https://sqlite.org/malloc.html#memsys5 |
2089 |
- append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
2090 |
- |
2091 |
- # Support sqlite_offset() function. |
2092 |
- # https://sqlite.org/lang_corefunc.html#sqlite_offset |
2093 |
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
2094 |
- |
2095 |
- # Support pre-update hook functions. |
2096 |
- # https://sqlite.org/c3ref/preupdate_count.html |
2097 |
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
2098 |
- |
2099 |
- # Support Resumable Bulk Update extension. |
2100 |
- # https://sqlite.org/rbu.html |
2101 |
- append-cppflags -DSQLITE_ENABLE_RBU |
2102 |
- |
2103 |
- # Support R*Trees. |
2104 |
- # https://sqlite.org/rtree.html |
2105 |
- # https://sqlite.org/geopoly.html |
2106 |
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY |
2107 |
- |
2108 |
- # Support scan status functions. |
2109 |
- # https://sqlite.org/c3ref/stmt_scanstatus.html |
2110 |
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
2111 |
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
2112 |
- |
2113 |
- # Support sqlite_stmt virtual table. |
2114 |
- # https://sqlite.org/stmt.html |
2115 |
- append-cppflags -DSQLITE_ENABLE_STMTVTAB |
2116 |
- |
2117 |
- # Support Session extension. |
2118 |
- # https://sqlite.org/sessionintro.html |
2119 |
- options+=(--enable-session) |
2120 |
- |
2121 |
- # Support unknown() function. |
2122 |
- # https://sqlite.org/compile.html#enable_unknown_sql_function |
2123 |
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
2124 |
- |
2125 |
- # Support unlock notification. |
2126 |
- # https://sqlite.org/unlock_notify.html |
2127 |
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
2128 |
- |
2129 |
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
2130 |
- # https://sqlite.org/compile.html#enable_update_delete_limit |
2131 |
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
2132 |
- |
2133 |
- # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. |
2134 |
- # https://sqlite.org/pragma.html#pragma_function_list |
2135 |
- # https://sqlite.org/pragma.html#pragma_module_list |
2136 |
- # https://sqlite.org/pragma.html#pragma_pragma_list |
2137 |
- append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS |
2138 |
- |
2139 |
- # Support soundex() function. |
2140 |
- # https://sqlite.org/lang_corefunc.html#soundex |
2141 |
- append-cppflags -DSQLITE_SOUNDEX |
2142 |
- |
2143 |
- # Support URI filenames. |
2144 |
- # https://sqlite.org/uri.html |
2145 |
- append-cppflags -DSQLITE_USE_URI |
2146 |
- |
2147 |
- # debug USE flag. |
2148 |
- if full_archive; then |
2149 |
- options+=($(use_enable debug)) |
2150 |
- else |
2151 |
- if use debug; then |
2152 |
- append-cppflags -DSQLITE_DEBUG |
2153 |
- else |
2154 |
- append-cppflags -DNDEBUG |
2155 |
- fi |
2156 |
- fi |
2157 |
- |
2158 |
- # icu USE flag. |
2159 |
- if use icu; then |
2160 |
- # Support ICU extension. |
2161 |
- # https://sqlite.org/compile.html#enable_icu |
2162 |
- append-cppflags -DSQLITE_ENABLE_ICU |
2163 |
- if full_archive; then |
2164 |
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
2165 |
- else |
2166 |
- sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
2167 |
- fi |
2168 |
- fi |
2169 |
- |
2170 |
- # readline USE flag. |
2171 |
- options+=( |
2172 |
- --disable-editline |
2173 |
- $(use_enable readline) |
2174 |
- ) |
2175 |
- if full_archive && use readline; then |
2176 |
- options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") |
2177 |
- fi |
2178 |
- |
2179 |
- # secure-delete USE flag. |
2180 |
- if use secure-delete; then |
2181 |
- # Enable secure_delete pragma by default. |
2182 |
- # https://sqlite.org/pragma.html#pragma_secure_delete |
2183 |
- append-cppflags -DSQLITE_SECURE_DELETE |
2184 |
- fi |
2185 |
- |
2186 |
- # static-libs USE flag. |
2187 |
- options+=($(use_enable static-libs static)) |
2188 |
- |
2189 |
- # tcl, test, tools USE flags. |
2190 |
- if full_archive; then |
2191 |
- options+=(--enable-tcl) |
2192 |
- fi |
2193 |
- |
2194 |
- if [[ "${CHOST}" == *-mint* ]]; then |
2195 |
- append-cppflags -DSQLITE_OMIT_WAL |
2196 |
- fi |
2197 |
- |
2198 |
- if [[ "${ABI}" == "x86" ]]; then |
2199 |
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
2200 |
- append-cflags -mfpmath=sse |
2201 |
- else |
2202 |
- append-cflags -ffloat-store |
2203 |
- fi |
2204 |
- fi |
2205 |
- |
2206 |
- econf "${options[@]}" |
2207 |
-} |
2208 |
- |
2209 |
-multilib_src_compile() { |
2210 |
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
2211 |
- |
2212 |
- if use tools && multilib_is_native_abi; then |
2213 |
- emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
2214 |
- fi |
2215 |
-} |
2216 |
- |
2217 |
-multilib_src_test() { |
2218 |
- if [[ "${EUID}" -eq 0 ]]; then |
2219 |
- ewarn "Skipping tests due to root permissions" |
2220 |
- return |
2221 |
- fi |
2222 |
- |
2223 |
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
2224 |
-} |
2225 |
- |
2226 |
-multilib_src_install() { |
2227 |
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
2228 |
- |
2229 |
- if use tools && multilib_is_native_abi; then |
2230 |
- install_tool() { |
2231 |
- if [[ -f ".libs/${1}" ]]; then |
2232 |
- newbin ".libs/${1}" "${2}" |
2233 |
- else |
2234 |
- newbin "${1}" "${2}" |
2235 |
- fi |
2236 |
- } |
2237 |
- |
2238 |
- install_tool changeset sqlite3-changeset |
2239 |
- install_tool dbdump sqlite3-db-dump |
2240 |
- install_tool dbhash sqlite3-db-hash |
2241 |
- install_tool rbu sqlite3-rbu |
2242 |
- install_tool scrub sqlite3-scrub |
2243 |
- install_tool showdb sqlite3-show-db |
2244 |
- install_tool showjournal sqlite3-show-journal |
2245 |
- install_tool showshm sqlite3-show-shm |
2246 |
- install_tool showstat4 sqlite3-show-stat4 |
2247 |
- install_tool showwal sqlite3-show-wal |
2248 |
- install_tool sqldiff sqlite3-diff |
2249 |
- install_tool sqlite3_analyzer sqlite3-analyzer |
2250 |
- install_tool sqlite3_checker sqlite3-checker |
2251 |
- install_tool sqlite3_expert sqlite3-expert |
2252 |
- install_tool sqltclsh sqlite3-tclsh |
2253 |
- |
2254 |
- unset -f install_tool |
2255 |
- fi |
2256 |
-} |
2257 |
- |
2258 |
-multilib_src_install_all() { |
2259 |
- find "${D}" -name "*.la" -delete || die |
2260 |
- |
2261 |
- doman sqlite3.1 |
2262 |
- |
2263 |
- if use doc; then |
2264 |
- rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} |
2265 |
- ( |
2266 |
- docinto html |
2267 |
- dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* |
2268 |
- ) |
2269 |
- fi |
2270 |
-} |