Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/sqlite/files/, dev-db/sqlite/
Date: Sun, 05 May 2019 19:05:38
Message-Id: 1557083040.9db5c0df12216f1d313b361fbcf10dcc3e564a95.floppym@gentoo
1 commit: 9db5c0df12216f1d313b361fbcf10dcc3e564a95
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Sun May 5 01:37:55 2019 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun May 5 19:04:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db5c0df
7
8 dev-db/sqlite: Delete old versions (<3.27.2).
9
10 Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 dev-db/sqlite/Manifest | 9 -
14 .../files/sqlite-3.25.0-full_archive-build.patch | 407 ---------------------
15 .../files/sqlite-3.25.2-full_archive-tests.patch | 70 ----
16 .../files/sqlite-3.26.0-full_archive-build.patch | 405 --------------------
17 dev-db/sqlite/sqlite-3.25.3.ebuild | 320 ----------------
18 dev-db/sqlite/sqlite-3.26.0.ebuild | 325 ----------------
19 dev-db/sqlite/sqlite-3.27.1.ebuild | 327 -----------------
20 7 files changed, 1863 deletions(-)
21
22 diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
23 index 7b659592e7a..cfb0f3aa3c8 100644
24 --- a/dev-db/sqlite/Manifest
25 +++ b/dev-db/sqlite/Manifest
26 @@ -1,15 +1,6 @@
27 -DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c6563e937a45d6ef4aae1b941d42c06cb8630210c33583f25e41f3f90b181ce47da650f81845ad88cafbf9c764164cf8b5d92e81 SHA512 5bc501d15367e097f4070185974b0c3a8246c06b205fb2258ed18870ff3fbf120ac5e0ba031a6744af89f7659206e28e7de2f0367bdb190b8412e453b43de4ba
28 -DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8
29 -DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4
30 DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972
31 DIST sqlite-autoconf-3280000.tar.gz 2810415 BLAKE2B e1af03476d97f96ef78d4e0a9df6ae69a06fb08e48046c843ed668b3f8c00c58263df07a4e8a22a1c7cfc920fd005fa6c2525dceeec4f724b43df7589ca3f777 SHA512 e800c0d9e6c8c01ccf1d714c6c4da4b98e9610c4c06557dda6393d0792a8ae09788703d4a74dcb21844c49b3629ff7ed95a4a86ff79872aafd2b49c672c7a570
32 -DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac
33 -DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade
34 -DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f
35 DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f
36 DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b17039ef7230a458dc7d256e2f07a5b41d3aa1a3f085e5e418c297b5dd1d2ba5e4827434329d1ed61d3dd1f618f3d SHA512 83e23dff00614d31d501c66c29d8d4aa780b38859242b58937243235d185fe3db2f9f3c1accf9bf2df0b457a6e32612a00e82f503a8665aad4f19602e2b36396
37 -DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65
38 -DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3
39 -DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945
40 DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e
41 DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f
42
43 diff --git a/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch
44 deleted file mode 100644
45 index d39d843d12c..00000000000
46 --- a/dev-db/sqlite/files/sqlite-3.25.0-full_archive-build.patch
47 +++ /dev/null
48 @@ -1,407 +0,0 @@
49 -Move some code to libsqlite3.so to avoid duplication.
50 -Link executables against libsqlite3.so.
51 -Increase timeout for fuzzcheck.
52 -Fix building with dlopen() not available.
53 -
54 ---- /Makefile.in
55 -+++ /Makefile.in
56 -@@ -310,6 +310,9 @@
57 - # Source code for extensions
58 - #
59 - SRC += \
60 -+ $(TOP)/ext/expert/sqlite3expert.c \
61 -+ $(TOP)/ext/expert/sqlite3expert.h
62 -+SRC += \
63 - $(TOP)/ext/fts1/fts1.c \
64 - $(TOP)/ext/fts1/fts1.h \
65 - $(TOP)/ext/fts1/fts1_hash.c \
66 -@@ -359,8 +362,11 @@
67 - $(TOP)/ext/rbu/sqlite3rbu.h \
68 - $(TOP)/ext/rbu/sqlite3rbu.c
69 - SRC += \
70 -+ $(TOP)/ext/misc/appendvfs.c \
71 - $(TOP)/ext/misc/json1.c \
72 -- $(TOP)/ext/misc/stmt.c
73 -+ $(TOP)/ext/misc/sqlar.c \
74 -+ $(TOP)/ext/misc/stmt.c \
75 -+ $(TOP)/ext/misc/zipfile.c
76 -
77 - # Generated source code files
78 - #
79 -@@ -430,7 +436,6 @@
80 - # Statically linked extensions
81 - #
82 - TESTSRC += \
83 -- $(TOP)/ext/expert/sqlite3expert.c \
84 - $(TOP)/ext/expert/test_expert.c \
85 - $(TOP)/ext/misc/amatch.c \
86 - $(TOP)/ext/misc/carray.c \
87 -@@ -453,8 +458,7 @@
88 - $(TOP)/ext/misc/spellfix.c \
89 - $(TOP)/ext/misc/totype.c \
90 - $(TOP)/ext/misc/unionvtab.c \
91 -- $(TOP)/ext/misc/wholenumber.c \
92 -- $(TOP)/ext/misc/zipfile.c
93 -+ $(TOP)/ext/misc/wholenumber.c
94 -
95 - # Source code to the library files needed by the test fixture
96 - #
97 -@@ -620,25 +624,25 @@
98 -
99 - libtclsqlite3.la: tclsqlite.lo libsqlite3.la
100 - $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
101 -- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
102 -+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
103 - -rpath "$(TCLLIBDIR)" \
104 - -version-info "8:6:8" \
105 - -avoid-version
106 -
107 --sqlite3$(TEXE): shell.c sqlite3.c
108 -- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
109 -- shell.c sqlite3.c \
110 -- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
111 -+sqlite3$(TEXE): shell.c libsqlite3.la
112 -+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
113 -+ shell.c libsqlite3.la \
114 -+ $(LIBREADLINE)
115 -
116 --sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
117 -- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
118 -+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
119 -+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
120 -
121 --dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
122 -- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
123 -+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
124 -+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
125 -
126 --scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
127 -+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
128 - $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
129 -- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
130 -+ $(TOP)/ext/misc/scrub.c libsqlite3.la
131 -
132 - srcck1$(BEXE): $(TOP)/tool/srcck1.c
133 - $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
134 -@@ -717,7 +721,7 @@
135 - # Rule to build the amalgamation
136 - #
137 - sqlite3.lo: sqlite3.c
138 -- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
139 -+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
140 -
141 - # Rules to build the LEMON compiler generator
142 - #
143 -@@ -1017,14 +1021,9 @@
144 - # Source files that go into making shell.c
145 - SHELL_SRC = \
146 - $(TOP)/src/shell.c.in \
147 -- $(TOP)/ext/misc/appendvfs.c \
148 - $(TOP)/ext/misc/shathree.c \
149 - $(TOP)/ext/misc/fileio.c \
150 - $(TOP)/ext/misc/completion.c \
151 -- $(TOP)/ext/misc/sqlar.c \
152 -- $(TOP)/ext/expert/sqlite3expert.c \
153 -- $(TOP)/ext/expert/sqlite3expert.h \
154 -- $(TOP)/ext/misc/zipfile.c \
155 - $(TOP)/src/test_windirent.c
156 -
157 - shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
158 -@@ -1183,15 +1182,15 @@
159 -
160 - # Fuzz testing
161 - fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
162 -- ./fuzzcheck$(TEXE) $(FUZZDATA)
163 -+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
164 - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
165 -
166 - fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
167 -- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
168 -+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
169 - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
170 -
171 - valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
172 -- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
173 -+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
174 - valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
175 -
176 - # The veryquick.test TCL tests.
177 -@@ -1222,24 +1221,23 @@
178 - smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
179 - ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
180 -
181 --sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
182 -+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
183 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
184 -
185 --sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
186 -- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
187 -+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
188 -+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
189 -
190 --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
191 -+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
192 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
193 -
194 --sqltclsh$(TEXE): sqltclsh.c
195 -- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
196 -+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
197 -+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
198 -
199 --sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
200 -- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
201 -+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
202 -+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
203 -
204 - CHECKER_DEPS =\
205 - $(TOP)/tool/mkccode.tcl \
206 -- sqlite3.c \
207 - $(TOP)/src/tclsqlite.c \
208 - $(TOP)/ext/repair/sqlite3_checker.tcl \
209 - $(TOP)/ext/repair/checkindex.c \
210 -@@ -1250,30 +1248,30 @@
211 - sqlite3_checker.c: $(CHECKER_DEPS)
212 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
213 -
214 --sqlite3_checker$(TEXE): sqlite3_checker.c
215 -- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
216 -+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
217 -+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
218 -
219 --dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
220 -+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
221 - $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
222 -- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
223 -+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
224 -
225 --showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
226 -- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
227 -+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
228 -+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
229 -
230 --showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
231 -- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
232 -+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
233 -+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
234 -
235 --showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
236 -- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
237 -+showjournal$(TEXE): $(TOP)/tool/showjournal.c
238 -+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
239 -
240 --showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
241 -- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
242 -+showwal$(TEXE): $(TOP)/tool/showwal.c
243 -+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
244 -
245 - showshm$(TEXE): $(TOP)/tool/showshm.c
246 - $(LTLINK) -o $@ $(TOP)/tool/showshm.c
247 -
248 --changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
249 -- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
250 -+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
251 -+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
252 -
253 - rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
254 - $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
255 -@@ -1295,11 +1293,11 @@
256 - kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
257 - $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
258 -
259 --rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
260 -- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
261 -+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
262 -+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
263 -
264 --loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
265 -- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
266 -+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
267 -+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
268 -
269 - # This target will fail if the SQLite amalgamation contains any exported
270 - # symbols that do not begin with "sqlite3_". It is run as part of the
271 ---- /configure.ac
272 -+++ /configure.ac
273 -@@ -587,6 +587,9 @@
274 - if test "${enable_load_extension}" = "yes" ; then
275 - OPT_FEATURE_FLAGS=""
276 - AC_SEARCH_LIBS(dlopen, dl)
277 -+ if test "${ac_cv_search_dlopen}" = "no" ; then
278 -+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
279 -+ fi
280 - else
281 - OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
282 - fi
283 ---- /ext/misc/sqlar.c
284 -+++ /ext/misc/sqlar.c
285 -@@ -14,6 +14,8 @@
286 - ** for working with sqlar archives and used by the shell tool's built-in
287 - ** sqlar support.
288 - */
289 -+#ifdef SQLITE_HAVE_ZLIB
290 -+
291 - #include "sqlite3ext.h"
292 - SQLITE_EXTENSION_INIT1
293 - #include <zlib.h>
294 -@@ -119,3 +121,5 @@
295 - }
296 - return rc;
297 - }
298 -+
299 -+#endif /* SQLITE_HAVE_ZLIB */
300 ---- /ext/misc/zipfile.c
301 -+++ /ext/misc/zipfile.c
302 -@@ -24,6 +24,8 @@
303 - ** * No support for zip64 extensions
304 - ** * Only the "inflate/deflate" (zlib) compression method is supported
305 - */
306 -+#ifdef SQLITE_HAVE_ZLIB
307 -+
308 - #include "sqlite3ext.h"
309 - SQLITE_EXTENSION_INIT1
310 - #include <stdio.h>
311 -@@ -2175,3 +2177,5 @@
312 - (void)pzErrMsg; /* Unused parameter */
313 - return zipfileRegister(db);
314 - }
315 -+
316 -+#endif /* SQLITE_HAVE_ZLIB */
317 ---- /ext/repair/sqlite3_checker.c.in
318 -+++ /ext/repair/sqlite3_checker.c.in
319 -@@ -2,6 +2,7 @@
320 - ** Read an SQLite database file and analyze its space utilization. Generate
321 - ** text on standard output.
322 - */
323 -+#define SQLITE_CORE 1
324 - #define TCLSH_INIT_PROC sqlite3_checker_init_proc
325 - #define SQLITE_ENABLE_DBPAGE_VTAB 1
326 - #define SQLITE_ENABLE_JSON1 1
327 -@@ -14,7 +15,7 @@
328 - #define SQLITE_OMIT_SHARED_CACHE 1
329 - #define SQLITE_DEFAULT_MEMSTATUS 0
330 - #define SQLITE_MAX_EXPR_DEPTH 0
331 --INCLUDE sqlite3.c
332 -+#include "sqlite3.h"
333 - INCLUDE $ROOT/src/tclsqlite.c
334 - INCLUDE $ROOT/ext/misc/btreeinfo.c
335 - INCLUDE $ROOT/ext/repair/checkindex.c
336 ---- /src/shell.c.in
337 -+++ /src/shell.c.in
338 -@@ -61,6 +61,7 @@
339 - #include <stdio.h>
340 - #include <assert.h>
341 - #include "sqlite3.h"
342 -+#include "ext/expert/sqlite3expert.h"
343 - typedef sqlite3_int64 i64;
344 - typedef sqlite3_uint64 u64;
345 - typedef unsigned char u8;
346 -@@ -127,6 +128,10 @@
347 - # define SHELL_USE_LOCAL_GETLINE 1
348 - #endif
349 -
350 -+#ifdef SQLITE_HAVE_ZLIB
351 -+#include <zlib.h>
352 -+#endif
353 -+
354 -
355 - #if defined(_WIN32) || defined(WIN32)
356 - # include <io.h>
357 -@@ -936,13 +941,6 @@
358 - INCLUDE ../ext/misc/shathree.c
359 - INCLUDE ../ext/misc/fileio.c
360 - INCLUDE ../ext/misc/completion.c
361 --INCLUDE ../ext/misc/appendvfs.c
362 --#ifdef SQLITE_HAVE_ZLIB
363 --INCLUDE ../ext/misc/zipfile.c
364 --INCLUDE ../ext/misc/sqlar.c
365 --#endif
366 --INCLUDE ../ext/expert/sqlite3expert.h
367 --INCLUDE ../ext/expert/sqlite3expert.c
368 -
369 - #if defined(SQLITE_ENABLE_SESSION)
370 - /*
371 -@@ -3654,7 +3652,9 @@
372 - sqlite3_shathree_init(p->db, 0, 0);
373 - sqlite3_completion_init(p->db, 0, 0);
374 - #ifdef SQLITE_HAVE_ZLIB
375 -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
376 - sqlite3_zipfile_init(p->db, 0, 0);
377 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
378 - sqlite3_sqlar_init(p->db, 0, 0);
379 - #endif
380 - sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
381 -@@ -5549,6 +5549,7 @@
382 - goto end_ar_command;
383 - }
384 - sqlite3_fileio_init(cmd.db, 0, 0);
385 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
386 - sqlite3_sqlar_init(cmd.db, 0, 0);
387 - sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
388 - shellPutsFunc, 0, 0);
389 -@@ -8584,6 +8585,7 @@
390 - #endif
391 - }
392 - data.out = stdout;
393 -+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
394 - sqlite3_appendvfs_init(0,0,0);
395 -
396 - /* Go ahead and open the database file if it already exists. If the
397 ---- /tool/mksqlite3c.tcl
398 -+++ /tool/mksqlite3c.tcl
399 -@@ -117,6 +117,7 @@
400 - rtree.h
401 - sqlite3session.h
402 - sqlite3.h
403 -+ sqlite3expert.h
404 - sqlite3ext.h
405 - sqlite3rbu.h
406 - sqliteicu.h
407 -@@ -403,6 +404,10 @@
408 - sqlite3session.c
409 - fts5.c
410 - stmt.c
411 -+ appendvfs.c
412 -+ sqlar.c
413 -+ sqlite3expert.c
414 -+ zipfile.c
415 - } {
416 - copy_file tsrc/$file
417 - }
418 ---- /tool/sqlite3_analyzer.c.in
419 -+++ /tool/sqlite3_analyzer.c.in
420 -@@ -14,9 +14,6 @@
421 - #define SQLITE_DEFAULT_MEMSTATUS 0
422 - #define SQLITE_MAX_EXPR_DEPTH 0
423 - #define SQLITE_OMIT_LOAD_EXTENSION 1
424 --#ifndef USE_EXTERNAL_SQLITE
425 --INCLUDE sqlite3.c
426 --#endif
427 - INCLUDE $ROOT/src/tclsqlite.c
428 -
429 - const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
430 ---- /tool/sqltclsh.c.in
431 -+++ /tool/sqltclsh.c.in
432 -@@ -27,19 +27,17 @@
433 - #define SQLITE_OMIT_SHARED_CACHE 1
434 - #define SQLITE_DEFAULT_MEMSTATUS 0
435 - #define SQLITE_MAX_EXPR_DEPTH 0
436 --INCLUDE sqlite3.c
437 --INCLUDE $ROOT/ext/misc/appendvfs.c
438 --#ifdef SQLITE_HAVE_ZLIB
439 --INCLUDE $ROOT/ext/misc/zipfile.c
440 --INCLUDE $ROOT/ext/misc/sqlar.c
441 --#endif
442 -+#include "sqlite3.h"
443 - INCLUDE $ROOT/src/tclsqlite.c
444 -
445 - const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
446 - (void)interp;
447 -+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
448 - sqlite3_appendvfs_init(0,0,0);
449 - #ifdef SQLITE_HAVE_ZLIB
450 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
451 - sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
452 -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
453 - sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
454 - #endif
455 -
456
457 diff --git a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch
458 deleted file mode 100644
459 index 2868b3fc123..00000000000
460 --- a/dev-db/sqlite/files/sqlite-3.25.2-full_archive-tests.patch
461 +++ /dev/null
462 @@ -1,70 +0,0 @@
463 -https://sqlite.org/src/info/d04b2013b5436430
464 -
465 ---- /test/like3.test
466 -+++ /test/like3.test
467 -@@ -130,12 +130,14 @@
468 - do_execsql_test like3-5.110 {
469 - SELECT x FROM t5a WHERE x LIKE '/a%';
470 - } {/abc}
471 -+ifcapable !icu {
472 - do_eqp_test like3-5.111 {
473 - SELECT x FROM t5a WHERE x LIKE '/a%';
474 - } {
475 - QUERY PLAN
476 - `--SEARCH TABLE t5a USING COVERING INDEX sqlite_autoindex_t5a_1 (x>? AND x<?)
477 - }
478 -+}
479 - do_execsql_test like3-5.120 {
480 - SELECT x FROM t5a WHERE x LIKE '^12%' ESCAPE '^';
481 - } {123}
482 ---- /test/window6.test
483 -+++ /test/window6.test
484 -@@ -147,17 +147,17 @@
485 - #-------------------------------------------------------------------------
486 - #
487 -
488 --do_execsql_test 6.0 {
489 -- SELECT LIKE('!', '', '!') x WHERE x;
490 --} {}
491 --
492 --do_execsql_test 6.1 {
493 -- SELECT LIKE("!","","!")""WHeRE"";
494 --} {}
495 --
496 --do_catchsql_test 6.2 {
497 -- SELECT LIKE("!","","!")""window"";
498 --} {1 {near "window": syntax error}}
499 -+ifcapable !icu {
500 -+ do_execsql_test 6.0 {
501 -+ SELECT LIKE('!', '', '!') x WHERE x;
502 -+ } {}
503 -+ do_execsql_test 6.1 {
504 -+ SELECT LIKE("!","","!")""WHeRE"";
505 -+ } {}
506 -+ do_catchsql_test 6.2 {
507 -+ SELECT LIKE("!","","!")""window"";
508 -+ } {1 {near "window": syntax error}}
509 -+}
510 -
511 - reset_db
512 - do_execsql_test 7.0 {
513 -@@ -166,9 +166,11 @@
514 - INSERT INTO t1 VALUES('');
515 - }
516 -
517 --do_execsql_test 7.1 {
518 -- SELECT count(*) FROM t1 WHERE x LIKE '!' ESCAPE '!';
519 --} {0}
520 -+ifcapable !icu {
521 -+ do_execsql_test 7.1 {
522 -+ SELECT count(*) FROM t1 WHERE x LIKE '!' ESCAPE '!';
523 -+ } {0}
524 -+}
525 -
526 - #-------------------------------------------------------------------------
527 - #
528 -@@ -336,4 +338,3 @@
529 - }
530 -
531 - finish_test
532 --
533
534 diff --git a/dev-db/sqlite/files/sqlite-3.26.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.26.0-full_archive-build.patch
535 deleted file mode 100644
536 index 602582cf334..00000000000
537 --- a/dev-db/sqlite/files/sqlite-3.26.0-full_archive-build.patch
538 +++ /dev/null
539 @@ -1,405 +0,0 @@
540 -Move some code to libsqlite3.so to avoid duplication.
541 -Link executables against libsqlite3.so.
542 -Increase timeout for fuzzcheck.
543 -Fix building with dlopen() not available.
544 -
545 ---- /Makefile.in
546 -+++ /Makefile.in
547 -@@ -311,6 +311,9 @@
548 - # Source code for extensions
549 - #
550 - SRC += \
551 -+ $(TOP)/ext/expert/sqlite3expert.c \
552 -+ $(TOP)/ext/expert/sqlite3expert.h
553 -+SRC += \
554 - $(TOP)/ext/fts1/fts1.c \
555 - $(TOP)/ext/fts1/fts1.h \
556 - $(TOP)/ext/fts1/fts1_hash.c \
557 -@@ -363,8 +366,11 @@
558 - $(TOP)/ext/rbu/sqlite3rbu.h \
559 - $(TOP)/ext/rbu/sqlite3rbu.c
560 - SRC += \
561 -+ $(TOP)/ext/misc/appendvfs.c \
562 - $(TOP)/ext/misc/json1.c \
563 -- $(TOP)/ext/misc/stmt.c
564 -+ $(TOP)/ext/misc/sqlar.c \
565 -+ $(TOP)/ext/misc/stmt.c \
566 -+ $(TOP)/ext/misc/zipfile.c
567 -
568 - # Generated source code files
569 - #
570 -@@ -434,7 +440,6 @@
571 - # Statically linked extensions
572 - #
573 - TESTSRC += \
574 -- $(TOP)/ext/expert/sqlite3expert.c \
575 - $(TOP)/ext/expert/test_expert.c \
576 - $(TOP)/ext/misc/amatch.c \
577 - $(TOP)/ext/misc/carray.c \
578 -@@ -459,7 +464,6 @@
579 - $(TOP)/ext/misc/totype.c \
580 - $(TOP)/ext/misc/unionvtab.c \
581 - $(TOP)/ext/misc/wholenumber.c \
582 -- $(TOP)/ext/misc/zipfile.c \
583 - $(TOP)/ext/userauth/userauth.c
584 -
585 - # Source code to the library files needed by the test fixture
586 -@@ -631,25 +635,25 @@
587 -
588 - libtclsqlite3.la: tclsqlite.lo libsqlite3.la
589 - $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
590 -- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
591 -+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
592 - -rpath "$(TCLLIBDIR)" \
593 - -version-info "8:6:8" \
594 - -avoid-version
595 -
596 --sqlite3$(TEXE): shell.c sqlite3.c
597 -- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
598 -- shell.c sqlite3.c \
599 -- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
600 -+sqlite3$(TEXE): shell.c libsqlite3.la
601 -+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
602 -+ shell.c libsqlite3.la \
603 -+ $(LIBREADLINE)
604 -
605 --sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
606 -- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
607 -+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
608 -+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
609 -
610 --dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
611 -- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
612 -+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
613 -+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
614 -
615 --scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
616 -+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
617 - $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
618 -- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
619 -+ $(TOP)/ext/misc/scrub.c libsqlite3.la
620 -
621 - srcck1$(BEXE): $(TOP)/tool/srcck1.c
622 - $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
623 -@@ -744,7 +748,7 @@
624 - # Rule to build the amalgamation
625 - #
626 - sqlite3.lo: sqlite3.c
627 -- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
628 -+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
629 -
630 - # Rules to build the LEMON compiler generator
631 - #
632 -@@ -1044,14 +1048,9 @@
633 - # Source files that go into making shell.c
634 - SHELL_SRC = \
635 - $(TOP)/src/shell.c.in \
636 -- $(TOP)/ext/misc/appendvfs.c \
637 - $(TOP)/ext/misc/shathree.c \
638 - $(TOP)/ext/misc/fileio.c \
639 - $(TOP)/ext/misc/completion.c \
640 -- $(TOP)/ext/misc/sqlar.c \
641 -- $(TOP)/ext/expert/sqlite3expert.c \
642 -- $(TOP)/ext/expert/sqlite3expert.h \
643 -- $(TOP)/ext/misc/zipfile.c \
644 - $(TOP)/src/test_windirent.c
645 -
646 - shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
647 -@@ -1217,15 +1216,15 @@
648 -
649 - # Fuzz testing
650 - fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
651 -- ./fuzzcheck$(TEXE) $(FUZZDATA)
652 -+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
653 - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
654 -
655 - fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
656 -- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
657 -+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
658 - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
659 -
660 - valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
661 -- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
662 -+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
663 - valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
664 -
665 - # The veryquick.test TCL tests.
666 -@@ -1256,24 +1255,23 @@
667 - smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
668 - ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
669 -
670 --sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
671 -+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
672 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
673 -
674 --sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
675 -- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
676 -+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
677 -+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
678 -
679 --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
680 -+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
681 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
682 -
683 --sqltclsh$(TEXE): sqltclsh.c
684 -- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
685 -+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
686 -+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
687 -
688 --sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
689 -- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
690 -+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
691 -+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
692 -
693 - CHECKER_DEPS =\
694 - $(TOP)/tool/mkccode.tcl \
695 -- sqlite3.c \
696 - $(TOP)/src/tclsqlite.c \
697 - $(TOP)/ext/repair/sqlite3_checker.tcl \
698 - $(TOP)/ext/repair/checkindex.c \
699 -@@ -1284,30 +1282,30 @@
700 - sqlite3_checker.c: $(CHECKER_DEPS)
701 - $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
702 -
703 --sqlite3_checker$(TEXE): sqlite3_checker.c
704 -- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
705 -+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
706 -+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
707 -
708 --dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
709 -+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
710 - $(LTLINK) -DDBDUMP_STANDALONE -o $@ \
711 -- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
712 -+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
713 -
714 --showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
715 -- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
716 -+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
717 -+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
718 -
719 --showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
720 -- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
721 -+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
722 -+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
723 -
724 --showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
725 -- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
726 -+showjournal$(TEXE): $(TOP)/tool/showjournal.c
727 -+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
728 -
729 --showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
730 -- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
731 -+showwal$(TEXE): $(TOP)/tool/showwal.c
732 -+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
733 -
734 - showshm$(TEXE): $(TOP)/tool/showshm.c
735 - $(LTLINK) -o $@ $(TOP)/tool/showshm.c
736 -
737 --changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
738 -- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
739 -+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
740 -+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
741 -
742 - changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo
743 - $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS)
744 -@@ -1332,11 +1330,11 @@
745 - kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
746 - $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
747 -
748 --rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
749 -- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
750 -+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
751 -+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
752 -
753 --loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
754 -- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
755 -+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
756 -+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
757 -
758 - # This target will fail if the SQLite amalgamation contains any exported
759 - # symbols that do not begin with "sqlite3_". It is run as part of the
760 ---- /configure.ac
761 -+++ /configure.ac
762 -@@ -587,6 +587,9 @@
763 - if test "${enable_load_extension}" = "yes" ; then
764 - OPT_FEATURE_FLAGS=""
765 - AC_SEARCH_LIBS(dlopen, dl)
766 -+ if test "${ac_cv_search_dlopen}" = "no" ; then
767 -+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
768 -+ fi
769 - else
770 - OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
771 - fi
772 ---- /ext/misc/sqlar.c
773 -+++ /ext/misc/sqlar.c
774 -@@ -14,6 +14,8 @@
775 - ** for working with sqlar archives and used by the shell tool's built-in
776 - ** sqlar support.
777 - */
778 -+#ifdef SQLITE_HAVE_ZLIB
779 -+
780 - #include "sqlite3ext.h"
781 - SQLITE_EXTENSION_INIT1
782 - #include <zlib.h>
783 -@@ -119,3 +121,5 @@
784 - }
785 - return rc;
786 - }
787 -+
788 -+#endif /* SQLITE_HAVE_ZLIB */
789 ---- /ext/misc/zipfile.c
790 -+++ /ext/misc/zipfile.c
791 -@@ -24,6 +24,8 @@
792 - ** * No support for zip64 extensions
793 - ** * Only the "inflate/deflate" (zlib) compression method is supported
794 - */
795 -+#ifdef SQLITE_HAVE_ZLIB
796 -+
797 - #include "sqlite3ext.h"
798 - SQLITE_EXTENSION_INIT1
799 - #include <stdio.h>
800 -@@ -2176,3 +2178,5 @@
801 - (void)pzErrMsg; /* Unused parameter */
802 - return zipfileRegister(db);
803 - }
804 -+
805 -+#endif /* SQLITE_HAVE_ZLIB */
806 ---- /ext/repair/sqlite3_checker.c.in
807 -+++ /ext/repair/sqlite3_checker.c.in
808 -@@ -2,6 +2,7 @@
809 - ** Read an SQLite database file and analyze its space utilization. Generate
810 - ** text on standard output.
811 - */
812 -+#define SQLITE_CORE 1
813 - #define TCLSH_INIT_PROC sqlite3_checker_init_proc
814 - #define SQLITE_ENABLE_DBPAGE_VTAB 1
815 - #define SQLITE_ENABLE_JSON1 1
816 -@@ -14,7 +15,7 @@
817 - #define SQLITE_OMIT_SHARED_CACHE 1
818 - #define SQLITE_DEFAULT_MEMSTATUS 0
819 - #define SQLITE_MAX_EXPR_DEPTH 0
820 --INCLUDE sqlite3.c
821 -+#include "sqlite3.h"
822 - INCLUDE $ROOT/src/tclsqlite.c
823 - INCLUDE $ROOT/ext/misc/btreeinfo.c
824 - INCLUDE $ROOT/ext/repair/checkindex.c
825 ---- /src/shell.c.in
826 -+++ /src/shell.c.in
827 -@@ -61,6 +61,7 @@
828 - #include <stdio.h>
829 - #include <assert.h>
830 - #include "sqlite3.h"
831 -+#include "ext/expert/sqlite3expert.h"
832 - typedef sqlite3_int64 i64;
833 - typedef sqlite3_uint64 u64;
834 - typedef unsigned char u8;
835 -@@ -127,6 +128,10 @@
836 - # define SHELL_USE_LOCAL_GETLINE 1
837 - #endif
838 -
839 -+#ifdef SQLITE_HAVE_ZLIB
840 -+#include <zlib.h>
841 -+#endif
842 -+
843 -
844 - #if defined(_WIN32) || defined(WIN32)
845 - # include <io.h>
846 -@@ -936,13 +941,6 @@
847 - INCLUDE ../ext/misc/shathree.c
848 - INCLUDE ../ext/misc/fileio.c
849 - INCLUDE ../ext/misc/completion.c
850 --INCLUDE ../ext/misc/appendvfs.c
851 --#ifdef SQLITE_HAVE_ZLIB
852 --INCLUDE ../ext/misc/zipfile.c
853 --INCLUDE ../ext/misc/sqlar.c
854 --#endif
855 --INCLUDE ../ext/expert/sqlite3expert.h
856 --INCLUDE ../ext/expert/sqlite3expert.c
857 -
858 - #if defined(SQLITE_ENABLE_SESSION)
859 - /*
860 -@@ -3765,7 +3763,9 @@
861 - sqlite3_shathree_init(p->db, 0, 0);
862 - sqlite3_completion_init(p->db, 0, 0);
863 - #ifdef SQLITE_HAVE_ZLIB
864 -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
865 - sqlite3_zipfile_init(p->db, 0, 0);
866 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
867 - sqlite3_sqlar_init(p->db, 0, 0);
868 - #endif
869 - sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
870 -@@ -5649,6 +5649,7 @@
871 - goto end_ar_command;
872 - }
873 - sqlite3_fileio_init(cmd.db, 0, 0);
874 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
875 - sqlite3_sqlar_init(cmd.db, 0, 0);
876 - sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
877 - shellPutsFunc, 0, 0);
878 -@@ -8705,6 +8706,7 @@
879 - #endif
880 - }
881 - data.out = stdout;
882 -+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
883 - sqlite3_appendvfs_init(0,0,0);
884 -
885 - /* Go ahead and open the database file if it already exists. If the
886 ---- /tool/mksqlite3c.tcl
887 -+++ /tool/mksqlite3c.tcl
888 -@@ -117,6 +117,7 @@
889 - rtree.h
890 - sqlite3session.h
891 - sqlite3.h
892 -+ sqlite3expert.h
893 - sqlite3ext.h
894 - sqlite3rbu.h
895 - sqliteicu.h
896 -@@ -403,6 +404,10 @@
897 - sqlite3session.c
898 - fts5.c
899 - stmt.c
900 -+ appendvfs.c
901 -+ sqlar.c
902 -+ sqlite3expert.c
903 -+ zipfile.c
904 - } {
905 - copy_file tsrc/$file
906 - }
907 ---- /tool/sqlite3_analyzer.c.in
908 -+++ /tool/sqlite3_analyzer.c.in
909 -@@ -14,9 +14,6 @@
910 - #define SQLITE_DEFAULT_MEMSTATUS 0
911 - #define SQLITE_MAX_EXPR_DEPTH 0
912 - #define SQLITE_OMIT_LOAD_EXTENSION 1
913 --#ifndef USE_EXTERNAL_SQLITE
914 --INCLUDE sqlite3.c
915 --#endif
916 - INCLUDE $ROOT/src/tclsqlite.c
917 -
918 - const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
919 ---- /tool/sqltclsh.c.in
920 -+++ /tool/sqltclsh.c.in
921 -@@ -27,19 +27,17 @@
922 - #define SQLITE_OMIT_SHARED_CACHE 1
923 - #define SQLITE_DEFAULT_MEMSTATUS 0
924 - #define SQLITE_MAX_EXPR_DEPTH 0
925 --INCLUDE sqlite3.c
926 --INCLUDE $ROOT/ext/misc/appendvfs.c
927 --#ifdef SQLITE_HAVE_ZLIB
928 --INCLUDE $ROOT/ext/misc/zipfile.c
929 --INCLUDE $ROOT/ext/misc/sqlar.c
930 --#endif
931 -+#include "sqlite3.h"
932 - INCLUDE $ROOT/src/tclsqlite.c
933 -
934 - const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
935 - (void)interp;
936 -+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
937 - sqlite3_appendvfs_init(0,0,0);
938 - #ifdef SQLITE_HAVE_ZLIB
939 -+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
940 - sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
941 -+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
942 - sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
943 - #endif
944 -
945
946 diff --git a/dev-db/sqlite/sqlite-3.25.3.ebuild b/dev-db/sqlite/sqlite-3.25.3.ebuild
947 deleted file mode 100644
948 index 520ad19dcf5..00000000000
949 --- a/dev-db/sqlite/sqlite-3.25.3.ebuild
950 +++ /dev/null
951 @@ -1,320 +0,0 @@
952 -# Copyright 1999-2018 Arfrever Frehtes Taifersar Arahesis and others
953 -# Distributed under the terms of the GNU General Public License v2
954 -
955 -EAPI="7"
956 -
957 -inherit autotools flag-o-matic multilib-minimal toolchain-funcs
958 -
959 -SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
960 -DOC_PV="${SRC_PV}"
961 -# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
962 -
963 -DESCRIPTION="SQL database engine"
964 -HOMEPAGE="https://sqlite.org/"
965 -SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
966 - tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
967 - test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
968 - tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
969 - !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
970 -
971 -LICENSE="public-domain"
972 -SLOT="3"
973 -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"
974 -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
975 -RESTRICT="!test? ( test )"
976 -
977 -BDEPEND="doc? ( app-arch/unzip )
978 - tcl? (
979 - app-arch/unzip
980 - >=dev-lang/tcl-8.6:0
981 - )
982 - test? (
983 - app-arch/unzip
984 - >=dev-lang/tcl-8.6:0
985 - )
986 - tools? (
987 - app-arch/unzip
988 - >=dev-lang/tcl-8.6:0
989 - )"
990 -RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
991 - icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
992 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
993 - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
994 - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
995 -DEPEND="${RDEPEND}
996 - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
997 -
998 -full_archive() {
999 - use tcl || use test || use tools
1000 -}
1001 -
1002 -pkg_setup() {
1003 - if full_archive; then
1004 - S="${WORKDIR}/${PN}-src-${SRC_PV}"
1005 - else
1006 - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
1007 - fi
1008 -}
1009 -
1010 -src_prepare() {
1011 - if full_archive; then
1012 - eapply "${FILESDIR}/${PN}-3.25.0-full_archive-build.patch"
1013 - eapply "${FILESDIR}/${PN}-3.25.2-full_archive-tests.patch"
1014 -
1015 - eapply_user
1016 -
1017 - # Fix AC_CHECK_FUNCS.
1018 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1019 - 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"
1020 - else
1021 - eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
1022 -
1023 - eapply_user
1024 -
1025 - # Fix AC_CHECK_FUNCS.
1026 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1027 - sed \
1028 - -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])/" \
1029 - -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
1030 - -i configure.ac || die "sed failed"
1031 - fi
1032 -
1033 - eautoreconf
1034 -
1035 - multilib_copy_sources
1036 -}
1037 -
1038 -multilib_src_configure() {
1039 - local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
1040 -
1041 - options+=(
1042 - --enable-$(full_archive && echo load-extension || echo dynamic-extensions)
1043 - --enable-threadsafe
1044 - )
1045 - if ! full_archive; then
1046 - options+=(--disable-static-shell)
1047 - fi
1048 -
1049 - # Support detection of misuse of SQLite API.
1050 - # https://sqlite.org/compile.html#enable_api_armor
1051 - append-cppflags -DSQLITE_ENABLE_API_ARMOR
1052 -
1053 - # Support column metadata functions.
1054 - # https://sqlite.org/c3ref/column_database_name.html
1055 - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
1056 -
1057 - # Support sqlite_dbpage virtual table.
1058 - # https://sqlite.org/compile.html#enable_dbpage_vtab
1059 - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
1060 -
1061 - # Support dbstat virtual table.
1062 - # https://sqlite.org/dbstat.html
1063 - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
1064 -
1065 - # Support sqlite3_serialize() and sqlite3_deserialize() functions.
1066 - # https://sqlite.org/compile.html#enable_deserialize
1067 - # https://sqlite.org/c3ref/serialize.html
1068 - # https://sqlite.org/c3ref/deserialize.html
1069 - append-cppflags -DSQLITE_ENABLE_DESERIALIZE
1070 -
1071 - # Support comments in output of EXPLAIN.
1072 - # https://sqlite.org/compile.html#enable_explain_comments
1073 - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
1074 -
1075 - # Support Full-Text Search versions 3, 4 and 5.
1076 - # https://sqlite.org/fts3.html
1077 - # https://sqlite.org/fts5.html
1078 - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
1079 - options+=(--enable-fts5)
1080 -
1081 - # Support hidden columns.
1082 - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
1083 -
1084 - # Support JSON1 extension.
1085 - # https://sqlite.org/json1.html
1086 - append-cppflags -DSQLITE_ENABLE_JSON1
1087 -
1088 - # Support memsys5 memory allocator.
1089 - # https://sqlite.org/malloc.html#memsys5
1090 - append-cppflags -DSQLITE_ENABLE_MEMSYS5
1091 -
1092 - # Support sqlite_offset() function.
1093 - # https://sqlite.org/lang_corefunc.html#sqlite_offset
1094 - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
1095 -
1096 - # Support pre-update hook functions.
1097 - # https://sqlite.org/c3ref/preupdate_count.html
1098 - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
1099 -
1100 - # Support Resumable Bulk Update extension.
1101 - # https://sqlite.org/rbu.html
1102 - append-cppflags -DSQLITE_ENABLE_RBU
1103 -
1104 - # Support R*Trees.
1105 - # https://sqlite.org/rtree.html
1106 - # https://sqlite.org/geopoly.html
1107 - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
1108 -
1109 - # Support scan status functions.
1110 - # https://sqlite.org/c3ref/stmt_scanstatus.html
1111 - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
1112 - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
1113 -
1114 - # Support sqlite_stmt virtual table.
1115 - # https://sqlite.org/stmt.html
1116 - append-cppflags -DSQLITE_ENABLE_STMTVTAB
1117 -
1118 - # Support Session extension.
1119 - # https://sqlite.org/sessionintro.html
1120 - options+=(--enable-session)
1121 -
1122 - # Support unknown() function.
1123 - # https://sqlite.org/compile.html#enable_unknown_sql_function
1124 - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
1125 -
1126 - # Support unlock notification.
1127 - # https://sqlite.org/unlock_notify.html
1128 - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
1129 -
1130 - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
1131 - # https://sqlite.org/compile.html#enable_update_delete_limit
1132 - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
1133 -
1134 - # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
1135 - # https://sqlite.org/pragma.html#pragma_function_list
1136 - # https://sqlite.org/pragma.html#pragma_module_list
1137 - # https://sqlite.org/pragma.html#pragma_pragma_list
1138 - append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
1139 -
1140 - # Support soundex() function.
1141 - # https://sqlite.org/lang_corefunc.html#soundex
1142 - append-cppflags -DSQLITE_SOUNDEX
1143 -
1144 - # Support URI filenames.
1145 - # https://sqlite.org/uri.html
1146 - append-cppflags -DSQLITE_USE_URI
1147 -
1148 - # debug USE flag.
1149 - if full_archive; then
1150 - options+=($(use_enable debug))
1151 - else
1152 - if use debug; then
1153 - append-cppflags -DSQLITE_DEBUG
1154 - else
1155 - append-cppflags -DNDEBUG
1156 - fi
1157 - fi
1158 -
1159 - # icu USE flag.
1160 - if use icu; then
1161 - # Support ICU extension.
1162 - # https://sqlite.org/compile.html#enable_icu
1163 - append-cppflags -DSQLITE_ENABLE_ICU
1164 - if full_archive; then
1165 - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1166 - else
1167 - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1168 - fi
1169 - fi
1170 -
1171 - # readline USE flag.
1172 - options+=(
1173 - --disable-editline
1174 - $(use_enable readline)
1175 - )
1176 - if full_archive && use readline; then
1177 - options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
1178 - fi
1179 -
1180 - # secure-delete USE flag.
1181 - if use secure-delete; then
1182 - # Enable secure_delete pragma by default.
1183 - # https://sqlite.org/pragma.html#pragma_secure_delete
1184 - append-cppflags -DSQLITE_SECURE_DELETE
1185 - fi
1186 -
1187 - # static-libs USE flag.
1188 - options+=($(use_enable static-libs static))
1189 -
1190 - # tcl, test, tools USE flags.
1191 - if full_archive; then
1192 - options+=(--enable-tcl)
1193 - fi
1194 -
1195 - if [[ "${CHOST}" == *-mint* ]]; then
1196 - append-cppflags -DSQLITE_OMIT_WAL
1197 - fi
1198 -
1199 - if [[ "${ABI}" == "x86" ]]; then
1200 - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
1201 - append-cflags -mfpmath=sse
1202 - else
1203 - append-cflags -ffloat-store
1204 - fi
1205 - fi
1206 -
1207 - econf "${options[@]}"
1208 -}
1209 -
1210 -multilib_src_compile() {
1211 - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
1212 -
1213 - if use tools && multilib_is_native_abi; then
1214 - emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
1215 - fi
1216 -}
1217 -
1218 -multilib_src_test() {
1219 - if [[ "${EUID}" -eq 0 ]]; then
1220 - ewarn "Skipping tests due to root permissions"
1221 - return
1222 - fi
1223 -
1224 - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
1225 -}
1226 -
1227 -multilib_src_install() {
1228 - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
1229 -
1230 - if use tools && multilib_is_native_abi; then
1231 - install_tool() {
1232 - if [[ -f ".libs/${1}" ]]; then
1233 - newbin ".libs/${1}" "${2}"
1234 - else
1235 - newbin "${1}" "${2}"
1236 - fi
1237 - }
1238 -
1239 - install_tool changeset sqlite3-changeset
1240 - install_tool dbdump sqlite3-db-dump
1241 - install_tool dbhash sqlite3-db-hash
1242 - install_tool rbu sqlite3-rbu
1243 - install_tool scrub sqlite3-scrub
1244 - install_tool showdb sqlite3-show-db
1245 - install_tool showjournal sqlite3-show-journal
1246 - install_tool showshm sqlite3-show-shm
1247 - install_tool showstat4 sqlite3-show-stat4
1248 - install_tool showwal sqlite3-show-wal
1249 - install_tool sqldiff sqlite3-diff
1250 - install_tool sqlite3_analyzer sqlite3-analyzer
1251 - install_tool sqlite3_checker sqlite3-checker
1252 - install_tool sqlite3_expert sqlite3-expert
1253 - install_tool sqltclsh sqlite3-tclsh
1254 -
1255 - unset -f install_tool
1256 - fi
1257 -}
1258 -
1259 -multilib_src_install_all() {
1260 - find "${D}" -name "*.la" -delete || die
1261 -
1262 - doman sqlite3.1
1263 -
1264 - if use doc; then
1265 - rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
1266 - (
1267 - docinto html
1268 - dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
1269 - )
1270 - fi
1271 -}
1272
1273 diff --git a/dev-db/sqlite/sqlite-3.26.0.ebuild b/dev-db/sqlite/sqlite-3.26.0.ebuild
1274 deleted file mode 100644
1275 index 64c23846b1d..00000000000
1276 --- a/dev-db/sqlite/sqlite-3.26.0.ebuild
1277 +++ /dev/null
1278 @@ -1,325 +0,0 @@
1279 -# Copyright 1999-2018 Arfrever Frehtes Taifersar Arahesis and others
1280 -# Distributed under the terms of the GNU General Public License v2
1281 -
1282 -EAPI="7"
1283 -
1284 -inherit autotools flag-o-matic multilib-minimal toolchain-funcs
1285 -
1286 -SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
1287 -DOC_PV="${SRC_PV}"
1288 -# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
1289 -
1290 -DESCRIPTION="SQL database engine"
1291 -HOMEPAGE="https://sqlite.org/"
1292 -SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
1293 - tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
1294 - test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
1295 - tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
1296 - !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
1297 -
1298 -LICENSE="public-domain"
1299 -SLOT="3"
1300 -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"
1301 -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
1302 -RESTRICT="!test? ( test )"
1303 -
1304 -BDEPEND="doc? ( app-arch/unzip )
1305 - tcl? (
1306 - app-arch/unzip
1307 - >=dev-lang/tcl-8.6:0
1308 - )
1309 - test? (
1310 - app-arch/unzip
1311 - >=dev-lang/tcl-8.6:0
1312 - )
1313 - tools? (
1314 - app-arch/unzip
1315 - >=dev-lang/tcl-8.6:0
1316 - )"
1317 -RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
1318 - icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
1319 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
1320 - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
1321 - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
1322 -DEPEND="${RDEPEND}
1323 - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
1324 -
1325 -full_archive() {
1326 - use tcl || use test || use tools
1327 -}
1328 -
1329 -pkg_setup() {
1330 - if full_archive; then
1331 - S="${WORKDIR}/${PN}-src-${SRC_PV}"
1332 - else
1333 - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
1334 - fi
1335 -}
1336 -
1337 -src_prepare() {
1338 - if full_archive; then
1339 - eapply "${FILESDIR}/${PN}-3.26.0-full_archive-build.patch"
1340 -
1341 - eapply_user
1342 -
1343 - # Fix AC_CHECK_FUNCS.
1344 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1345 - 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"
1346 - else
1347 - eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
1348 -
1349 - eapply_user
1350 -
1351 - # Fix AC_CHECK_FUNCS.
1352 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1353 - sed \
1354 - -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])/" \
1355 - -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
1356 - -i configure.ac || die "sed failed"
1357 - fi
1358 -
1359 - eautoreconf
1360 -
1361 - multilib_copy_sources
1362 -}
1363 -
1364 -multilib_src_configure() {
1365 - local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
1366 -
1367 - options+=(
1368 - --enable-$(full_archive && echo load-extension || echo dynamic-extensions)
1369 - --enable-threadsafe
1370 - )
1371 - if ! full_archive; then
1372 - options+=(--disable-static-shell)
1373 - fi
1374 -
1375 - # Support detection of misuse of SQLite API.
1376 - # https://sqlite.org/compile.html#enable_api_armor
1377 - append-cppflags -DSQLITE_ENABLE_API_ARMOR
1378 -
1379 - # Support column metadata functions.
1380 - # https://sqlite.org/c3ref/column_database_name.html
1381 - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
1382 -
1383 - # Support sqlite_dbpage virtual table.
1384 - # https://sqlite.org/compile.html#enable_dbpage_vtab
1385 - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
1386 -
1387 - # Support dbstat virtual table.
1388 - # https://sqlite.org/dbstat.html
1389 - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
1390 -
1391 - # Support sqlite3_serialize() and sqlite3_deserialize() functions.
1392 - # https://sqlite.org/compile.html#enable_deserialize
1393 - # https://sqlite.org/c3ref/serialize.html
1394 - # https://sqlite.org/c3ref/deserialize.html
1395 - append-cppflags -DSQLITE_ENABLE_DESERIALIZE
1396 -
1397 - # Support comments in output of EXPLAIN.
1398 - # https://sqlite.org/compile.html#enable_explain_comments
1399 - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
1400 -
1401 - # Support Full-Text Search versions 3, 4 and 5.
1402 - # https://sqlite.org/fts3.html
1403 - # https://sqlite.org/fts5.html
1404 - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
1405 - options+=(--enable-fts5)
1406 -
1407 - # Support hidden columns.
1408 - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
1409 -
1410 - # Support JSON1 extension.
1411 - # https://sqlite.org/json1.html
1412 - append-cppflags -DSQLITE_ENABLE_JSON1
1413 -
1414 - # Support memsys5 memory allocator.
1415 - # https://sqlite.org/malloc.html#memsys5
1416 - append-cppflags -DSQLITE_ENABLE_MEMSYS5
1417 -
1418 - # Support sqlite3_normalized_sql() function.
1419 - # https://sqlite.org/c3ref/expanded_sql.html
1420 - append-cppflags -DSQLITE_ENABLE_NORMALIZE
1421 -
1422 - # Support sqlite_offset() function.
1423 - # https://sqlite.org/lang_corefunc.html#sqlite_offset
1424 - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
1425 -
1426 - # Support pre-update hook functions.
1427 - # https://sqlite.org/c3ref/preupdate_count.html
1428 - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
1429 -
1430 - # Support Resumable Bulk Update extension.
1431 - # https://sqlite.org/rbu.html
1432 - append-cppflags -DSQLITE_ENABLE_RBU
1433 -
1434 - # Support R*Trees.
1435 - # https://sqlite.org/rtree.html
1436 - # https://sqlite.org/geopoly.html
1437 - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
1438 -
1439 - # Support scan status functions.
1440 - # https://sqlite.org/c3ref/stmt_scanstatus.html
1441 - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
1442 - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
1443 -
1444 - # Support sqlite_stmt virtual table.
1445 - # https://sqlite.org/stmt.html
1446 - append-cppflags -DSQLITE_ENABLE_STMTVTAB
1447 -
1448 - # Support Session extension.
1449 - # https://sqlite.org/sessionintro.html
1450 - options+=(--enable-session)
1451 -
1452 - # Support unknown() function.
1453 - # https://sqlite.org/compile.html#enable_unknown_sql_function
1454 - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
1455 -
1456 - # Support unlock notification.
1457 - # https://sqlite.org/unlock_notify.html
1458 - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
1459 -
1460 - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
1461 - # https://sqlite.org/compile.html#enable_update_delete_limit
1462 - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
1463 -
1464 - # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
1465 - # https://sqlite.org/pragma.html#pragma_function_list
1466 - # https://sqlite.org/pragma.html#pragma_module_list
1467 - # https://sqlite.org/pragma.html#pragma_pragma_list
1468 - append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
1469 -
1470 - # Support soundex() function.
1471 - # https://sqlite.org/lang_corefunc.html#soundex
1472 - append-cppflags -DSQLITE_SOUNDEX
1473 -
1474 - # Support URI filenames.
1475 - # https://sqlite.org/uri.html
1476 - append-cppflags -DSQLITE_USE_URI
1477 -
1478 - # debug USE flag.
1479 - if full_archive; then
1480 - options+=($(use_enable debug))
1481 - else
1482 - if use debug; then
1483 - append-cppflags -DSQLITE_DEBUG
1484 - else
1485 - append-cppflags -DNDEBUG
1486 - fi
1487 - fi
1488 -
1489 - # icu USE flag.
1490 - if use icu; then
1491 - # Support ICU extension.
1492 - # https://sqlite.org/compile.html#enable_icu
1493 - append-cppflags -DSQLITE_ENABLE_ICU
1494 - if full_archive; then
1495 - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1496 - else
1497 - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1498 - fi
1499 - fi
1500 -
1501 - # readline USE flag.
1502 - options+=(
1503 - --disable-editline
1504 - $(use_enable readline)
1505 - )
1506 - if full_archive && use readline; then
1507 - options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
1508 - fi
1509 -
1510 - # secure-delete USE flag.
1511 - if use secure-delete; then
1512 - # Enable secure_delete pragma by default.
1513 - # https://sqlite.org/pragma.html#pragma_secure_delete
1514 - append-cppflags -DSQLITE_SECURE_DELETE
1515 - fi
1516 -
1517 - # static-libs USE flag.
1518 - options+=($(use_enable static-libs static))
1519 -
1520 - # tcl, test, tools USE flags.
1521 - if full_archive; then
1522 - options+=(--enable-tcl)
1523 - fi
1524 -
1525 - if [[ "${CHOST}" == *-mint* ]]; then
1526 - append-cppflags -DSQLITE_OMIT_WAL
1527 - fi
1528 -
1529 - if [[ "${ABI}" == "x86" ]]; then
1530 - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
1531 - append-cflags -mfpmath=sse
1532 - else
1533 - append-cflags -ffloat-store
1534 - fi
1535 - fi
1536 -
1537 - econf "${options[@]}"
1538 -}
1539 -
1540 -multilib_src_compile() {
1541 - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
1542 -
1543 - if use tools && multilib_is_native_abi; then
1544 - emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
1545 - fi
1546 -}
1547 -
1548 -multilib_src_test() {
1549 - if [[ "${EUID}" -eq 0 ]]; then
1550 - ewarn "Skipping tests due to root permissions"
1551 - return
1552 - fi
1553 -
1554 - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
1555 -
1556 - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
1557 -}
1558 -
1559 -multilib_src_install() {
1560 - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
1561 -
1562 - if use tools && multilib_is_native_abi; then
1563 - install_tool() {
1564 - if [[ -f ".libs/${1}" ]]; then
1565 - newbin ".libs/${1}" "${2}"
1566 - else
1567 - newbin "${1}" "${2}"
1568 - fi
1569 - }
1570 -
1571 - install_tool changeset sqlite3-changeset
1572 - install_tool dbdump sqlite3-db-dump
1573 - install_tool dbhash sqlite3-db-hash
1574 - install_tool rbu sqlite3-rbu
1575 - install_tool scrub sqlite3-scrub
1576 - install_tool showdb sqlite3-show-db
1577 - install_tool showjournal sqlite3-show-journal
1578 - install_tool showshm sqlite3-show-shm
1579 - install_tool showstat4 sqlite3-show-stat4
1580 - install_tool showwal sqlite3-show-wal
1581 - install_tool sqldiff sqlite3-diff
1582 - install_tool sqlite3_analyzer sqlite3-analyzer
1583 - install_tool sqlite3_checker sqlite3-checker
1584 - install_tool sqlite3_expert sqlite3-expert
1585 - install_tool sqltclsh sqlite3-tclsh
1586 -
1587 - unset -f install_tool
1588 - fi
1589 -}
1590 -
1591 -multilib_src_install_all() {
1592 - find "${D}" -name "*.la" -delete || die
1593 -
1594 - doman sqlite3.1
1595 -
1596 - if use doc; then
1597 - rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
1598 - (
1599 - docinto html
1600 - dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
1601 - )
1602 - fi
1603 -}
1604
1605 diff --git a/dev-db/sqlite/sqlite-3.27.1.ebuild b/dev-db/sqlite/sqlite-3.27.1.ebuild
1606 deleted file mode 100644
1607 index 570c5a4f74e..00000000000
1608 --- a/dev-db/sqlite/sqlite-3.27.1.ebuild
1609 +++ /dev/null
1610 @@ -1,327 +0,0 @@
1611 -# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others
1612 -# Distributed under the terms of the GNU General Public License v2
1613 -
1614 -EAPI="7"
1615 -
1616 -inherit autotools flag-o-matic multilib-minimal toolchain-funcs
1617 -
1618 -SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))"
1619 -DOC_PV="${SRC_PV}"
1620 -# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))"
1621 -
1622 -DESCRIPTION="SQL database engine"
1623 -HOMEPAGE="https://sqlite.org/"
1624 -SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip )
1625 - tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
1626 - test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
1627 - tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip )
1628 - !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
1629 -
1630 -LICENSE="public-domain"
1631 -SLOT="3"
1632 -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"
1633 -IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
1634 -RESTRICT="!test? ( test )"
1635 -
1636 -BDEPEND="doc? ( app-arch/unzip )
1637 - tcl? (
1638 - app-arch/unzip
1639 - >=dev-lang/tcl-8.6:0
1640 - )
1641 - test? (
1642 - app-arch/unzip
1643 - >=dev-lang/tcl-8.6:0
1644 - )
1645 - tools? (
1646 - app-arch/unzip
1647 - >=dev-lang/tcl-8.6:0
1648 - )"
1649 -RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
1650 - icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
1651 - readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
1652 - tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
1653 - tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
1654 -DEPEND="${RDEPEND}
1655 - test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )"
1656 -
1657 -full_archive() {
1658 - use tcl || use test || use tools
1659 -}
1660 -
1661 -pkg_setup() {
1662 - if full_archive; then
1663 - S="${WORKDIR}/${PN}-src-${SRC_PV}"
1664 - else
1665 - S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
1666 - fi
1667 -}
1668 -
1669 -src_prepare() {
1670 - if full_archive; then
1671 - eapply "${FILESDIR}/${PN}-3.27.0-full_archive-build.patch"
1672 -
1673 - eapply_user
1674 -
1675 - # Fix AC_CHECK_FUNCS.
1676 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1677 - 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"
1678 - else
1679 - eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch"
1680 -
1681 - eapply_user
1682 -
1683 - # Fix AC_CHECK_FUNCS.
1684 - # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
1685 - sed \
1686 - -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])/" \
1687 - -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
1688 - -i configure.ac || die "sed failed"
1689 - fi
1690 -
1691 - eautoreconf
1692 -
1693 - multilib_copy_sources
1694 -}
1695 -
1696 -multilib_src_configure() {
1697 - local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
1698 -
1699 - options+=(
1700 - --enable-$(full_archive && echo load-extension || echo dynamic-extensions)
1701 - --enable-threadsafe
1702 - )
1703 - if ! full_archive; then
1704 - options+=(--disable-static-shell)
1705 - fi
1706 -
1707 - # Support detection of misuse of SQLite API.
1708 - # https://sqlite.org/compile.html#enable_api_armor
1709 - append-cppflags -DSQLITE_ENABLE_API_ARMOR
1710 -
1711 - # Support column metadata functions.
1712 - # https://sqlite.org/c3ref/column_database_name.html
1713 - append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
1714 -
1715 - # Support sqlite_dbpage virtual table.
1716 - # https://sqlite.org/compile.html#enable_dbpage_vtab
1717 - append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
1718 -
1719 - # Support dbstat virtual table.
1720 - # https://sqlite.org/dbstat.html
1721 - append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
1722 -
1723 - # Support sqlite3_serialize() and sqlite3_deserialize() functions.
1724 - # https://sqlite.org/compile.html#enable_deserialize
1725 - # https://sqlite.org/c3ref/serialize.html
1726 - # https://sqlite.org/c3ref/deserialize.html
1727 - append-cppflags -DSQLITE_ENABLE_DESERIALIZE
1728 -
1729 - # Support comments in output of EXPLAIN.
1730 - # https://sqlite.org/compile.html#enable_explain_comments
1731 - append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
1732 -
1733 - # Support Full-Text Search versions 3, 4 and 5.
1734 - # https://sqlite.org/fts3.html
1735 - # https://sqlite.org/fts5.html
1736 - append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
1737 - options+=(--enable-fts5)
1738 -
1739 - # Support hidden columns.
1740 - append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
1741 -
1742 - # Support JSON1 extension.
1743 - # https://sqlite.org/json1.html
1744 - append-cppflags -DSQLITE_ENABLE_JSON1
1745 -
1746 - # Support memsys5 memory allocator.
1747 - # https://sqlite.org/malloc.html#memsys5
1748 - append-cppflags -DSQLITE_ENABLE_MEMSYS5
1749 -
1750 - # Support sqlite3_normalized_sql() function.
1751 - # https://sqlite.org/c3ref/expanded_sql.html
1752 - append-cppflags -DSQLITE_ENABLE_NORMALIZE
1753 -
1754 - # Support sqlite_offset() function.
1755 - # https://sqlite.org/lang_corefunc.html#sqlite_offset
1756 - append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
1757 -
1758 - # Support pre-update hook functions.
1759 - # https://sqlite.org/c3ref/preupdate_count.html
1760 - append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
1761 -
1762 - # Support Resumable Bulk Update extension.
1763 - # https://sqlite.org/rbu.html
1764 - append-cppflags -DSQLITE_ENABLE_RBU
1765 -
1766 - # Support R*Trees.
1767 - # https://sqlite.org/rtree.html
1768 - # https://sqlite.org/geopoly.html
1769 - append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY
1770 -
1771 - # Support scan status functions.
1772 - # https://sqlite.org/c3ref/stmt_scanstatus.html
1773 - # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
1774 - append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
1775 -
1776 - # Support sqlite_stmt virtual table.
1777 - # https://sqlite.org/stmt.html
1778 - append-cppflags -DSQLITE_ENABLE_STMTVTAB
1779 -
1780 - # Support Session extension.
1781 - # https://sqlite.org/sessionintro.html
1782 - options+=(--enable-session)
1783 -
1784 - # Support unknown() function.
1785 - # https://sqlite.org/compile.html#enable_unknown_sql_function
1786 - append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
1787 -
1788 - # Support unlock notification.
1789 - # https://sqlite.org/unlock_notify.html
1790 - append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
1791 -
1792 - # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
1793 - # https://sqlite.org/compile.html#enable_update_delete_limit
1794 - append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
1795 -
1796 - # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
1797 - # https://sqlite.org/pragma.html#pragma_function_list
1798 - # https://sqlite.org/pragma.html#pragma_module_list
1799 - # https://sqlite.org/pragma.html#pragma_pragma_list
1800 - append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
1801 -
1802 - # Support soundex() function.
1803 - # https://sqlite.org/lang_corefunc.html#soundex
1804 - append-cppflags -DSQLITE_SOUNDEX
1805 -
1806 - # Support URI filenames.
1807 - # https://sqlite.org/uri.html
1808 - append-cppflags -DSQLITE_USE_URI
1809 -
1810 - # debug USE flag.
1811 - if full_archive; then
1812 - options+=($(use_enable debug))
1813 - else
1814 - if use debug; then
1815 - append-cppflags -DSQLITE_DEBUG
1816 - else
1817 - append-cppflags -DNDEBUG
1818 - fi
1819 - fi
1820 -
1821 - # icu USE flag.
1822 - if use icu; then
1823 - # Support ICU extension.
1824 - # https://sqlite.org/compile.html#enable_icu
1825 - append-cppflags -DSQLITE_ENABLE_ICU
1826 - if full_archive; then
1827 - sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1828 - else
1829 - sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
1830 - fi
1831 - fi
1832 -
1833 - # readline USE flag.
1834 - options+=(
1835 - --disable-editline
1836 - $(use_enable readline)
1837 - )
1838 - if full_archive && use readline; then
1839 - options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
1840 - fi
1841 -
1842 - # secure-delete USE flag.
1843 - if use secure-delete; then
1844 - # Enable secure_delete pragma by default.
1845 - # https://sqlite.org/pragma.html#pragma_secure_delete
1846 - append-cppflags -DSQLITE_SECURE_DELETE
1847 - fi
1848 -
1849 - # static-libs USE flag.
1850 - options+=($(use_enable static-libs static))
1851 -
1852 - # tcl, test, tools USE flags.
1853 - if full_archive; then
1854 - options+=(--enable-tcl)
1855 - fi
1856 -
1857 - if [[ "${CHOST}" == *-mint* ]]; then
1858 - append-cppflags -DSQLITE_OMIT_WAL
1859 - fi
1860 -
1861 - if [[ "${ABI}" == "x86" ]]; then
1862 - if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
1863 - append-cflags -mfpmath=sse
1864 - else
1865 - append-cflags -ffloat-store
1866 - fi
1867 - fi
1868 -
1869 - econf "${options[@]}"
1870 -}
1871 -
1872 -multilib_src_compile() {
1873 - emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
1874 -
1875 - if use tools && multilib_is_native_abi; then
1876 - emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
1877 - fi
1878 -}
1879 -
1880 -multilib_src_test() {
1881 - if [[ "${EUID}" -eq 0 ]]; then
1882 - ewarn "Skipping tests due to root permissions"
1883 - return
1884 - fi
1885 -
1886 - local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}"
1887 -
1888 - emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
1889 -}
1890 -
1891 -multilib_src_install() {
1892 - emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
1893 -
1894 - if use tools && multilib_is_native_abi; then
1895 - install_tool() {
1896 - if [[ -f ".libs/${1}" ]]; then
1897 - newbin ".libs/${1}" "${2}"
1898 - else
1899 - newbin "${1}" "${2}"
1900 - fi
1901 - }
1902 -
1903 - install_tool changeset sqlite3-changeset
1904 - install_tool dbdump sqlite3-db-dump
1905 - install_tool dbhash sqlite3-db-hash
1906 - install_tool dbtotxt sqlite3-db-to-txt
1907 - install_tool index_usage sqlite3-index-usage
1908 - install_tool rbu sqlite3-rbu
1909 - install_tool scrub sqlite3-scrub
1910 - install_tool showdb sqlite3-show-db
1911 - install_tool showjournal sqlite3-show-journal
1912 - install_tool showshm sqlite3-show-shm
1913 - install_tool showstat4 sqlite3-show-stat4
1914 - install_tool showwal sqlite3-show-wal
1915 - install_tool sqldiff sqlite3-diff
1916 - install_tool sqlite3_analyzer sqlite3-analyzer
1917 - install_tool sqlite3_checker sqlite3-checker
1918 - install_tool sqlite3_expert sqlite3-expert
1919 - install_tool sqltclsh sqlite3-tclsh
1920 -
1921 - unset -f install_tool
1922 - fi
1923 -}
1924 -
1925 -multilib_src_install_all() {
1926 - find "${D}" -name "*.la" -delete || die
1927 -
1928 - doman sqlite3.1
1929 -
1930 - if use doc; then
1931 - rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
1932 - (
1933 - docinto html
1934 - dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
1935 - )
1936 - fi
1937 -}