1 |
commit: 648611c35f8bdad94062e54b39cdffc63acc0a50 |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Thu Apr 1 22:00:00 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Apr 2 15:00:48 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=648611c3 |
7 |
|
8 |
dev-db/sqlite: Delete old versions (3.33.0, 3.34.0). |
9 |
|
10 |
Bug: https://bugs.gentoo.org/777990 |
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 | 4 - |
15 |
dev-db/sqlite/files/sqlite-3.33.0-build_1.1.patch | 413 ------------------ |
16 |
dev-db/sqlite/files/sqlite-3.33.0-build_1.2.patch | 422 ------------------ |
17 |
dev-db/sqlite/files/sqlite-3.33.0-build_2.1.patch | 286 ------------- |
18 |
dev-db/sqlite/files/sqlite-3.33.0-build_2.2.patch | 434 ------------------- |
19 |
dev-db/sqlite/files/sqlite-3.34.0-build_1.1.patch | 375 ---------------- |
20 |
dev-db/sqlite/files/sqlite-3.34.0-build_1.2.patch | 500 ---------------------- |
21 |
dev-db/sqlite/files/sqlite-3.34.0-build_2.1.patch | 291 ------------- |
22 |
dev-db/sqlite/files/sqlite-3.34.0-build_2.2.patch | 441 ------------------- |
23 |
dev-db/sqlite/sqlite-3.33.0.ebuild | 374 ---------------- |
24 |
dev-db/sqlite/sqlite-3.34.0.ebuild | 434 ------------------- |
25 |
11 files changed, 3974 deletions(-) |
26 |
|
27 |
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest |
28 |
index 3ae6212d2ba..aa080c5bd0a 100644 |
29 |
--- a/dev-db/sqlite/Manifest |
30 |
+++ b/dev-db/sqlite/Manifest |
31 |
@@ -1,12 +1,8 @@ |
32 |
-DIST sqlite-doc-3330000.zip 9834159 BLAKE2B f67155a8ce8e46c2fbc0a4e35722d1fcad86e905a15230adc70732cee267b6b2002c7499883b938129aaa908b99634e4214360e9d1dbdae333b09060de24530e SHA512 14a3cccb4ff6af57738990eeadd37a1b827f89c9c1b16201c62ca5bb9301d39223d48677b9c269ce332210e5c9ae3f42aa0f9de7d79b38acb9809c732d038368 |
33 |
-DIST sqlite-doc-3340000.zip 10069888 BLAKE2B 343df62bc8b75d57dffe69c779cceb856d9e94a5b2a77c3a972761eedd8b4b0f5f8849102ec271652c3aa4039df75d7f2e503fd04b0547be03e024fdfbd894ac SHA512 1bdf20030e656ec4ce38a264c8ef7a95c9f2731cd7d756a44b35b6c68827e8aba92018007139ee09d1c27b34bcd72bff1a201dc3f30aa13e96120af5d58e835e |
34 |
DIST sqlite-doc-3340100.zip 10074559 BLAKE2B 66aa999d87b7f3c994c289eda320d6a4e371b0a6a2ab8bcebde540aa955f3bdf4f00b739ca32aa913685cd35a88ee83bebd7fa43a0c148614e9086a1d3f5652a SHA512 20cbb9f05cd329bf7aa2877431781e46192544806042f4104e4eb0e87d84cd2dfc02c7ff226d4bef9bb2c6a69cc612201844d116abe99b0cfed9602adf243a60 |
35 |
DIST sqlite-doc-3350000.zip 10165959 BLAKE2B e24ae04764617d07fafc82f4c27d96b853df77de2a945109c2ff28abd3b61f8bdd318756d14b8d20e22a0dff05fcca26c9a8c9972f600af0a996cd8e13478c9d SHA512 f6b92cf1a087a97071c55605e85676c4d76b9435a1a433e4663ff3d7937557d72e4fb99931a14abda9ab3dece654da09d10f7ca2560ca3e0972e4b7690997132 |
36 |
DIST sqlite-doc-3350100.zip 10175402 BLAKE2B c8ac8814837dc88320ae0f6973b5ec0b815a4fbfefae26ea2b5365485decb33e9e4add9097865819a5facb2568198535166dd8c492cb621ec845d8bfc2056721 SHA512 4843d8186f4cc98fc9ad5459a1b987d4512e72ceeeb985372c22d44f35856e33ee41ab0fa4372c273cfa4730f9461dc3f359ba50f26e53a0c7abd87e70cdfe86 |
37 |
DIST sqlite-doc-3350200.zip 10182547 BLAKE2B f50b04495aa79eca1ce935c8a96fe83d0a415f15ec55fda0cd982d02b4473ba8f5175c97d9816de2b79526787bc958b3be5e1234994e5f00d8ee1b432627391e SHA512 7ef973b804d059cf00c759a0ae001b7714df0472398e7cd55e34f59222df816a36511cefd15fa99abf67dec4291ee6babbc12bd87855194608ff556a5c1182ae |
38 |
DIST sqlite-doc-3350300.zip 10197905 BLAKE2B ffe3e800fa7c9066c6f180a5989cceb89dfff81729258278256901eee717872ef6993a8bb30ebb6c1de5a66c128009c21494ec9bf0011accdd6f8beef712213a SHA512 260981abaf54f452777e37e99474d100010ec2340c740f78445b7794fa17bcbb814e90f004f870d929a9ccab1d89417ee3d65ffe3b65dbf511ca1de7b6a6a4c8 |
39 |
-DIST sqlite-src-3330000.zip 12591089 BLAKE2B 14888bca229683e97c4666f8efb535be5bd3e322de0089f0175ba15e038016be3a3cc00b5bfa8c111538116914cf6d8439839ca5d1e20339b184e547ddf260a4 SHA512 3260e3e03ee2f6a4ff2bc4ea4bada5a1497afeca33878c155a8005824970c6c1eb8a2db58eb3023cab084af475fadb81d1c3c9892ae92c07f884881e6602e173 |
40 |
-DIST sqlite-src-3340000.zip 12623425 BLAKE2B 548293cf0166407727cd068804eb5e1ce62f654533c88a87b71a6ff62da37eb2af21b89b8d63ee677777ca917e0d685ddcf9b8d5c3c8b2a2b787d71da8e5a161 SHA512 520fbca59da02452e2861a140bde891aedfc8254eafaa6894e8d845369d60d6a921595a411efb2611c0f7b0cadd69a713dcdaaeaad1e4254e9fd9a6efde07f91 |
41 |
DIST sqlite-src-3340100.zip 12623711 BLAKE2B 08c98d0c56d46fe909f449f322002ae4d69fd952930d2f04514988a939b31744a13aea85935d84bc05db52faca1aad6a70d7c31e7da0e396bb649685a49699bb SHA512 5ed02fe609b3d08c3297cc43b21e6ee3f56fb51a6616ac391a0e50cd1677dbad03c6bf9bf9c8409cf94b83b16fe6b6e4a112640b18c7d4fd95328066da3c3943 |
42 |
DIST sqlite-src-3350000.zip 12814378 BLAKE2B f77880bfb335da078623841f9d9d9fc690085630757d8d8e3d40d42646902f809febf8dcc5048d38be0e2d74c0114c35f09789bc261e51d49f9685201f6d1297 SHA512 4b77d963092a6aed61b50e59450edf2af187f16b185b05ca54d81c3eecf71b1cb9bc2883a8aadeb971fcebe343fa430ea788aedb77e3712c8b39d4892c93a797 |
43 |
DIST sqlite-src-3350100.zip 12814875 BLAKE2B bc4f6913ce93c32e1c6fbd39f45666a14476096b09f7534047aee56cbb18e949bf5225c080c813281a0abae9198a35165161393db39df0c2af2a92138b4604d9 SHA512 004bcca9c2ae883b05d8f15c8bf28a12fd2fdf9527d1560d137f8e2570c153d14ea5405c500d0e79966a3881a516df4d9ed07be751712f1584df411e86c60977 |
44 |
|
45 |
diff --git a/dev-db/sqlite/files/sqlite-3.33.0-build_1.1.patch b/dev-db/sqlite/files/sqlite-3.33.0-build_1.1.patch |
46 |
deleted file mode 100644 |
47 |
index 6ee7396223d..00000000000 |
48 |
--- a/dev-db/sqlite/files/sqlite-3.33.0-build_1.1.patch |
49 |
+++ /dev/null |
50 |
@@ -1,413 +0,0 @@ |
51 |
-Add initialization functions for internal usage in libsqlite3.so. |
52 |
- |
53 |
---- /ext/misc/amatch.c |
54 |
-+++ /ext/misc/amatch.c |
55 |
-@@ -1480,9 +1480,18 @@ |
56 |
- |
57 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
58 |
- |
59 |
-+int sqlite3AmatchInit(sqlite3 *db){ |
60 |
-+ int rc = SQLITE_OK; |
61 |
-+#ifndef SQLITE_OMIT_VIRTUALTABLE |
62 |
-+ rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); |
63 |
-+#endif /* SQLITE_OMIT_VIRTUALTABLE */ |
64 |
-+ return rc; |
65 |
-+} |
66 |
-+ |
67 |
- /* |
68 |
- ** Register the amatch virtual table |
69 |
- */ |
70 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
71 |
- #ifdef _WIN32 |
72 |
- __declspec(dllexport) |
73 |
- #endif |
74 |
-@@ -1491,11 +1500,8 @@ |
75 |
- char **pzErrMsg, |
76 |
- const sqlite3_api_routines *pApi |
77 |
- ){ |
78 |
-- int rc = SQLITE_OK; |
79 |
- SQLITE_EXTENSION_INIT2(pApi); |
80 |
- (void)pzErrMsg; /* Not used */ |
81 |
--#ifndef SQLITE_OMIT_VIRTUALTABLE |
82 |
-- rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); |
83 |
--#endif /* SQLITE_OMIT_VIRTUALTABLE */ |
84 |
-- return rc; |
85 |
-+ return sqlite3AmatchInit(db); |
86 |
- } |
87 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
88 |
---- /ext/misc/carray.c |
89 |
-+++ /ext/misc/carray.c |
90 |
-@@ -383,16 +383,8 @@ |
91 |
- |
92 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
93 |
- |
94 |
--#ifdef _WIN32 |
95 |
--__declspec(dllexport) |
96 |
--#endif |
97 |
--int sqlite3_carray_init( |
98 |
-- sqlite3 *db, |
99 |
-- char **pzErrMsg, |
100 |
-- const sqlite3_api_routines *pApi |
101 |
--){ |
102 |
-+int sqlite3CarrayInit(sqlite3 *db){ |
103 |
- int rc = SQLITE_OK; |
104 |
-- SQLITE_EXTENSION_INIT2(pApi); |
105 |
- #ifndef SQLITE_OMIT_VIRTUALTABLE |
106 |
- rc = sqlite3_create_module(db, "carray", &carrayModule, 0); |
107 |
- #ifdef SQLITE_TEST |
108 |
-@@ -404,3 +396,18 @@ |
109 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
110 |
- return rc; |
111 |
- } |
112 |
-+ |
113 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
114 |
-+#ifdef _WIN32 |
115 |
-+__declspec(dllexport) |
116 |
-+#endif |
117 |
-+int sqlite3_carray_init( |
118 |
-+ sqlite3 *db, |
119 |
-+ char **pzErrMsg, |
120 |
-+ const sqlite3_api_routines *pApi |
121 |
-+){ |
122 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
123 |
-+ (void)pzErrMsg; /* Unused parameter */ |
124 |
-+ return sqlite3CarrayInit(db); |
125 |
-+} |
126 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
127 |
---- /ext/misc/completion.c |
128 |
-+++ /ext/misc/completion.c |
129 |
-@@ -483,12 +483,13 @@ |
130 |
- return rc; |
131 |
- } |
132 |
- |
133 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
134 |
- #ifdef _WIN32 |
135 |
- __declspec(dllexport) |
136 |
- #endif |
137 |
- int sqlite3_completion_init( |
138 |
-- sqlite3 *db, |
139 |
-- char **pzErrMsg, |
140 |
-+ sqlite3 *db, |
141 |
-+ char **pzErrMsg, |
142 |
- const sqlite3_api_routines *pApi |
143 |
- ){ |
144 |
- int rc = SQLITE_OK; |
145 |
-@@ -499,3 +500,4 @@ |
146 |
- #endif |
147 |
- return rc; |
148 |
- } |
149 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
150 |
---- /ext/misc/csv.c |
151 |
-+++ /ext/misc/csv.c |
152 |
-@@ -928,6 +928,22 @@ |
153 |
- #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */ |
154 |
- |
155 |
- |
156 |
-+int sqlite3CsvInit(sqlite3 *db){ |
157 |
-+#ifndef SQLITE_OMIT_VIRTUALTABLE |
158 |
-+ int rc; |
159 |
-+ rc = sqlite3_create_module(db, "csv", &CsvModule, 0); |
160 |
-+#ifdef SQLITE_TEST |
161 |
-+ if( rc==SQLITE_OK ){ |
162 |
-+ rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0); |
163 |
-+ } |
164 |
-+#endif |
165 |
-+ return rc; |
166 |
-+#else |
167 |
-+ return SQLITE_OK; |
168 |
-+#endif |
169 |
-+} |
170 |
-+ |
171 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
172 |
- #ifdef _WIN32 |
173 |
- __declspec(dllexport) |
174 |
- #endif |
175 |
-@@ -941,17 +957,8 @@ |
176 |
- char **pzErrMsg, |
177 |
- const sqlite3_api_routines *pApi |
178 |
- ){ |
179 |
--#ifndef SQLITE_OMIT_VIRTUALTABLE |
180 |
-- int rc; |
181 |
- SQLITE_EXTENSION_INIT2(pApi); |
182 |
-- rc = sqlite3_create_module(db, "csv", &CsvModule, 0); |
183 |
--#ifdef SQLITE_TEST |
184 |
-- if( rc==SQLITE_OK ){ |
185 |
-- rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0); |
186 |
-- } |
187 |
--#endif |
188 |
-- return rc; |
189 |
--#else |
190 |
-- return SQLITE_OK; |
191 |
--#endif |
192 |
-+ (void)pzErrMsg; /* Unused parameter */ |
193 |
-+ return sqlite3CsvInit(db); |
194 |
- } |
195 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
196 |
---- /ext/misc/dbdata.c |
197 |
-+++ /ext/misc/dbdata.c |
198 |
-@@ -803,7 +803,7 @@ |
199 |
- /* |
200 |
- ** Invoke this routine to register the "sqlite_dbdata" virtual table module |
201 |
- */ |
202 |
--static int sqlite3DbdataRegister(sqlite3 *db){ |
203 |
-+int sqlite3DbdataRegister(sqlite3 *db){ |
204 |
- static sqlite3_module dbdata_module = { |
205 |
- 0, /* iVersion */ |
206 |
- 0, /* xCreate */ |
207 |
-@@ -838,6 +838,7 @@ |
208 |
- return rc; |
209 |
- } |
210 |
- |
211 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
212 |
- #ifdef _WIN32 |
213 |
- __declspec(dllexport) |
214 |
- #endif |
215 |
-@@ -849,3 +850,4 @@ |
216 |
- SQLITE_EXTENSION_INIT2(pApi); |
217 |
- return sqlite3DbdataRegister(db); |
218 |
- } |
219 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
220 |
---- /ext/misc/decimal.c |
221 |
-+++ /ext/misc/decimal.c |
222 |
-@@ -590,14 +590,7 @@ |
223 |
- decimal_free(pB); |
224 |
- } |
225 |
- |
226 |
--#ifdef _WIN32 |
227 |
--__declspec(dllexport) |
228 |
--#endif |
229 |
--int sqlite3_decimal_init( |
230 |
-- sqlite3 *db, |
231 |
-- char **pzErrMsg, |
232 |
-- const sqlite3_api_routines *pApi |
233 |
--){ |
234 |
-+int sqlite3DecimalInit(sqlite3 *db){ |
235 |
- int rc = SQLITE_OK; |
236 |
- static const struct { |
237 |
- const char *zFuncName; |
238 |
-@@ -611,10 +604,6 @@ |
239 |
- { "decimal_mul", 2, decimalMulFunc }, |
240 |
- }; |
241 |
- unsigned int i; |
242 |
-- (void)pzErrMsg; /* Unused parameter */ |
243 |
-- |
244 |
-- SQLITE_EXTENSION_INIT2(pApi); |
245 |
-- |
246 |
- for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){ |
247 |
- rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg, |
248 |
- SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC, |
249 |
-@@ -632,3 +621,20 @@ |
250 |
- } |
251 |
- return rc; |
252 |
- } |
253 |
-+ |
254 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
255 |
-+#ifdef _WIN32 |
256 |
-+__declspec(dllexport) |
257 |
-+#endif |
258 |
-+int sqlite3_decimal_init( |
259 |
-+ sqlite3 *db, |
260 |
-+ char **pzErrMsg, |
261 |
-+ const sqlite3_api_routines *pApi |
262 |
-+){ |
263 |
-+ (void)pzErrMsg; /* Unused parameter */ |
264 |
-+ |
265 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
266 |
-+ |
267 |
-+ return sqlite3DecimalInit(db); |
268 |
-+} |
269 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
270 |
---- /ext/misc/eval.c |
271 |
-+++ /ext/misc/eval.c |
272 |
-@@ -102,6 +102,20 @@ |
273 |
- } |
274 |
- |
275 |
- |
276 |
-+int sqlite3EvalInit(sqlite3 *db){ |
277 |
-+ int rc = SQLITE_OK; |
278 |
-+ rc = sqlite3_create_function(db, "eval", 1, |
279 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
280 |
-+ sqlEvalFunc, 0, 0); |
281 |
-+ if( rc==SQLITE_OK ){ |
282 |
-+ rc = sqlite3_create_function(db, "eval", 2, |
283 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
284 |
-+ sqlEvalFunc, 0, 0); |
285 |
-+ } |
286 |
-+ return rc; |
287 |
-+} |
288 |
-+ |
289 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
290 |
- #ifdef _WIN32 |
291 |
- __declspec(dllexport) |
292 |
- #endif |
293 |
-@@ -110,16 +124,8 @@ |
294 |
- char **pzErrMsg, |
295 |
- const sqlite3_api_routines *pApi |
296 |
- ){ |
297 |
-- int rc = SQLITE_OK; |
298 |
- SQLITE_EXTENSION_INIT2(pApi); |
299 |
- (void)pzErrMsg; /* Unused parameter */ |
300 |
-- rc = sqlite3_create_function(db, "eval", 1, |
301 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
302 |
-- sqlEvalFunc, 0, 0); |
303 |
-- if( rc==SQLITE_OK ){ |
304 |
-- rc = sqlite3_create_function(db, "eval", 2, |
305 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
306 |
-- sqlEvalFunc, 0, 0); |
307 |
-- } |
308 |
-- return rc; |
309 |
-+ return sqlite3EvalInit(db); |
310 |
- } |
311 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
312 |
---- /ext/misc/fileio.c |
313 |
-+++ /ext/misc/fileio.c |
314 |
-@@ -340,7 +340,7 @@ |
315 |
- ** This function does the work for the writefile() UDF. Refer to |
316 |
- ** header comments at the top of this file for details. |
317 |
- */ |
318 |
--static int writeFile( |
319 |
-+static int writeFileContents( |
320 |
- sqlite3_context *pCtx, /* Context to return bytes written in */ |
321 |
- const char *zFile, /* File to write */ |
322 |
- sqlite3_value *pData, /* Data to write */ |
323 |
-@@ -480,10 +480,10 @@ |
324 |
- mtime = sqlite3_value_int64(argv[3]); |
325 |
- } |
326 |
- |
327 |
-- res = writeFile(context, zFile, argv[1], mode, mtime); |
328 |
-+ res = writeFileContents(context, zFile, argv[1], mode, mtime); |
329 |
- if( res==1 && errno==ENOENT ){ |
330 |
- if( makeDirectory(zFile)==SQLITE_OK ){ |
331 |
-- res = writeFile(context, zFile, argv[1], mode, mtime); |
332 |
-+ res = writeFileContents(context, zFile, argv[1], mode, mtime); |
333 |
- } |
334 |
- } |
335 |
- |
336 |
-@@ -970,18 +970,9 @@ |
337 |
- # define fsdirRegister(x) SQLITE_OK |
338 |
- #endif |
339 |
- |
340 |
--#ifdef _WIN32 |
341 |
--__declspec(dllexport) |
342 |
--#endif |
343 |
--int sqlite3_fileio_init( |
344 |
-- sqlite3 *db, |
345 |
-- char **pzErrMsg, |
346 |
-- const sqlite3_api_routines *pApi |
347 |
--){ |
348 |
-+int sqlite3FileioInit(sqlite3 *db){ |
349 |
- int rc = SQLITE_OK; |
350 |
-- SQLITE_EXTENSION_INIT2(pApi); |
351 |
-- (void)pzErrMsg; /* Unused parameter */ |
352 |
-- rc = sqlite3_create_function(db, "readfile", 1, |
353 |
-+ rc = sqlite3_create_function(db, "readfile", 1, |
354 |
- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
355 |
- readfileFunc, 0, 0); |
356 |
- if( rc==SQLITE_OK ){ |
357 |
-@@ -998,3 +989,18 @@ |
358 |
- } |
359 |
- return rc; |
360 |
- } |
361 |
-+ |
362 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
363 |
-+#ifdef _WIN32 |
364 |
-+__declspec(dllexport) |
365 |
-+#endif |
366 |
-+int sqlite3_fileio_init( |
367 |
-+ sqlite3 *db, |
368 |
-+ char **pzErrMsg, |
369 |
-+ const sqlite3_api_routines *pApi |
370 |
-+){ |
371 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
372 |
-+ (void)pzErrMsg; /* Unused parameter */ |
373 |
-+ return sqlite3FileioInit(db); |
374 |
-+} |
375 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
376 |
---- /ext/misc/ieee754.c |
377 |
-+++ /ext/misc/ieee754.c |
378 |
-@@ -245,14 +245,7 @@ |
379 |
- } |
380 |
- |
381 |
- |
382 |
--#ifdef _WIN32 |
383 |
--__declspec(dllexport) |
384 |
--#endif |
385 |
--int sqlite3_ieee_init( |
386 |
-- sqlite3 *db, |
387 |
-- char **pzErrMsg, |
388 |
-- const sqlite3_api_routines *pApi |
389 |
--){ |
390 |
-+int sqlite3IeeeInit(sqlite3 *db){ |
391 |
- static const struct { |
392 |
- char *zFName; |
393 |
- int nArg; |
394 |
-@@ -269,13 +262,26 @@ |
395 |
- }; |
396 |
- unsigned int i; |
397 |
- int rc = SQLITE_OK; |
398 |
-- SQLITE_EXTENSION_INIT2(pApi); |
399 |
-- (void)pzErrMsg; /* Unused parameter */ |
400 |
- for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){ |
401 |
-- rc = sqlite3_create_function(db, aFunc[i].zFName, aFunc[i].nArg, |
402 |
-+ rc = sqlite3_create_function(db, aFunc[i].zFName, aFunc[i].nArg, |
403 |
- SQLITE_UTF8|SQLITE_INNOCUOUS, |
404 |
- (void*)&aFunc[i].iAux, |
405 |
- aFunc[i].xFunc, 0, 0); |
406 |
- } |
407 |
- return rc; |
408 |
- } |
409 |
-+ |
410 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
411 |
-+#ifdef _WIN32 |
412 |
-+__declspec(dllexport) |
413 |
-+#endif |
414 |
-+int sqlite3_ieee_init( |
415 |
-+ sqlite3 *db, |
416 |
-+ char **pzErrMsg, |
417 |
-+ const sqlite3_api_routines *pApi |
418 |
-+){ |
419 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
420 |
-+ (void)pzErrMsg; /* Unused parameter */ |
421 |
-+ return sqlite3IeeeInit(db); |
422 |
-+} |
423 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
424 |
---- /ext/misc/nextchar.c |
425 |
-+++ /ext/misc/nextchar.c |
426 |
-@@ -286,17 +286,8 @@ |
427 |
- sqlite3_free(c.aResult); |
428 |
- } |
429 |
- |
430 |
--#ifdef _WIN32 |
431 |
--__declspec(dllexport) |
432 |
--#endif |
433 |
--int sqlite3_nextchar_init( |
434 |
-- sqlite3 *db, |
435 |
-- char **pzErrMsg, |
436 |
-- const sqlite3_api_routines *pApi |
437 |
--){ |
438 |
-+int sqlite3NextcharInit(sqlite3 *db){ |
439 |
- int rc = SQLITE_OK; |
440 |
-- SQLITE_EXTENSION_INIT2(pApi); |
441 |
-- (void)pzErrMsg; /* Unused parameter */ |
442 |
- rc = sqlite3_create_function(db, "next_char", 3, |
443 |
- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
444 |
- nextCharFunc, 0, 0); |
445 |
-@@ -312,3 +303,18 @@ |
446 |
- } |
447 |
- return rc; |
448 |
- } |
449 |
-+ |
450 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
451 |
-+#ifdef _WIN32 |
452 |
-+__declspec(dllexport) |
453 |
-+#endif |
454 |
-+int sqlite3_nextchar_init( |
455 |
-+ sqlite3 *db, |
456 |
-+ char **pzErrMsg, |
457 |
-+ const sqlite3_api_routines *pApi |
458 |
-+){ |
459 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
460 |
-+ (void)pzErrMsg; /* Unused parameter */ |
461 |
-+ return sqlite3NextcharInit(db); |
462 |
-+} |
463 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
464 |
|
465 |
diff --git a/dev-db/sqlite/files/sqlite-3.33.0-build_1.2.patch b/dev-db/sqlite/files/sqlite-3.33.0-build_1.2.patch |
466 |
deleted file mode 100644 |
467 |
index 8f6fd6f7617..00000000000 |
468 |
--- a/dev-db/sqlite/files/sqlite-3.33.0-build_1.2.patch |
469 |
+++ /dev/null |
470 |
@@ -1,422 +0,0 @@ |
471 |
-Add initialization functions for internal usage in libsqlite3.so. |
472 |
- |
473 |
---- /ext/misc/percentile.c |
474 |
-+++ /ext/misc/percentile.c |
475 |
-@@ -202,6 +202,15 @@ |
476 |
- } |
477 |
- |
478 |
- |
479 |
-+int sqlite3PercentileInit(sqlite3 *db){ |
480 |
-+ int rc = SQLITE_OK; |
481 |
-+ rc = sqlite3_create_function(db, "percentile", 2, |
482 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
483 |
-+ 0, percentStep, percentFinal); |
484 |
-+ return rc; |
485 |
-+} |
486 |
-+ |
487 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
488 |
- #ifdef _WIN32 |
489 |
- __declspec(dllexport) |
490 |
- #endif |
491 |
-@@ -210,11 +219,8 @@ |
492 |
- char **pzErrMsg, |
493 |
- const sqlite3_api_routines *pApi |
494 |
- ){ |
495 |
-- int rc = SQLITE_OK; |
496 |
- SQLITE_EXTENSION_INIT2(pApi); |
497 |
- (void)pzErrMsg; /* Unused parameter */ |
498 |
-- rc = sqlite3_create_function(db, "percentile", 2, |
499 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
500 |
-- 0, percentStep, percentFinal); |
501 |
-- return rc; |
502 |
-+ return sqlite3PercentileInit(db); |
503 |
- } |
504 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
505 |
---- /ext/misc/regexp.c |
506 |
-+++ /ext/misc/regexp.c |
507 |
-@@ -740,10 +740,18 @@ |
508 |
- } |
509 |
- } |
510 |
- |
511 |
-+int sqlite3RegexpInit(sqlite3 *db){ |
512 |
-+ int rc = SQLITE_OK; |
513 |
-+ rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS, |
514 |
-+ 0, re_sql_func, 0, 0); |
515 |
-+ return rc; |
516 |
-+} |
517 |
-+ |
518 |
- /* |
519 |
- ** Invoke this routine to register the regexp() function with the |
520 |
- ** SQLite database connection. |
521 |
- */ |
522 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
523 |
- #ifdef _WIN32 |
524 |
- __declspec(dllexport) |
525 |
- #endif |
526 |
-@@ -752,9 +760,8 @@ |
527 |
- char **pzErrMsg, |
528 |
- const sqlite3_api_routines *pApi |
529 |
- ){ |
530 |
-- int rc = SQLITE_OK; |
531 |
- SQLITE_EXTENSION_INIT2(pApi); |
532 |
-- rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS, |
533 |
-- 0, re_sql_func, 0, 0); |
534 |
-- return rc; |
535 |
-+ (void)pzErrMsg; /* Unused parameter */ |
536 |
-+ return sqlite3RegexpInit(db); |
537 |
- } |
538 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
539 |
---- /ext/misc/sha1.c |
540 |
-+++ /ext/misc/sha1.c |
541 |
-@@ -175,7 +175,7 @@ |
542 |
- } |
543 |
- |
544 |
- /* Compute a string using sqlite3_vsnprintf() and hash it */ |
545 |
--static void hash_step_vformat( |
546 |
-+static void sha1_hash_step_vformat( |
547 |
- SHA1Context *p, /* Add content to this context */ |
548 |
- const char *zFormat, |
549 |
- ... |
550 |
-@@ -306,7 +306,7 @@ |
551 |
- nCol = sqlite3_column_count(pStmt); |
552 |
- z = sqlite3_sql(pStmt); |
553 |
- n = (int)strlen(z); |
554 |
-- hash_step_vformat(&cx,"S%d:",n); |
555 |
-+ sha1_hash_step_vformat(&cx,"S%d:",n); |
556 |
- hash_step(&cx,(unsigned char*)z,n); |
557 |
- |
558 |
- /* Compute a hash over the result of the query */ |
559 |
-@@ -349,14 +349,14 @@ |
560 |
- case SQLITE_TEXT: { |
561 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
562 |
- const unsigned char *z2 = sqlite3_column_text(pStmt, i); |
563 |
-- hash_step_vformat(&cx,"T%d:",n2); |
564 |
-+ sha1_hash_step_vformat(&cx,"T%d:",n2); |
565 |
- hash_step(&cx, z2, n2); |
566 |
- break; |
567 |
- } |
568 |
- case SQLITE_BLOB: { |
569 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
570 |
- const unsigned char *z2 = sqlite3_column_blob(pStmt, i); |
571 |
-- hash_step_vformat(&cx,"B%d:",n2); |
572 |
-+ sha1_hash_step_vformat(&cx,"B%d:",n2); |
573 |
- hash_step(&cx, z2, n2); |
574 |
- break; |
575 |
- } |
576 |
-@@ -370,6 +370,20 @@ |
577 |
- } |
578 |
- |
579 |
- |
580 |
-+int sqlite3ShaInit(sqlite3 *db){ |
581 |
-+ int rc = SQLITE_OK; |
582 |
-+ rc = sqlite3_create_function(db, "sha1", 1, |
583 |
-+ SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
584 |
-+ 0, sha1Func, 0, 0); |
585 |
-+ if( rc==SQLITE_OK ){ |
586 |
-+ rc = sqlite3_create_function(db, "sha1_query", 1, |
587 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
588 |
-+ sha1QueryFunc, 0, 0); |
589 |
-+ } |
590 |
-+ return rc; |
591 |
-+} |
592 |
-+ |
593 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
594 |
- #ifdef _WIN32 |
595 |
- __declspec(dllexport) |
596 |
- #endif |
597 |
-@@ -378,16 +392,8 @@ |
598 |
- char **pzErrMsg, |
599 |
- const sqlite3_api_routines *pApi |
600 |
- ){ |
601 |
-- int rc = SQLITE_OK; |
602 |
- SQLITE_EXTENSION_INIT2(pApi); |
603 |
- (void)pzErrMsg; /* Unused parameter */ |
604 |
-- rc = sqlite3_create_function(db, "sha1", 1, |
605 |
-- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
606 |
-- 0, sha1Func, 0, 0); |
607 |
-- if( rc==SQLITE_OK ){ |
608 |
-- rc = sqlite3_create_function(db, "sha1_query", 1, |
609 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
610 |
-- sha1QueryFunc, 0, 0); |
611 |
-- } |
612 |
-- return rc; |
613 |
-+ return sqlite3ShaInit(db); |
614 |
- } |
615 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
616 |
---- /ext/misc/shathree.c |
617 |
-+++ /ext/misc/shathree.c |
618 |
-@@ -527,7 +527,7 @@ |
619 |
- /* Compute a string using sqlite3_vsnprintf() with a maximum length |
620 |
- ** of 50 bytes and add it to the hash. |
621 |
- */ |
622 |
--static void hash_step_vformat( |
623 |
-+static void sha3_hash_step_vformat( |
624 |
- SHA3Context *p, /* Add content to this context */ |
625 |
- const char *zFormat, |
626 |
- ... |
627 |
-@@ -622,7 +622,7 @@ |
628 |
- nCol = sqlite3_column_count(pStmt); |
629 |
- z = sqlite3_sql(pStmt); |
630 |
- n = (int)strlen(z); |
631 |
-- hash_step_vformat(&cx,"S%d:",n); |
632 |
-+ sha3_hash_step_vformat(&cx,"S%d:",n); |
633 |
- SHA3Update(&cx,(unsigned char*)z,n); |
634 |
- |
635 |
- /* Compute a hash over the result of the query */ |
636 |
-@@ -665,14 +665,14 @@ |
637 |
- case SQLITE_TEXT: { |
638 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
639 |
- const unsigned char *z2 = sqlite3_column_text(pStmt, i); |
640 |
-- hash_step_vformat(&cx,"T%d:",n2); |
641 |
-+ sha3_hash_step_vformat(&cx,"T%d:",n2); |
642 |
- SHA3Update(&cx, z2, n2); |
643 |
- break; |
644 |
- } |
645 |
- case SQLITE_BLOB: { |
646 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
647 |
- const unsigned char *z2 = sqlite3_column_blob(pStmt, i); |
648 |
-- hash_step_vformat(&cx,"B%d:",n2); |
649 |
-+ sha3_hash_step_vformat(&cx,"B%d:",n2); |
650 |
- SHA3Update(&cx, z2, n2); |
651 |
- break; |
652 |
- } |
653 |
-@@ -685,17 +685,8 @@ |
654 |
- } |
655 |
- |
656 |
- |
657 |
--#ifdef _WIN32 |
658 |
--__declspec(dllexport) |
659 |
--#endif |
660 |
--int sqlite3_shathree_init( |
661 |
-- sqlite3 *db, |
662 |
-- char **pzErrMsg, |
663 |
-- const sqlite3_api_routines *pApi |
664 |
--){ |
665 |
-+int sqlite3ShathreeInit(sqlite3 *db){ |
666 |
- int rc = SQLITE_OK; |
667 |
-- SQLITE_EXTENSION_INIT2(pApi); |
668 |
-- (void)pzErrMsg; /* Unused parameter */ |
669 |
- rc = sqlite3_create_function(db, "sha3", 1, |
670 |
- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
671 |
- 0, sha3Func, 0, 0); |
672 |
-@@ -716,3 +707,18 @@ |
673 |
- } |
674 |
- return rc; |
675 |
- } |
676 |
-+ |
677 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
678 |
-+#ifdef _WIN32 |
679 |
-+__declspec(dllexport) |
680 |
-+#endif |
681 |
-+int sqlite3_shathree_init( |
682 |
-+ sqlite3 *db, |
683 |
-+ char **pzErrMsg, |
684 |
-+ const sqlite3_api_routines *pApi |
685 |
-+){ |
686 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
687 |
-+ (void)pzErrMsg; /* Unused parameter */ |
688 |
-+ return sqlite3ShathreeInit(db); |
689 |
-+} |
690 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
691 |
---- /ext/misc/sqlar.c |
692 |
-+++ /ext/misc/sqlar.c |
693 |
-@@ -14,6 +14,8 @@ |
694 |
- ** for working with sqlar archives and used by the shell tool's built-in |
695 |
- ** sqlar support. |
696 |
- */ |
697 |
-+#ifdef SQLITE_HAVE_ZLIB |
698 |
-+ |
699 |
- #include "sqlite3ext.h" |
700 |
- SQLITE_EXTENSION_INIT1 |
701 |
- #include <zlib.h> |
702 |
-@@ -101,6 +103,20 @@ |
703 |
- } |
704 |
- |
705 |
- |
706 |
-+int sqlite3SqlarInit(sqlite3 *db){ |
707 |
-+ int rc = SQLITE_OK; |
708 |
-+ rc = sqlite3_create_function(db, "sqlar_compress", 1, |
709 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
710 |
-+ sqlarCompressFunc, 0, 0); |
711 |
-+ if( rc==SQLITE_OK ){ |
712 |
-+ rc = sqlite3_create_function(db, "sqlar_uncompress", 2, |
713 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
714 |
-+ sqlarUncompressFunc, 0, 0); |
715 |
-+ } |
716 |
-+ return rc; |
717 |
-+} |
718 |
-+ |
719 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
720 |
- #ifdef _WIN32 |
721 |
- __declspec(dllexport) |
722 |
- #endif |
723 |
-@@ -109,16 +125,10 @@ |
724 |
- char **pzErrMsg, |
725 |
- const sqlite3_api_routines *pApi |
726 |
- ){ |
727 |
-- int rc = SQLITE_OK; |
728 |
- SQLITE_EXTENSION_INIT2(pApi); |
729 |
- (void)pzErrMsg; /* Unused parameter */ |
730 |
-- rc = sqlite3_create_function(db, "sqlar_compress", 1, |
731 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
732 |
-- sqlarCompressFunc, 0, 0); |
733 |
-- if( rc==SQLITE_OK ){ |
734 |
-- rc = sqlite3_create_function(db, "sqlar_uncompress", 2, |
735 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
736 |
-- sqlarUncompressFunc, 0, 0); |
737 |
-- } |
738 |
-- return rc; |
739 |
-+ return sqlite3SqlarInit(db); |
740 |
- } |
741 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
742 |
-+ |
743 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
744 |
---- /ext/misc/totype.c |
745 |
-+++ /ext/misc/totype.c |
746 |
-@@ -491,17 +491,8 @@ |
747 |
- #pragma warning(default: 4748) |
748 |
- #endif |
749 |
- |
750 |
--#ifdef _WIN32 |
751 |
--__declspec(dllexport) |
752 |
--#endif |
753 |
--int sqlite3_totype_init( |
754 |
-- sqlite3 *db, |
755 |
-- char **pzErrMsg, |
756 |
-- const sqlite3_api_routines *pApi |
757 |
--){ |
758 |
-+int sqlite3TotypeInit(sqlite3 *db){ |
759 |
- int rc = SQLITE_OK; |
760 |
-- SQLITE_EXTENSION_INIT2(pApi); |
761 |
-- (void)pzErrMsg; /* Unused parameter */ |
762 |
- rc = sqlite3_create_function(db, "tointeger", 1, |
763 |
- SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, 0, |
764 |
- tointegerFunc, 0, 0); |
765 |
-@@ -512,3 +503,18 @@ |
766 |
- } |
767 |
- return rc; |
768 |
- } |
769 |
-+ |
770 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
771 |
-+#ifdef _WIN32 |
772 |
-+__declspec(dllexport) |
773 |
-+#endif |
774 |
-+int sqlite3_totype_init( |
775 |
-+ sqlite3 *db, |
776 |
-+ char **pzErrMsg, |
777 |
-+ const sqlite3_api_routines *pApi |
778 |
-+){ |
779 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
780 |
-+ (void)pzErrMsg; /* Unused parameter */ |
781 |
-+ return sqlite3TotypeInit(db); |
782 |
-+} |
783 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
784 |
---- /ext/misc/uint.c |
785 |
-+++ /ext/misc/uint.c |
786 |
-@@ -78,6 +78,11 @@ |
787 |
- return (nKey1 - i) - (nKey2 - j); |
788 |
- } |
789 |
- |
790 |
-+int sqlite3UintInit(sqlite3 *db){ |
791 |
-+ return sqlite3_create_collation(db, "UINT", SQLITE_UTF8, 0, uintCollFunc); |
792 |
-+} |
793 |
-+ |
794 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
795 |
- #ifdef _WIN32 |
796 |
- __declspec(dllexport) |
797 |
- #endif |
798 |
-@@ -88,5 +93,6 @@ |
799 |
- ){ |
800 |
- SQLITE_EXTENSION_INIT2(pApi); |
801 |
- (void)pzErrMsg; /* Unused parameter */ |
802 |
-- return sqlite3_create_collation(db, "uint", SQLITE_UTF8, 0, uintCollFunc); |
803 |
-+ return sqlite3UintInit(db); |
804 |
- } |
805 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
806 |
---- /ext/misc/uuid.c |
807 |
-+++ /ext/misc/uuid.c |
808 |
-@@ -206,21 +206,12 @@ |
809 |
- sqlite3_result_blob(context, pBlob, 16, SQLITE_TRANSIENT); |
810 |
- } |
811 |
- |
812 |
--#ifdef _WIN32 |
813 |
--__declspec(dllexport) |
814 |
--#endif |
815 |
--int sqlite3_uuid_init( |
816 |
-- sqlite3 *db, |
817 |
-- char **pzErrMsg, |
818 |
-- const sqlite3_api_routines *pApi |
819 |
--){ |
820 |
-+int sqlite3UuidInit(sqlite3 *db){ |
821 |
- int rc = SQLITE_OK; |
822 |
-- SQLITE_EXTENSION_INIT2(pApi); |
823 |
-- (void)pzErrMsg; /* Unused parameter */ |
824 |
- rc = sqlite3_create_function(db, "uuid", 0, SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
825 |
- sqlite3UuidFunc, 0, 0); |
826 |
- if( rc==SQLITE_OK ){ |
827 |
-- rc = sqlite3_create_function(db, "uuid_str", 1, |
828 |
-+ rc = sqlite3_create_function(db, "uuid_str", 1, |
829 |
- SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC, |
830 |
- 0, sqlite3UuidStrFunc, 0, 0); |
831 |
- } |
832 |
-@@ -231,3 +222,18 @@ |
833 |
- } |
834 |
- return rc; |
835 |
- } |
836 |
-+ |
837 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
838 |
-+#ifdef _WIN32 |
839 |
-+__declspec(dllexport) |
840 |
-+#endif |
841 |
-+int sqlite3_uuid_init( |
842 |
-+ sqlite3 *db, |
843 |
-+ char **pzErrMsg, |
844 |
-+ const sqlite3_api_routines *pApi |
845 |
-+){ |
846 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
847 |
-+ (void)pzErrMsg; /* Unused parameter */ |
848 |
-+ return sqlite3UuidInit(db); |
849 |
-+} |
850 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
851 |
---- /ext/misc/zipfile.c |
852 |
-+++ /ext/misc/zipfile.c |
853 |
-@@ -24,6 +24,8 @@ |
854 |
- ** * No support for zip64 extensions |
855 |
- ** * Only the "inflate/deflate" (zlib) compression method is supported |
856 |
- */ |
857 |
-+#ifdef SQLITE_HAVE_ZLIB |
858 |
-+ |
859 |
- #include "sqlite3ext.h" |
860 |
- SQLITE_EXTENSION_INIT1 |
861 |
- #include <stdio.h> |
862 |
-@@ -2137,7 +2139,7 @@ |
863 |
- /* |
864 |
- ** Register the "zipfile" virtual table. |
865 |
- */ |
866 |
--static int zipfileRegister(sqlite3 *db){ |
867 |
-+int sqlite3ZipfileInit(sqlite3 *db){ |
868 |
- static sqlite3_module zipfileModule = { |
869 |
- 1, /* iVersion */ |
870 |
- zipfileConnect, /* xCreate */ |
871 |
-@@ -2171,9 +2173,10 @@ |
872 |
- return rc; |
873 |
- } |
874 |
- #else /* SQLITE_OMIT_VIRTUALTABLE */ |
875 |
--# define zipfileRegister(x) SQLITE_OK |
876 |
-+# define sqlite3ZipfileInit(x) SQLITE_OK |
877 |
- #endif |
878 |
- |
879 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
880 |
- #ifdef _WIN32 |
881 |
- __declspec(dllexport) |
882 |
- #endif |
883 |
-@@ -2184,5 +2187,8 @@ |
884 |
- ){ |
885 |
- SQLITE_EXTENSION_INIT2(pApi); |
886 |
- (void)pzErrMsg; /* Unused parameter */ |
887 |
-- return zipfileRegister(db); |
888 |
-+ return sqlite3ZipfileInit(db); |
889 |
- } |
890 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
891 |
-+ |
892 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
893 |
|
894 |
diff --git a/dev-db/sqlite/files/sqlite-3.33.0-build_2.1.patch b/dev-db/sqlite/files/sqlite-3.33.0-build_2.1.patch |
895 |
deleted file mode 100644 |
896 |
index 29040526150..00000000000 |
897 |
--- a/dev-db/sqlite/files/sqlite-3.33.0-build_2.1.patch |
898 |
+++ /dev/null |
899 |
@@ -1,286 +0,0 @@ |
900 |
-Move some code to libsqlite3.so to avoid duplication. |
901 |
-Link executables against libsqlite3.so. |
902 |
-Increase timeout for fuzzcheck. |
903 |
-Update list of optionally available functions. |
904 |
-Fix building with dlopen() not available. |
905 |
- |
906 |
---- /Makefile.in |
907 |
-+++ /Makefile.in |
908 |
-@@ -313,6 +313,9 @@ |
909 |
- # Source code for extensions |
910 |
- # |
911 |
- SRC += \ |
912 |
-+ $(TOP)/ext/expert/sqlite3expert.c \ |
913 |
-+ $(TOP)/ext/expert/sqlite3expert.h |
914 |
-+SRC += \ |
915 |
- $(TOP)/ext/fts1/fts1.c \ |
916 |
- $(TOP)/ext/fts1/fts1.h \ |
917 |
- $(TOP)/ext/fts1/fts1_hash.c \ |
918 |
-@@ -365,8 +368,28 @@ |
919 |
- $(TOP)/ext/rbu/sqlite3rbu.h \ |
920 |
- $(TOP)/ext/rbu/sqlite3rbu.c |
921 |
- SRC += \ |
922 |
-+ $(TOP)/ext/misc/amatch.c \ |
923 |
-+ $(TOP)/ext/misc/appendvfs.c \ |
924 |
-+ $(TOP)/ext/misc/carray.c \ |
925 |
-+ $(TOP)/ext/misc/completion.c \ |
926 |
-+ $(TOP)/ext/misc/csv.c \ |
927 |
-+ $(TOP)/ext/misc/dbdata.c \ |
928 |
-+ $(TOP)/ext/misc/decimal.c \ |
929 |
-+ $(TOP)/ext/misc/eval.c \ |
930 |
-+ $(TOP)/ext/misc/fileio.c \ |
931 |
-+ $(TOP)/ext/misc/ieee754.c \ |
932 |
- $(TOP)/ext/misc/json1.c \ |
933 |
-- $(TOP)/ext/misc/stmt.c |
934 |
-+ $(TOP)/ext/misc/nextchar.c \ |
935 |
-+ $(TOP)/ext/misc/percentile.c \ |
936 |
-+ $(TOP)/ext/misc/regexp.c \ |
937 |
-+ $(TOP)/ext/misc/sha1.c \ |
938 |
-+ $(TOP)/ext/misc/shathree.c \ |
939 |
-+ $(TOP)/ext/misc/sqlar.c \ |
940 |
-+ $(TOP)/ext/misc/stmt.c \ |
941 |
-+ $(TOP)/ext/misc/totype.c \ |
942 |
-+ $(TOP)/ext/misc/uint.c \ |
943 |
-+ $(TOP)/ext/misc/uuid.c \ |
944 |
-+ $(TOP)/ext/misc/zipfile.c |
945 |
- |
946 |
- # Generated source code files |
947 |
- # |
948 |
-@@ -437,34 +460,21 @@ |
949 |
- # Statically linked extensions |
950 |
- # |
951 |
- TESTSRC += \ |
952 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
953 |
- $(TOP)/ext/expert/test_expert.c \ |
954 |
-- $(TOP)/ext/misc/amatch.c \ |
955 |
-- $(TOP)/ext/misc/carray.c \ |
956 |
- $(TOP)/ext/misc/closure.c \ |
957 |
-- $(TOP)/ext/misc/csv.c \ |
958 |
-- $(TOP)/ext/misc/decimal.c \ |
959 |
-- $(TOP)/ext/misc/eval.c \ |
960 |
- $(TOP)/ext/misc/explain.c \ |
961 |
-- $(TOP)/ext/misc/fileio.c \ |
962 |
- $(TOP)/ext/misc/fuzzer.c \ |
963 |
- $(TOP)/ext/fts5/fts5_tcl.c \ |
964 |
- $(TOP)/ext/fts5/fts5_test_mi.c \ |
965 |
- $(TOP)/ext/fts5/fts5_test_tok.c \ |
966 |
-- $(TOP)/ext/misc/ieee754.c \ |
967 |
- $(TOP)/ext/misc/mmapwarm.c \ |
968 |
-- $(TOP)/ext/misc/nextchar.c \ |
969 |
- $(TOP)/ext/misc/normalize.c \ |
970 |
-- $(TOP)/ext/misc/percentile.c \ |
971 |
- $(TOP)/ext/misc/prefixes.c \ |
972 |
-- $(TOP)/ext/misc/regexp.c \ |
973 |
- $(TOP)/ext/misc/remember.c \ |
974 |
- $(TOP)/ext/misc/series.c \ |
975 |
- $(TOP)/ext/misc/spellfix.c \ |
976 |
-- $(TOP)/ext/misc/totype.c \ |
977 |
- $(TOP)/ext/misc/unionvtab.c \ |
978 |
- $(TOP)/ext/misc/wholenumber.c \ |
979 |
-- $(TOP)/ext/misc/zipfile.c \ |
980 |
- $(TOP)/ext/userauth/userauth.c |
981 |
- |
982 |
- # Source code to the library files needed by the test fixture |
983 |
-@@ -646,25 +656,25 @@ |
984 |
- |
985 |
- libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
986 |
- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
987 |
-- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
988 |
-+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ |
989 |
- -rpath "$(TCLLIBDIR)" \ |
990 |
- -version-info "8:6:8" \ |
991 |
- -avoid-version |
992 |
- |
993 |
--sqlite3$(TEXE): shell.c sqlite3.c |
994 |
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ |
995 |
-- shell.c sqlite3.c \ |
996 |
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
997 |
-+sqlite3$(TEXE): shell.c libsqlite3.la |
998 |
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \ |
999 |
-+ shell.c libsqlite3.la \ |
1000 |
-+ $(LIBREADLINE) |
1001 |
- |
1002 |
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h |
1003 |
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) |
1004 |
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la |
1005 |
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la |
1006 |
- |
1007 |
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h |
1008 |
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) |
1009 |
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la |
1010 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la |
1011 |
- |
1012 |
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo |
1013 |
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la |
1014 |
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ |
1015 |
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) |
1016 |
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la |
1017 |
- |
1018 |
- srcck1$(BEXE): $(TOP)/tool/srcck1.c |
1019 |
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c |
1020 |
-@@ -775,7 +785,7 @@ |
1021 |
- # Rule to build the amalgamation |
1022 |
- # |
1023 |
- sqlite3.lo: sqlite3.c |
1024 |
-- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c |
1025 |
-+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c |
1026 |
- |
1027 |
- # Rules to build the LEMON compiler generator |
1028 |
- # |
1029 |
-@@ -1081,17 +1091,6 @@ |
1030 |
- # Source files that go into making shell.c |
1031 |
- SHELL_SRC = \ |
1032 |
- $(TOP)/src/shell.c.in \ |
1033 |
-- $(TOP)/ext/misc/appendvfs.c \ |
1034 |
-- $(TOP)/ext/misc/completion.c \ |
1035 |
-- $(TOP)/ext/misc/decimal.c \ |
1036 |
-- $(TOP)/ext/misc/fileio.c \ |
1037 |
-- $(TOP)/ext/misc/ieee754.c \ |
1038 |
-- $(TOP)/ext/misc/shathree.c \ |
1039 |
-- $(TOP)/ext/misc/sqlar.c \ |
1040 |
-- $(TOP)/ext/misc/uint.c \ |
1041 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
1042 |
-- $(TOP)/ext/expert/sqlite3expert.h \ |
1043 |
-- $(TOP)/ext/misc/zipfile.c \ |
1044 |
- $(TOP)/ext/misc/memtrace.c \ |
1045 |
- $(TOP)/src/test_windirent.c |
1046 |
- |
1047 |
-@@ -1260,11 +1259,11 @@ |
1048 |
- |
1049 |
- # Fuzz testing |
1050 |
- fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
1051 |
-- ./fuzzcheck$(TEXE) $(FUZZDATA) |
1052 |
-+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) |
1053 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
1054 |
- |
1055 |
- valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
1056 |
-- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) |
1057 |
-+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) |
1058 |
- valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
1059 |
- |
1060 |
- # The veryquick.test TCL tests. |
1061 |
-@@ -1298,24 +1297,23 @@ |
1062 |
- shelltest: $(TESTPROGS) |
1063 |
- ./testfixture$(TEXT) $(TOP)/test/permutations.test shell |
1064 |
- |
1065 |
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
1066 |
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
1067 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c |
1068 |
- |
1069 |
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c |
1070 |
-- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) |
1071 |
-+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la |
1072 |
-+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) |
1073 |
- |
1074 |
--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 |
1075 |
-+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
1076 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c |
1077 |
- |
1078 |
--sqltclsh$(TEXE): sqltclsh.c |
1079 |
-- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) |
1080 |
-+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la |
1081 |
-+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) |
1082 |
- |
1083 |
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c |
1084 |
-- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) |
1085 |
-+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la |
1086 |
-+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la |
1087 |
- |
1088 |
- CHECKER_DEPS =\ |
1089 |
- $(TOP)/tool/mkccode.tcl \ |
1090 |
-- sqlite3.c \ |
1091 |
- $(TOP)/src/tclsqlite.c \ |
1092 |
- $(TOP)/ext/repair/sqlite3_checker.tcl \ |
1093 |
- $(TOP)/ext/repair/checkindex.c \ |
1094 |
-@@ -1326,36 +1324,36 @@ |
1095 |
- sqlite3_checker.c: $(CHECKER_DEPS) |
1096 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ |
1097 |
- |
1098 |
--sqlite3_checker$(TEXE): sqlite3_checker.c |
1099 |
-- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) |
1100 |
-+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la |
1101 |
-+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) |
1102 |
- |
1103 |
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo |
1104 |
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la |
1105 |
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ |
1106 |
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) |
1107 |
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la |
1108 |
- |
1109 |
--dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
1110 |
-- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c |
1111 |
-+dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
1112 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c |
1113 |
- |
1114 |
--showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo |
1115 |
-- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) |
1116 |
-+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la |
1117 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la |
1118 |
- |
1119 |
--showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo |
1120 |
-- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) |
1121 |
-+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la |
1122 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la |
1123 |
- |
1124 |
--showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo |
1125 |
-- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) |
1126 |
-+showjournal$(TEXE): $(TOP)/tool/showjournal.c |
1127 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c |
1128 |
- |
1129 |
--showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo |
1130 |
-- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) |
1131 |
-+showwal$(TEXE): $(TOP)/tool/showwal.c |
1132 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c |
1133 |
- |
1134 |
- showshm$(TEXE): $(TOP)/tool/showshm.c |
1135 |
- $(LTLINK) -o $@ $(TOP)/tool/showshm.c |
1136 |
- |
1137 |
--index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo |
1138 |
-- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS) |
1139 |
-+index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la |
1140 |
-+ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la |
1141 |
- |
1142 |
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo |
1143 |
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) |
1144 |
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la |
1145 |
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la |
1146 |
- |
1147 |
- changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo |
1148 |
- $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS) |
1149 |
-@@ -1380,11 +1378,11 @@ |
1150 |
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c |
1151 |
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) |
1152 |
- |
1153 |
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo |
1154 |
-- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) |
1155 |
-+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la |
1156 |
-+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la |
1157 |
- |
1158 |
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
1159 |
-- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) |
1160 |
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
1161 |
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ |
1162 |
- |
1163 |
- # This target will fail if the SQLite amalgamation contains any exported |
1164 |
- # symbols that do not begin with "sqlite3_". It is run as part of the |
1165 |
---- /configure.ac |
1166 |
-+++ /configure.ac |
1167 |
-@@ -108,7 +108,7 @@ |
1168 |
- ######### |
1169 |
- # Figure out whether or not we have these functions |
1170 |
- # |
1171 |
--AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64]) |
1172 |
-+AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime]) |
1173 |
- |
1174 |
- ######### |
1175 |
- # By default, we use the amalgamation (this may be changed below...) |
1176 |
-@@ -587,6 +587,9 @@ |
1177 |
- if test "${enable_load_extension}" = "yes" ; then |
1178 |
- OPT_FEATURE_FLAGS="" |
1179 |
- AC_SEARCH_LIBS(dlopen, dl) |
1180 |
-+ if test "${ac_cv_search_dlopen}" = "no" ; then |
1181 |
-+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
1182 |
-+ fi |
1183 |
- else |
1184 |
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
1185 |
- fi |
1186 |
|
1187 |
diff --git a/dev-db/sqlite/files/sqlite-3.33.0-build_2.2.patch b/dev-db/sqlite/files/sqlite-3.33.0-build_2.2.patch |
1188 |
deleted file mode 100644 |
1189 |
index 3aa75bcab85..00000000000 |
1190 |
--- a/dev-db/sqlite/files/sqlite-3.33.0-build_2.2.patch |
1191 |
+++ /dev/null |
1192 |
@@ -1,434 +0,0 @@ |
1193 |
-Move some code to libsqlite3.so to avoid duplication. |
1194 |
-Initialize some extensions in libsqlite3.so. |
1195 |
-Update test suite. |
1196 |
- |
1197 |
---- /ext/repair/sqlite3_checker.c.in |
1198 |
-+++ /ext/repair/sqlite3_checker.c.in |
1199 |
-@@ -2,6 +2,7 @@ |
1200 |
- ** Read an SQLite database file and analyze its space utilization. Generate |
1201 |
- ** text on standard output. |
1202 |
- */ |
1203 |
-+#define SQLITE_CORE 1 |
1204 |
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc |
1205 |
- #define SQLITE_ENABLE_DBPAGE_VTAB 1 |
1206 |
- #define SQLITE_ENABLE_JSON1 1 |
1207 |
-@@ -14,7 +15,7 @@ |
1208 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
1209 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1210 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1211 |
--INCLUDE sqlite3.c |
1212 |
-+#include "sqlite3.h" |
1213 |
- INCLUDE $ROOT/src/tclsqlite.c |
1214 |
- INCLUDE $ROOT/ext/misc/btreeinfo.c |
1215 |
- INCLUDE $ROOT/ext/repair/checkindex.c |
1216 |
---- /src/main.c |
1217 |
-+++ /src/main.c |
1218 |
-@@ -50,12 +50,35 @@ |
1219 |
- #ifdef SQLITE_ENABLE_FTS5 |
1220 |
- int sqlite3Fts5Init(sqlite3*); |
1221 |
- #endif |
1222 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
1223 |
-+int sqlite3DbdataRegister(sqlite3*); |
1224 |
-+#endif |
1225 |
- #ifdef SQLITE_ENABLE_JSON1 |
1226 |
- int sqlite3Json1Init(sqlite3*); |
1227 |
- #endif |
1228 |
- #ifdef SQLITE_ENABLE_STMTVTAB |
1229 |
- int sqlite3StmtVtabInit(sqlite3*); |
1230 |
- #endif |
1231 |
-+int sqlite3AmatchInit(sqlite3*); |
1232 |
-+int sqlite3CarrayInit(sqlite3*); |
1233 |
-+int sqlite3CompletionVtabInit(sqlite3*); |
1234 |
-+int sqlite3CsvInit(sqlite3*); |
1235 |
-+int sqlite3DecimalInit(sqlite3*); |
1236 |
-+int sqlite3EvalInit(sqlite3*); |
1237 |
-+int sqlite3FileioInit(sqlite3*); |
1238 |
-+int sqlite3IeeeInit(sqlite3*); |
1239 |
-+int sqlite3NextcharInit(sqlite3*); |
1240 |
-+int sqlite3PercentileInit(sqlite3*); |
1241 |
-+int sqlite3RegexpInit(sqlite3*); |
1242 |
-+int sqlite3ShaInit(sqlite3*); |
1243 |
-+int sqlite3ShathreeInit(sqlite3*); |
1244 |
-+int sqlite3TotypeInit(sqlite3*); |
1245 |
-+int sqlite3UintInit(sqlite3*); |
1246 |
-+int sqlite3UuidInit(sqlite3*); |
1247 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) |
1248 |
-+int sqlite3ZipfileInit(sqlite3*); |
1249 |
-+int sqlite3SqlarInit(sqlite3*); |
1250 |
-+#endif |
1251 |
- |
1252 |
- /* |
1253 |
- ** An array of pointers to extension initializer functions for |
1254 |
-@@ -83,6 +106,9 @@ |
1255 |
- #ifdef SQLITE_ENABLE_DBPAGE_VTAB |
1256 |
- sqlite3DbpageRegister, |
1257 |
- #endif |
1258 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
1259 |
-+ sqlite3DbdataRegister, |
1260 |
-+#endif |
1261 |
- #ifdef SQLITE_ENABLE_DBSTAT_VTAB |
1262 |
- sqlite3DbstatRegister, |
1263 |
- #endif |
1264 |
-@@ -96,6 +122,26 @@ |
1265 |
- #ifdef SQLITE_ENABLE_BYTECODE_VTAB |
1266 |
- sqlite3VdbeBytecodeVtabInit, |
1267 |
- #endif |
1268 |
-+ sqlite3AmatchInit, |
1269 |
-+ sqlite3CarrayInit, |
1270 |
-+ sqlite3CompletionVtabInit, |
1271 |
-+ sqlite3CsvInit, |
1272 |
-+ sqlite3DecimalInit, |
1273 |
-+ sqlite3EvalInit, |
1274 |
-+ sqlite3FileioInit, |
1275 |
-+ sqlite3IeeeInit, |
1276 |
-+ sqlite3NextcharInit, |
1277 |
-+ sqlite3PercentileInit, |
1278 |
-+ sqlite3RegexpInit, |
1279 |
-+ sqlite3ShaInit, |
1280 |
-+ sqlite3ShathreeInit, |
1281 |
-+ sqlite3TotypeInit, |
1282 |
-+ sqlite3UintInit, |
1283 |
-+ sqlite3UuidInit, |
1284 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) |
1285 |
-+ sqlite3ZipfileInit, |
1286 |
-+ sqlite3SqlarInit, |
1287 |
-+#endif |
1288 |
- }; |
1289 |
- |
1290 |
- #ifndef SQLITE_AMALGAMATION |
1291 |
---- /src/shell.c.in |
1292 |
-+++ /src/shell.c.in |
1293 |
-@@ -69,6 +69,7 @@ |
1294 |
- #include <stdio.h> |
1295 |
- #include <assert.h> |
1296 |
- #include "sqlite3.h" |
1297 |
-+#include "ext/expert/sqlite3expert.h" |
1298 |
- typedef sqlite3_int64 i64; |
1299 |
- typedef sqlite3_uint64 u64; |
1300 |
- typedef unsigned char u8; |
1301 |
-@@ -135,6 +136,10 @@ |
1302 |
- # define SHELL_USE_LOCAL_GETLINE 1 |
1303 |
- #endif |
1304 |
- |
1305 |
-+#ifdef SQLITE_HAVE_ZLIB |
1306 |
-+#include <zlib.h> |
1307 |
-+#endif |
1308 |
-+ |
1309 |
- |
1310 |
- #if defined(_WIN32) || defined(WIN32) |
1311 |
- # if SQLITE_OS_WINRT |
1312 |
-@@ -1020,24 +1025,7 @@ |
1313 |
- INCLUDE test_windirent.c |
1314 |
- #define dirent DIRENT |
1315 |
- #endif |
1316 |
--INCLUDE ../ext/misc/shathree.c |
1317 |
--INCLUDE ../ext/misc/fileio.c |
1318 |
--INCLUDE ../ext/misc/completion.c |
1319 |
--INCLUDE ../ext/misc/appendvfs.c |
1320 |
- INCLUDE ../ext/misc/memtrace.c |
1321 |
--INCLUDE ../ext/misc/uint.c |
1322 |
--INCLUDE ../ext/misc/decimal.c |
1323 |
--INCLUDE ../ext/misc/ieee754.c |
1324 |
--#ifdef SQLITE_HAVE_ZLIB |
1325 |
--INCLUDE ../ext/misc/zipfile.c |
1326 |
--INCLUDE ../ext/misc/sqlar.c |
1327 |
--#endif |
1328 |
--INCLUDE ../ext/expert/sqlite3expert.h |
1329 |
--INCLUDE ../ext/expert/sqlite3expert.c |
1330 |
-- |
1331 |
--#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
1332 |
--INCLUDE ../ext/misc/dbdata.c |
1333 |
--#endif |
1334 |
- |
1335 |
- #if defined(SQLITE_ENABLE_SESSION) |
1336 |
- /* |
1337 |
-@@ -4584,19 +4572,6 @@ |
1338 |
- #ifndef SQLITE_OMIT_LOAD_EXTENSION |
1339 |
- sqlite3_enable_load_extension(p->db, 1); |
1340 |
- #endif |
1341 |
-- sqlite3_fileio_init(p->db, 0, 0); |
1342 |
-- sqlite3_shathree_init(p->db, 0, 0); |
1343 |
-- sqlite3_completion_init(p->db, 0, 0); |
1344 |
-- sqlite3_uint_init(p->db, 0, 0); |
1345 |
-- sqlite3_decimal_init(p->db, 0, 0); |
1346 |
-- sqlite3_ieee_init(p->db, 0, 0); |
1347 |
--#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
1348 |
-- sqlite3_dbdata_init(p->db, 0, 0); |
1349 |
--#endif |
1350 |
--#ifdef SQLITE_HAVE_ZLIB |
1351 |
-- sqlite3_zipfile_init(p->db, 0, 0); |
1352 |
-- sqlite3_sqlar_init(p->db, 0, 0); |
1353 |
--#endif |
1354 |
- sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, |
1355 |
- shellAddSchemaName, 0, 0); |
1356 |
- sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0, |
1357 |
-@@ -6617,8 +6592,6 @@ |
1358 |
- ); |
1359 |
- goto end_ar_command; |
1360 |
- } |
1361 |
-- sqlite3_fileio_init(cmd.db, 0, 0); |
1362 |
-- sqlite3_sqlar_init(cmd.db, 0, 0); |
1363 |
- sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, |
1364 |
- shellPutsFunc, 0, 0); |
1365 |
- |
1366 |
-@@ -10981,6 +10954,7 @@ |
1367 |
- #endif |
1368 |
- } |
1369 |
- data.out = stdout; |
1370 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); |
1371 |
- sqlite3_appendvfs_init(0,0,0); |
1372 |
- |
1373 |
- /* Go ahead and open the database file if it already exists. If the |
1374 |
---- /src/test_config.c |
1375 |
-+++ /src/test_config.c |
1376 |
-@@ -353,6 +353,8 @@ |
1377 |
- Tcl_SetVar2(interp, "sqlite_options", "datetime", "1", TCL_GLOBAL_ONLY); |
1378 |
- #endif |
1379 |
- |
1380 |
-+ Tcl_SetVar2(interp, "sqlite_options", "decimal", "1", TCL_GLOBAL_ONLY); |
1381 |
-+ |
1382 |
- #ifdef SQLITE_OMIT_DECLTYPE |
1383 |
- Tcl_SetVar2(interp, "sqlite_options", "decltype", "0", TCL_GLOBAL_ONLY); |
1384 |
- #else |
1385 |
-@@ -540,6 +542,8 @@ |
1386 |
- Tcl_SetVar2(interp, "sqlite_options", "progress", "1", TCL_GLOBAL_ONLY); |
1387 |
- #endif |
1388 |
- |
1389 |
-+ Tcl_SetVar2(interp, "sqlite_options", "regexp", "1", TCL_GLOBAL_ONLY); |
1390 |
-+ |
1391 |
- #ifdef SQLITE_OMIT_REINDEX |
1392 |
- Tcl_SetVar2(interp, "sqlite_options", "reindex", "0", TCL_GLOBAL_ONLY); |
1393 |
- #else |
1394 |
-@@ -662,6 +666,8 @@ |
1395 |
- Tcl_SetVar2(interp, "sqlite_options", "truncate_opt", "1", TCL_GLOBAL_ONLY); |
1396 |
- #endif |
1397 |
- |
1398 |
-+ Tcl_SetVar2(interp, "sqlite_options", "uint", "1", TCL_GLOBAL_ONLY); |
1399 |
-+ |
1400 |
- #ifdef SQLITE_OMIT_UTF16 |
1401 |
- Tcl_SetVar2(interp, "sqlite_options", "utf16", "0", TCL_GLOBAL_ONLY); |
1402 |
- #else |
1403 |
---- /test/e_expr.test |
1404 |
-+++ /test/e_expr.test |
1405 |
-@@ -1078,7 +1078,7 @@ |
1406 |
- # |
1407 |
- # There is a regexp function if ICU is enabled though. |
1408 |
- # |
1409 |
--ifcapable !icu { |
1410 |
-+ifcapable !icu&&!regexp { |
1411 |
- do_catchsql_test e_expr-18.1.1 { |
1412 |
- SELECT regexp('abc', 'def') |
1413 |
- } {1 {no such function: regexp}} |
1414 |
---- /test/icu.test |
1415 |
-+++ /test/icu.test |
1416 |
-@@ -41,7 +41,7 @@ |
1417 |
- # |
1418 |
- test_expr icu-1.1 {i1='hello'} {i1 REGEXP 'hello'} 1 |
1419 |
- test_expr icu-1.2 {i1='hello'} {i1 REGEXP '.ello'} 1 |
1420 |
-- test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell'} 0 |
1421 |
-+ test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell$'} 0 |
1422 |
- test_expr icu-1.4 {i1='hello'} {i1 REGEXP '.ell.*'} 1 |
1423 |
- test_expr icu-1.5 {i1=NULL} {i1 REGEXP '.ell.*'} {} |
1424 |
- |
1425 |
---- /test/pragma.test |
1426 |
-+++ /test/pragma.test |
1427 |
-@@ -1370,17 +1370,62 @@ |
1428 |
- } ;# ifcapable trigger |
1429 |
- |
1430 |
- ifcapable schema_pragmas { |
1431 |
-- do_test pragma-11.1 { |
1432 |
-- execsql2 { |
1433 |
-- pragma collation_list; |
1434 |
-+ ifcapable decimal { |
1435 |
-+ ifcapable uint { |
1436 |
-+ do_test pragma-11.1 { |
1437 |
-+ execsql2 { |
1438 |
-+ pragma collation_list; |
1439 |
-+ } |
1440 |
-+ } {seq 0 name UINT seq 1 name decimal seq 2 name RTRIM seq 3 name NOCASE seq 4 name BINARY} |
1441 |
-+ do_test pragma-11.2 { |
1442 |
-+ db collate New_Collation blah... |
1443 |
-+ execsql { |
1444 |
-+ pragma collation_list; |
1445 |
-+ } |
1446 |
-+ } {0 New_Collation 1 UINT 2 decimal 3 RTRIM 4 NOCASE 5 BINARY} |
1447 |
- } |
1448 |
-- } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY} |
1449 |
-- do_test pragma-11.2 { |
1450 |
-- db collate New_Collation blah... |
1451 |
-- execsql { |
1452 |
-- pragma collation_list; |
1453 |
-+ ifcapable !uint { |
1454 |
-+ do_test pragma-11.1 { |
1455 |
-+ execsql2 { |
1456 |
-+ pragma collation_list; |
1457 |
-+ } |
1458 |
-+ } {seq 0 name decimal seq 1 name RTRIM seq 2 name NOCASE seq 3 name BINARY} |
1459 |
-+ do_test pragma-11.2 { |
1460 |
-+ db collate New_Collation blah... |
1461 |
-+ execsql { |
1462 |
-+ pragma collation_list; |
1463 |
-+ } |
1464 |
-+ } {0 New_Collation 1 decimal 2 RTRIM 3 NOCASE 4 BINARY} |
1465 |
- } |
1466 |
-- } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY} |
1467 |
-+ } |
1468 |
-+ ifcapable !decimal { |
1469 |
-+ ifcapable uint { |
1470 |
-+ do_test pragma-11.1 { |
1471 |
-+ execsql2 { |
1472 |
-+ pragma collation_list; |
1473 |
-+ } |
1474 |
-+ } {seq 0 name UINT seq 1 name RTRIM seq 2 name NOCASE seq 3 name BINARY} |
1475 |
-+ do_test pragma-11.2 { |
1476 |
-+ db collate New_Collation blah... |
1477 |
-+ execsql { |
1478 |
-+ pragma collation_list; |
1479 |
-+ } |
1480 |
-+ } {0 New_Collation 1 UINT 2 RTRIM 3 NOCASE 4 BINARY} |
1481 |
-+ } |
1482 |
-+ ifcapable !uint { |
1483 |
-+ do_test pragma-11.1 { |
1484 |
-+ execsql2 { |
1485 |
-+ pragma collation_list; |
1486 |
-+ } |
1487 |
-+ } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY} |
1488 |
-+ do_test pragma-11.2 { |
1489 |
-+ db collate New_Collation blah... |
1490 |
-+ execsql { |
1491 |
-+ pragma collation_list; |
1492 |
-+ } |
1493 |
-+ } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY} |
1494 |
-+ } |
1495 |
-+ } |
1496 |
- } |
1497 |
- |
1498 |
- ifcapable schema_pragmas&&tempdb { |
1499 |
---- /test/sessionfuzz.c |
1500 |
-+++ /test/sessionfuzz.c |
1501 |
-@@ -698,49 +698,6 @@ |
1502 |
- #include <stdio.h> |
1503 |
- #include <string.h> |
1504 |
- #include <assert.h> |
1505 |
--#ifndef OMIT_ZLIB |
1506 |
--#include "zlib.h" |
1507 |
--#endif |
1508 |
-- |
1509 |
--/* |
1510 |
--** Implementation of the "sqlar_uncompress(X,SZ)" SQL function |
1511 |
--** |
1512 |
--** Parameter SZ is interpreted as an integer. If it is less than or |
1513 |
--** equal to zero, then this function returns a copy of X. Or, if |
1514 |
--** SZ is equal to the size of X when interpreted as a blob, also |
1515 |
--** return a copy of X. Otherwise, decompress blob X using zlib |
1516 |
--** utility function uncompress() and return the results (another |
1517 |
--** blob). |
1518 |
--*/ |
1519 |
--static void sqlarUncompressFunc( |
1520 |
-- sqlite3_context *context, |
1521 |
-- int argc, |
1522 |
-- sqlite3_value **argv |
1523 |
--){ |
1524 |
--#ifdef OMIT_ZLIB |
1525 |
-- sqlite3_result_value(context, argv[0]); |
1526 |
--#else |
1527 |
-- uLong nData; |
1528 |
-- uLongf sz; |
1529 |
-- |
1530 |
-- assert( argc==2 ); |
1531 |
-- sz = sqlite3_value_int(argv[1]); |
1532 |
-- |
1533 |
-- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){ |
1534 |
-- sqlite3_result_value(context, argv[0]); |
1535 |
-- }else{ |
1536 |
-- const Bytef *pData= sqlite3_value_blob(argv[0]); |
1537 |
-- Bytef *pOut = sqlite3_malloc(sz); |
1538 |
-- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){ |
1539 |
-- sqlite3_result_error(context, "error in uncompress()", -1); |
1540 |
-- }else{ |
1541 |
-- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT); |
1542 |
-- } |
1543 |
-- sqlite3_free(pOut); |
1544 |
-- } |
1545 |
--#endif |
1546 |
--} |
1547 |
-- |
1548 |
- |
1549 |
- /* Run a chunk of SQL. If any errors happen, print an error message |
1550 |
- ** and exit. |
1551 |
---- /tool/mksqlite3c.tcl |
1552 |
-+++ /tool/mksqlite3c.tcl |
1553 |
-@@ -117,6 +117,7 @@ |
1554 |
- rtree.h |
1555 |
- sqlite3session.h |
1556 |
- sqlite3.h |
1557 |
-+ sqlite3expert.h |
1558 |
- sqlite3ext.h |
1559 |
- sqlite3rbu.h |
1560 |
- sqliteicu.h |
1561 |
-@@ -404,6 +405,27 @@ |
1562 |
- sqlite3session.c |
1563 |
- fts5.c |
1564 |
- stmt.c |
1565 |
-+ amatch.c |
1566 |
-+ appendvfs.c |
1567 |
-+ carray.c |
1568 |
-+ completion.c |
1569 |
-+ csv.c |
1570 |
-+ dbdata.c |
1571 |
-+ decimal.c |
1572 |
-+ eval.c |
1573 |
-+ fileio.c |
1574 |
-+ ieee754.c |
1575 |
-+ nextchar.c |
1576 |
-+ percentile.c |
1577 |
-+ regexp.c |
1578 |
-+ sha1.c |
1579 |
-+ shathree.c |
1580 |
-+ sqlar.c |
1581 |
-+ sqlite3expert.c |
1582 |
-+ totype.c |
1583 |
-+ uint.c |
1584 |
-+ uuid.c |
1585 |
-+ zipfile.c |
1586 |
- } { |
1587 |
- copy_file tsrc/$file |
1588 |
- } |
1589 |
---- /tool/sqlite3_analyzer.c.in |
1590 |
-+++ /tool/sqlite3_analyzer.c.in |
1591 |
-@@ -14,9 +14,6 @@ |
1592 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1593 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1594 |
- #define SQLITE_OMIT_LOAD_EXTENSION 1 |
1595 |
--#ifndef USE_EXTERNAL_SQLITE |
1596 |
--INCLUDE sqlite3.c |
1597 |
--#endif |
1598 |
- INCLUDE $ROOT/src/tclsqlite.c |
1599 |
- |
1600 |
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ |
1601 |
---- /tool/sqltclsh.c.in |
1602 |
-+++ /tool/sqltclsh.c.in |
1603 |
-@@ -27,21 +27,13 @@ |
1604 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
1605 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
1606 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
1607 |
--INCLUDE sqlite3.c |
1608 |
--INCLUDE $ROOT/ext/misc/appendvfs.c |
1609 |
--#ifdef SQLITE_HAVE_ZLIB |
1610 |
--INCLUDE $ROOT/ext/misc/zipfile.c |
1611 |
--INCLUDE $ROOT/ext/misc/sqlar.c |
1612 |
--#endif |
1613 |
-+#include "sqlite3.h" |
1614 |
- INCLUDE $ROOT/src/tclsqlite.c |
1615 |
- |
1616 |
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ |
1617 |
- (void)interp; |
1618 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); |
1619 |
- sqlite3_appendvfs_init(0,0,0); |
1620 |
--#ifdef SQLITE_HAVE_ZLIB |
1621 |
-- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); |
1622 |
-- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); |
1623 |
--#endif |
1624 |
- |
1625 |
- return |
1626 |
- BEGIN_STRING |
1627 |
|
1628 |
diff --git a/dev-db/sqlite/files/sqlite-3.34.0-build_1.1.patch b/dev-db/sqlite/files/sqlite-3.34.0-build_1.1.patch |
1629 |
deleted file mode 100644 |
1630 |
index 762f1359b9f..00000000000 |
1631 |
--- a/dev-db/sqlite/files/sqlite-3.34.0-build_1.1.patch |
1632 |
+++ /dev/null |
1633 |
@@ -1,375 +0,0 @@ |
1634 |
-Add initialization functions for internal usage in libsqlite3.so. |
1635 |
- |
1636 |
-SQLite revision: a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b |
1637 |
- |
1638 |
---- /ext/misc/amatch.c |
1639 |
-+++ /ext/misc/amatch.c |
1640 |
-@@ -1480,9 +1480,18 @@ |
1641 |
- |
1642 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
1643 |
- |
1644 |
-+int sqlite3AmatchInit(sqlite3 *db){ |
1645 |
-+ int rc = SQLITE_OK; |
1646 |
-+#ifndef SQLITE_OMIT_VIRTUALTABLE |
1647 |
-+ rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); |
1648 |
-+#endif /* SQLITE_OMIT_VIRTUALTABLE */ |
1649 |
-+ return rc; |
1650 |
-+} |
1651 |
-+ |
1652 |
- /* |
1653 |
- ** Register the amatch virtual table |
1654 |
- */ |
1655 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1656 |
- #ifdef _WIN32 |
1657 |
- __declspec(dllexport) |
1658 |
- #endif |
1659 |
-@@ -1491,11 +1500,8 @@ |
1660 |
- char **pzErrMsg, |
1661 |
- const sqlite3_api_routines *pApi |
1662 |
- ){ |
1663 |
-- int rc = SQLITE_OK; |
1664 |
- SQLITE_EXTENSION_INIT2(pApi); |
1665 |
- (void)pzErrMsg; /* Not used */ |
1666 |
--#ifndef SQLITE_OMIT_VIRTUALTABLE |
1667 |
-- rc = sqlite3_create_module(db, "approximate_match", &amatchModule, 0); |
1668 |
--#endif /* SQLITE_OMIT_VIRTUALTABLE */ |
1669 |
-- return rc; |
1670 |
-+ return sqlite3AmatchInit(db); |
1671 |
- } |
1672 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1673 |
---- /ext/misc/carray.c |
1674 |
-+++ /ext/misc/carray.c |
1675 |
-@@ -498,16 +498,8 @@ |
1676 |
- |
1677 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
1678 |
- |
1679 |
--#ifdef _WIN32 |
1680 |
--__declspec(dllexport) |
1681 |
--#endif |
1682 |
--int sqlite3_carray_init( |
1683 |
-- sqlite3 *db, |
1684 |
-- char **pzErrMsg, |
1685 |
-- const sqlite3_api_routines *pApi |
1686 |
--){ |
1687 |
-+int sqlite3CarrayInit(sqlite3 *db){ |
1688 |
- int rc = SQLITE_OK; |
1689 |
-- SQLITE_EXTENSION_INIT2(pApi); |
1690 |
- #ifndef SQLITE_OMIT_VIRTUALTABLE |
1691 |
- rc = sqlite3_create_module(db, "carray", &carrayModule, 0); |
1692 |
- #ifdef SQLITE_TEST |
1693 |
-@@ -519,3 +511,18 @@ |
1694 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
1695 |
- return rc; |
1696 |
- } |
1697 |
-+ |
1698 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1699 |
-+#ifdef _WIN32 |
1700 |
-+__declspec(dllexport) |
1701 |
-+#endif |
1702 |
-+int sqlite3_carray_init( |
1703 |
-+ sqlite3 *db, |
1704 |
-+ char **pzErrMsg, |
1705 |
-+ const sqlite3_api_routines *pApi |
1706 |
-+){ |
1707 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
1708 |
-+ (void)pzErrMsg; /* Unused parameter */ |
1709 |
-+ return sqlite3CarrayInit(db); |
1710 |
-+} |
1711 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1712 |
---- /ext/misc/completion.c |
1713 |
-+++ /ext/misc/completion.c |
1714 |
-@@ -483,12 +483,13 @@ |
1715 |
- return rc; |
1716 |
- } |
1717 |
- |
1718 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1719 |
- #ifdef _WIN32 |
1720 |
- __declspec(dllexport) |
1721 |
- #endif |
1722 |
- int sqlite3_completion_init( |
1723 |
-- sqlite3 *db, |
1724 |
-- char **pzErrMsg, |
1725 |
-+ sqlite3 *db, |
1726 |
-+ char **pzErrMsg, |
1727 |
- const sqlite3_api_routines *pApi |
1728 |
- ){ |
1729 |
- int rc = SQLITE_OK; |
1730 |
-@@ -499,3 +500,4 @@ |
1731 |
- #endif |
1732 |
- return rc; |
1733 |
- } |
1734 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1735 |
---- /ext/misc/csv.c |
1736 |
-+++ /ext/misc/csv.c |
1737 |
-@@ -928,6 +928,22 @@ |
1738 |
- #endif /* !defined(SQLITE_OMIT_VIRTUALTABLE) */ |
1739 |
- |
1740 |
- |
1741 |
-+int sqlite3CsvInit(sqlite3 *db){ |
1742 |
-+#ifndef SQLITE_OMIT_VIRTUALTABLE |
1743 |
-+ int rc; |
1744 |
-+ rc = sqlite3_create_module(db, "csv", &CsvModule, 0); |
1745 |
-+#ifdef SQLITE_TEST |
1746 |
-+ if( rc==SQLITE_OK ){ |
1747 |
-+ rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0); |
1748 |
-+ } |
1749 |
-+#endif |
1750 |
-+ return rc; |
1751 |
-+#else |
1752 |
-+ return SQLITE_OK; |
1753 |
-+#endif |
1754 |
-+} |
1755 |
-+ |
1756 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1757 |
- #ifdef _WIN32 |
1758 |
- __declspec(dllexport) |
1759 |
- #endif |
1760 |
-@@ -941,17 +957,8 @@ |
1761 |
- char **pzErrMsg, |
1762 |
- const sqlite3_api_routines *pApi |
1763 |
- ){ |
1764 |
--#ifndef SQLITE_OMIT_VIRTUALTABLE |
1765 |
-- int rc; |
1766 |
- SQLITE_EXTENSION_INIT2(pApi); |
1767 |
-- rc = sqlite3_create_module(db, "csv", &CsvModule, 0); |
1768 |
--#ifdef SQLITE_TEST |
1769 |
-- if( rc==SQLITE_OK ){ |
1770 |
-- rc = sqlite3_create_module(db, "csv_wr", &CsvModuleFauxWrite, 0); |
1771 |
-- } |
1772 |
--#endif |
1773 |
-- return rc; |
1774 |
--#else |
1775 |
-- return SQLITE_OK; |
1776 |
--#endif |
1777 |
-+ (void)pzErrMsg; /* Unused parameter */ |
1778 |
-+ return sqlite3CsvInit(db); |
1779 |
- } |
1780 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1781 |
---- /ext/misc/dbdata.c |
1782 |
-+++ /ext/misc/dbdata.c |
1783 |
-@@ -803,7 +803,7 @@ |
1784 |
- /* |
1785 |
- ** Invoke this routine to register the "sqlite_dbdata" virtual table module |
1786 |
- */ |
1787 |
--static int sqlite3DbdataRegister(sqlite3 *db){ |
1788 |
-+int sqlite3DbdataRegister(sqlite3 *db){ |
1789 |
- static sqlite3_module dbdata_module = { |
1790 |
- 0, /* iVersion */ |
1791 |
- 0, /* xCreate */ |
1792 |
-@@ -838,6 +838,7 @@ |
1793 |
- return rc; |
1794 |
- } |
1795 |
- |
1796 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1797 |
- #ifdef _WIN32 |
1798 |
- __declspec(dllexport) |
1799 |
- #endif |
1800 |
-@@ -849,3 +850,4 @@ |
1801 |
- SQLITE_EXTENSION_INIT2(pApi); |
1802 |
- return sqlite3DbdataRegister(db); |
1803 |
- } |
1804 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1805 |
---- /ext/misc/decimal.c |
1806 |
-+++ /ext/misc/decimal.c |
1807 |
-@@ -590,14 +590,7 @@ |
1808 |
- decimal_free(pB); |
1809 |
- } |
1810 |
- |
1811 |
--#ifdef _WIN32 |
1812 |
--__declspec(dllexport) |
1813 |
--#endif |
1814 |
--int sqlite3_decimal_init( |
1815 |
-- sqlite3 *db, |
1816 |
-- char **pzErrMsg, |
1817 |
-- const sqlite3_api_routines *pApi |
1818 |
--){ |
1819 |
-+int sqlite3DecimalInit(sqlite3 *db){ |
1820 |
- int rc = SQLITE_OK; |
1821 |
- static const struct { |
1822 |
- const char *zFuncName; |
1823 |
-@@ -611,10 +604,6 @@ |
1824 |
- { "decimal_mul", 2, decimalMulFunc }, |
1825 |
- }; |
1826 |
- unsigned int i; |
1827 |
-- (void)pzErrMsg; /* Unused parameter */ |
1828 |
-- |
1829 |
-- SQLITE_EXTENSION_INIT2(pApi); |
1830 |
-- |
1831 |
- for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){ |
1832 |
- rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg, |
1833 |
- SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC, |
1834 |
-@@ -632,3 +621,20 @@ |
1835 |
- } |
1836 |
- return rc; |
1837 |
- } |
1838 |
-+ |
1839 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1840 |
-+#ifdef _WIN32 |
1841 |
-+__declspec(dllexport) |
1842 |
-+#endif |
1843 |
-+int sqlite3_decimal_init( |
1844 |
-+ sqlite3 *db, |
1845 |
-+ char **pzErrMsg, |
1846 |
-+ const sqlite3_api_routines *pApi |
1847 |
-+){ |
1848 |
-+ (void)pzErrMsg; /* Unused parameter */ |
1849 |
-+ |
1850 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
1851 |
-+ |
1852 |
-+ return sqlite3DecimalInit(db); |
1853 |
-+} |
1854 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1855 |
---- /ext/misc/eval.c |
1856 |
-+++ /ext/misc/eval.c |
1857 |
-@@ -102,6 +102,20 @@ |
1858 |
- } |
1859 |
- |
1860 |
- |
1861 |
-+int sqlite3EvalInit(sqlite3 *db){ |
1862 |
-+ int rc = SQLITE_OK; |
1863 |
-+ rc = sqlite3_create_function(db, "eval", 1, |
1864 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
1865 |
-+ sqlEvalFunc, 0, 0); |
1866 |
-+ if( rc==SQLITE_OK ){ |
1867 |
-+ rc = sqlite3_create_function(db, "eval", 2, |
1868 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
1869 |
-+ sqlEvalFunc, 0, 0); |
1870 |
-+ } |
1871 |
-+ return rc; |
1872 |
-+} |
1873 |
-+ |
1874 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1875 |
- #ifdef _WIN32 |
1876 |
- __declspec(dllexport) |
1877 |
- #endif |
1878 |
-@@ -110,16 +124,8 @@ |
1879 |
- char **pzErrMsg, |
1880 |
- const sqlite3_api_routines *pApi |
1881 |
- ){ |
1882 |
-- int rc = SQLITE_OK; |
1883 |
- SQLITE_EXTENSION_INIT2(pApi); |
1884 |
- (void)pzErrMsg; /* Unused parameter */ |
1885 |
-- rc = sqlite3_create_function(db, "eval", 1, |
1886 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
1887 |
-- sqlEvalFunc, 0, 0); |
1888 |
-- if( rc==SQLITE_OK ){ |
1889 |
-- rc = sqlite3_create_function(db, "eval", 2, |
1890 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
1891 |
-- sqlEvalFunc, 0, 0); |
1892 |
-- } |
1893 |
-- return rc; |
1894 |
-+ return sqlite3EvalInit(db); |
1895 |
- } |
1896 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1897 |
---- /ext/misc/fileio.c |
1898 |
-+++ /ext/misc/fileio.c |
1899 |
-@@ -340,7 +340,7 @@ |
1900 |
- ** This function does the work for the writefile() UDF. Refer to |
1901 |
- ** header comments at the top of this file for details. |
1902 |
- */ |
1903 |
--static int writeFile( |
1904 |
-+static int writeFileContents( |
1905 |
- sqlite3_context *pCtx, /* Context to return bytes written in */ |
1906 |
- const char *zFile, /* File to write */ |
1907 |
- sqlite3_value *pData, /* Data to write */ |
1908 |
-@@ -480,10 +480,10 @@ |
1909 |
- mtime = sqlite3_value_int64(argv[3]); |
1910 |
- } |
1911 |
- |
1912 |
-- res = writeFile(context, zFile, argv[1], mode, mtime); |
1913 |
-+ res = writeFileContents(context, zFile, argv[1], mode, mtime); |
1914 |
- if( res==1 && errno==ENOENT ){ |
1915 |
- if( makeDirectory(zFile)==SQLITE_OK ){ |
1916 |
-- res = writeFile(context, zFile, argv[1], mode, mtime); |
1917 |
-+ res = writeFileContents(context, zFile, argv[1], mode, mtime); |
1918 |
- } |
1919 |
- } |
1920 |
- |
1921 |
-@@ -970,18 +970,9 @@ |
1922 |
- # define fsdirRegister(x) SQLITE_OK |
1923 |
- #endif |
1924 |
- |
1925 |
--#ifdef _WIN32 |
1926 |
--__declspec(dllexport) |
1927 |
--#endif |
1928 |
--int sqlite3_fileio_init( |
1929 |
-- sqlite3 *db, |
1930 |
-- char **pzErrMsg, |
1931 |
-- const sqlite3_api_routines *pApi |
1932 |
--){ |
1933 |
-+int sqlite3FileioInit(sqlite3 *db){ |
1934 |
- int rc = SQLITE_OK; |
1935 |
-- SQLITE_EXTENSION_INIT2(pApi); |
1936 |
-- (void)pzErrMsg; /* Unused parameter */ |
1937 |
-- rc = sqlite3_create_function(db, "readfile", 1, |
1938 |
-+ rc = sqlite3_create_function(db, "readfile", 1, |
1939 |
- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
1940 |
- readfileFunc, 0, 0); |
1941 |
- if( rc==SQLITE_OK ){ |
1942 |
-@@ -998,3 +989,18 @@ |
1943 |
- } |
1944 |
- return rc; |
1945 |
- } |
1946 |
-+ |
1947 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1948 |
-+#ifdef _WIN32 |
1949 |
-+__declspec(dllexport) |
1950 |
-+#endif |
1951 |
-+int sqlite3_fileio_init( |
1952 |
-+ sqlite3 *db, |
1953 |
-+ char **pzErrMsg, |
1954 |
-+ const sqlite3_api_routines *pApi |
1955 |
-+){ |
1956 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
1957 |
-+ (void)pzErrMsg; /* Unused parameter */ |
1958 |
-+ return sqlite3FileioInit(db); |
1959 |
-+} |
1960 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
1961 |
---- /ext/misc/ieee754.c |
1962 |
-+++ /ext/misc/ieee754.c |
1963 |
-@@ -245,14 +245,7 @@ |
1964 |
- } |
1965 |
- |
1966 |
- |
1967 |
--#ifdef _WIN32 |
1968 |
--__declspec(dllexport) |
1969 |
--#endif |
1970 |
--int sqlite3_ieee_init( |
1971 |
-- sqlite3 *db, |
1972 |
-- char **pzErrMsg, |
1973 |
-- const sqlite3_api_routines *pApi |
1974 |
--){ |
1975 |
-+int sqlite3IeeeInit(sqlite3 *db){ |
1976 |
- static const struct { |
1977 |
- char *zFName; |
1978 |
- int nArg; |
1979 |
-@@ -269,13 +262,26 @@ |
1980 |
- }; |
1981 |
- unsigned int i; |
1982 |
- int rc = SQLITE_OK; |
1983 |
-- SQLITE_EXTENSION_INIT2(pApi); |
1984 |
-- (void)pzErrMsg; /* Unused parameter */ |
1985 |
- for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){ |
1986 |
-- rc = sqlite3_create_function(db, aFunc[i].zFName, aFunc[i].nArg, |
1987 |
-+ rc = sqlite3_create_function(db, aFunc[i].zFName, aFunc[i].nArg, |
1988 |
- SQLITE_UTF8|SQLITE_INNOCUOUS, |
1989 |
- (void*)&aFunc[i].iAux, |
1990 |
- aFunc[i].xFunc, 0, 0); |
1991 |
- } |
1992 |
- return rc; |
1993 |
- } |
1994 |
-+ |
1995 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
1996 |
-+#ifdef _WIN32 |
1997 |
-+__declspec(dllexport) |
1998 |
-+#endif |
1999 |
-+int sqlite3_ieee_init( |
2000 |
-+ sqlite3 *db, |
2001 |
-+ char **pzErrMsg, |
2002 |
-+ const sqlite3_api_routines *pApi |
2003 |
-+){ |
2004 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
2005 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2006 |
-+ return sqlite3IeeeInit(db); |
2007 |
-+} |
2008 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2009 |
|
2010 |
diff --git a/dev-db/sqlite/files/sqlite-3.34.0-build_1.2.patch b/dev-db/sqlite/files/sqlite-3.34.0-build_1.2.patch |
2011 |
deleted file mode 100644 |
2012 |
index 7fb5d28e4ba..00000000000 |
2013 |
--- a/dev-db/sqlite/files/sqlite-3.34.0-build_1.2.patch |
2014 |
+++ /dev/null |
2015 |
@@ -1,500 +0,0 @@ |
2016 |
-Add initialization functions for internal usage in libsqlite3.so. |
2017 |
- |
2018 |
-SQLite revision: a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b |
2019 |
- |
2020 |
---- /ext/misc/nextchar.c |
2021 |
-+++ /ext/misc/nextchar.c |
2022 |
-@@ -286,17 +286,8 @@ |
2023 |
- sqlite3_free(c.aResult); |
2024 |
- } |
2025 |
- |
2026 |
--#ifdef _WIN32 |
2027 |
--__declspec(dllexport) |
2028 |
--#endif |
2029 |
--int sqlite3_nextchar_init( |
2030 |
-- sqlite3 *db, |
2031 |
-- char **pzErrMsg, |
2032 |
-- const sqlite3_api_routines *pApi |
2033 |
--){ |
2034 |
-+int sqlite3NextcharInit(sqlite3 *db){ |
2035 |
- int rc = SQLITE_OK; |
2036 |
-- SQLITE_EXTENSION_INIT2(pApi); |
2037 |
-- (void)pzErrMsg; /* Unused parameter */ |
2038 |
- rc = sqlite3_create_function(db, "next_char", 3, |
2039 |
- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2040 |
- nextCharFunc, 0, 0); |
2041 |
-@@ -312,3 +303,18 @@ |
2042 |
- } |
2043 |
- return rc; |
2044 |
- } |
2045 |
-+ |
2046 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2047 |
-+#ifdef _WIN32 |
2048 |
-+__declspec(dllexport) |
2049 |
-+#endif |
2050 |
-+int sqlite3_nextchar_init( |
2051 |
-+ sqlite3 *db, |
2052 |
-+ char **pzErrMsg, |
2053 |
-+ const sqlite3_api_routines *pApi |
2054 |
-+){ |
2055 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
2056 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2057 |
-+ return sqlite3NextcharInit(db); |
2058 |
-+} |
2059 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2060 |
---- /ext/misc/percentile.c |
2061 |
-+++ /ext/misc/percentile.c |
2062 |
-@@ -202,6 +202,15 @@ |
2063 |
- } |
2064 |
- |
2065 |
- |
2066 |
-+int sqlite3PercentileInit(sqlite3 *db){ |
2067 |
-+ int rc = SQLITE_OK; |
2068 |
-+ rc = sqlite3_create_function(db, "percentile", 2, |
2069 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2070 |
-+ 0, percentStep, percentFinal); |
2071 |
-+ return rc; |
2072 |
-+} |
2073 |
-+ |
2074 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2075 |
- #ifdef _WIN32 |
2076 |
- __declspec(dllexport) |
2077 |
- #endif |
2078 |
-@@ -210,11 +219,8 @@ |
2079 |
- char **pzErrMsg, |
2080 |
- const sqlite3_api_routines *pApi |
2081 |
- ){ |
2082 |
-- int rc = SQLITE_OK; |
2083 |
- SQLITE_EXTENSION_INIT2(pApi); |
2084 |
- (void)pzErrMsg; /* Unused parameter */ |
2085 |
-- rc = sqlite3_create_function(db, "percentile", 2, |
2086 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2087 |
-- 0, percentStep, percentFinal); |
2088 |
-- return rc; |
2089 |
-+ return sqlite3PercentileInit(db); |
2090 |
- } |
2091 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2092 |
---- /ext/misc/regexp.c |
2093 |
-+++ /ext/misc/regexp.c |
2094 |
-@@ -740,10 +740,18 @@ |
2095 |
- } |
2096 |
- } |
2097 |
- |
2098 |
-+int sqlite3RegexpInit(sqlite3 *db){ |
2099 |
-+ int rc = SQLITE_OK; |
2100 |
-+ rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS, |
2101 |
-+ 0, re_sql_func, 0, 0); |
2102 |
-+ return rc; |
2103 |
-+} |
2104 |
-+ |
2105 |
- /* |
2106 |
- ** Invoke this routine to register the regexp() function with the |
2107 |
- ** SQLite database connection. |
2108 |
- */ |
2109 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2110 |
- #ifdef _WIN32 |
2111 |
- __declspec(dllexport) |
2112 |
- #endif |
2113 |
-@@ -752,9 +760,8 @@ |
2114 |
- char **pzErrMsg, |
2115 |
- const sqlite3_api_routines *pApi |
2116 |
- ){ |
2117 |
-- int rc = SQLITE_OK; |
2118 |
- SQLITE_EXTENSION_INIT2(pApi); |
2119 |
-- rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS, |
2120 |
-- 0, re_sql_func, 0, 0); |
2121 |
-- return rc; |
2122 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2123 |
-+ return sqlite3RegexpInit(db); |
2124 |
- } |
2125 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2126 |
---- /ext/misc/series.c |
2127 |
-+++ /ext/misc/series.c |
2128 |
-@@ -413,6 +413,15 @@ |
2129 |
- |
2130 |
- #endif /* SQLITE_OMIT_VIRTUALTABLE */ |
2131 |
- |
2132 |
-+int sqlite3SeriesInit(sqlite3 *db){ |
2133 |
-+ int rc = SQLITE_OK; |
2134 |
-+#ifndef SQLITE_OMIT_VIRTUALTABLE |
2135 |
-+ rc = sqlite3_create_module(db, "generate_series", &seriesModule, 0); |
2136 |
-+#endif |
2137 |
-+ return rc; |
2138 |
-+} |
2139 |
-+ |
2140 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2141 |
- #ifdef _WIN32 |
2142 |
- __declspec(dllexport) |
2143 |
- #endif |
2144 |
-@@ -421,7 +430,6 @@ |
2145 |
- char **pzErrMsg, |
2146 |
- const sqlite3_api_routines *pApi |
2147 |
- ){ |
2148 |
-- int rc = SQLITE_OK; |
2149 |
- SQLITE_EXTENSION_INIT2(pApi); |
2150 |
- #ifndef SQLITE_OMIT_VIRTUALTABLE |
2151 |
- if( sqlite3_libversion_number()<3008012 ){ |
2152 |
-@@ -429,7 +437,7 @@ |
2153 |
- "generate_series() requires SQLite 3.8.12 or later"); |
2154 |
- return SQLITE_ERROR; |
2155 |
- } |
2156 |
-- rc = sqlite3_create_module(db, "generate_series", &seriesModule, 0); |
2157 |
- #endif |
2158 |
-- return rc; |
2159 |
-+ return sqlite3SeriesInit(db); |
2160 |
- } |
2161 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2162 |
---- /ext/misc/sha1.c |
2163 |
-+++ /ext/misc/sha1.c |
2164 |
-@@ -175,7 +175,7 @@ |
2165 |
- } |
2166 |
- |
2167 |
- /* Compute a string using sqlite3_vsnprintf() and hash it */ |
2168 |
--static void hash_step_vformat( |
2169 |
-+static void sha1_hash_step_vformat( |
2170 |
- SHA1Context *p, /* Add content to this context */ |
2171 |
- const char *zFormat, |
2172 |
- ... |
2173 |
-@@ -306,7 +306,7 @@ |
2174 |
- nCol = sqlite3_column_count(pStmt); |
2175 |
- z = sqlite3_sql(pStmt); |
2176 |
- n = (int)strlen(z); |
2177 |
-- hash_step_vformat(&cx,"S%d:",n); |
2178 |
-+ sha1_hash_step_vformat(&cx,"S%d:",n); |
2179 |
- hash_step(&cx,(unsigned char*)z,n); |
2180 |
- |
2181 |
- /* Compute a hash over the result of the query */ |
2182 |
-@@ -349,14 +349,14 @@ |
2183 |
- case SQLITE_TEXT: { |
2184 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
2185 |
- const unsigned char *z2 = sqlite3_column_text(pStmt, i); |
2186 |
-- hash_step_vformat(&cx,"T%d:",n2); |
2187 |
-+ sha1_hash_step_vformat(&cx,"T%d:",n2); |
2188 |
- hash_step(&cx, z2, n2); |
2189 |
- break; |
2190 |
- } |
2191 |
- case SQLITE_BLOB: { |
2192 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
2193 |
- const unsigned char *z2 = sqlite3_column_blob(pStmt, i); |
2194 |
-- hash_step_vformat(&cx,"B%d:",n2); |
2195 |
-+ sha1_hash_step_vformat(&cx,"B%d:",n2); |
2196 |
- hash_step(&cx, z2, n2); |
2197 |
- break; |
2198 |
- } |
2199 |
-@@ -370,6 +370,20 @@ |
2200 |
- } |
2201 |
- |
2202 |
- |
2203 |
-+int sqlite3ShaInit(sqlite3 *db){ |
2204 |
-+ int rc = SQLITE_OK; |
2205 |
-+ rc = sqlite3_create_function(db, "sha1", 1, |
2206 |
-+ SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
2207 |
-+ 0, sha1Func, 0, 0); |
2208 |
-+ if( rc==SQLITE_OK ){ |
2209 |
-+ rc = sqlite3_create_function(db, "sha1_query", 1, |
2210 |
-+ SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
2211 |
-+ sha1QueryFunc, 0, 0); |
2212 |
-+ } |
2213 |
-+ return rc; |
2214 |
-+} |
2215 |
-+ |
2216 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2217 |
- #ifdef _WIN32 |
2218 |
- __declspec(dllexport) |
2219 |
- #endif |
2220 |
-@@ -378,16 +392,8 @@ |
2221 |
- char **pzErrMsg, |
2222 |
- const sqlite3_api_routines *pApi |
2223 |
- ){ |
2224 |
-- int rc = SQLITE_OK; |
2225 |
- SQLITE_EXTENSION_INIT2(pApi); |
2226 |
- (void)pzErrMsg; /* Unused parameter */ |
2227 |
-- rc = sqlite3_create_function(db, "sha1", 1, |
2228 |
-- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
2229 |
-- 0, sha1Func, 0, 0); |
2230 |
-- if( rc==SQLITE_OK ){ |
2231 |
-- rc = sqlite3_create_function(db, "sha1_query", 1, |
2232 |
-- SQLITE_UTF8|SQLITE_DIRECTONLY, 0, |
2233 |
-- sha1QueryFunc, 0, 0); |
2234 |
-- } |
2235 |
-- return rc; |
2236 |
-+ return sqlite3ShaInit(db); |
2237 |
- } |
2238 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2239 |
---- /ext/misc/shathree.c |
2240 |
-+++ /ext/misc/shathree.c |
2241 |
-@@ -527,7 +527,7 @@ |
2242 |
- /* Compute a string using sqlite3_vsnprintf() with a maximum length |
2243 |
- ** of 50 bytes and add it to the hash. |
2244 |
- */ |
2245 |
--static void hash_step_vformat( |
2246 |
-+static void sha3_hash_step_vformat( |
2247 |
- SHA3Context *p, /* Add content to this context */ |
2248 |
- const char *zFormat, |
2249 |
- ... |
2250 |
-@@ -622,7 +622,7 @@ |
2251 |
- nCol = sqlite3_column_count(pStmt); |
2252 |
- z = sqlite3_sql(pStmt); |
2253 |
- n = (int)strlen(z); |
2254 |
-- hash_step_vformat(&cx,"S%d:",n); |
2255 |
-+ sha3_hash_step_vformat(&cx,"S%d:",n); |
2256 |
- SHA3Update(&cx,(unsigned char*)z,n); |
2257 |
- |
2258 |
- /* Compute a hash over the result of the query */ |
2259 |
-@@ -665,14 +665,14 @@ |
2260 |
- case SQLITE_TEXT: { |
2261 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
2262 |
- const unsigned char *z2 = sqlite3_column_text(pStmt, i); |
2263 |
-- hash_step_vformat(&cx,"T%d:",n2); |
2264 |
-+ sha3_hash_step_vformat(&cx,"T%d:",n2); |
2265 |
- SHA3Update(&cx, z2, n2); |
2266 |
- break; |
2267 |
- } |
2268 |
- case SQLITE_BLOB: { |
2269 |
- int n2 = sqlite3_column_bytes(pStmt, i); |
2270 |
- const unsigned char *z2 = sqlite3_column_blob(pStmt, i); |
2271 |
-- hash_step_vformat(&cx,"B%d:",n2); |
2272 |
-+ sha3_hash_step_vformat(&cx,"B%d:",n2); |
2273 |
- SHA3Update(&cx, z2, n2); |
2274 |
- break; |
2275 |
- } |
2276 |
-@@ -685,17 +685,8 @@ |
2277 |
- } |
2278 |
- |
2279 |
- |
2280 |
--#ifdef _WIN32 |
2281 |
--__declspec(dllexport) |
2282 |
--#endif |
2283 |
--int sqlite3_shathree_init( |
2284 |
-- sqlite3 *db, |
2285 |
-- char **pzErrMsg, |
2286 |
-- const sqlite3_api_routines *pApi |
2287 |
--){ |
2288 |
-+int sqlite3ShathreeInit(sqlite3 *db){ |
2289 |
- int rc = SQLITE_OK; |
2290 |
-- SQLITE_EXTENSION_INIT2(pApi); |
2291 |
-- (void)pzErrMsg; /* Unused parameter */ |
2292 |
- rc = sqlite3_create_function(db, "sha3", 1, |
2293 |
- SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC, |
2294 |
- 0, sha3Func, 0, 0); |
2295 |
-@@ -716,3 +707,18 @@ |
2296 |
- } |
2297 |
- return rc; |
2298 |
- } |
2299 |
-+ |
2300 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2301 |
-+#ifdef _WIN32 |
2302 |
-+__declspec(dllexport) |
2303 |
-+#endif |
2304 |
-+int sqlite3_shathree_init( |
2305 |
-+ sqlite3 *db, |
2306 |
-+ char **pzErrMsg, |
2307 |
-+ const sqlite3_api_routines *pApi |
2308 |
-+){ |
2309 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
2310 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2311 |
-+ return sqlite3ShathreeInit(db); |
2312 |
-+} |
2313 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2314 |
---- /ext/misc/sqlar.c |
2315 |
-+++ /ext/misc/sqlar.c |
2316 |
-@@ -14,6 +14,8 @@ |
2317 |
- ** for working with sqlar archives and used by the shell tool's built-in |
2318 |
- ** sqlar support. |
2319 |
- */ |
2320 |
-+#ifdef SQLITE_HAVE_ZLIB |
2321 |
-+ |
2322 |
- #include "sqlite3ext.h" |
2323 |
- SQLITE_EXTENSION_INIT1 |
2324 |
- #include <zlib.h> |
2325 |
-@@ -101,6 +103,20 @@ |
2326 |
- } |
2327 |
- |
2328 |
- |
2329 |
-+int sqlite3SqlarInit(sqlite3 *db){ |
2330 |
-+ int rc = SQLITE_OK; |
2331 |
-+ rc = sqlite3_create_function(db, "sqlar_compress", 1, |
2332 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2333 |
-+ sqlarCompressFunc, 0, 0); |
2334 |
-+ if( rc==SQLITE_OK ){ |
2335 |
-+ rc = sqlite3_create_function(db, "sqlar_uncompress", 2, |
2336 |
-+ SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2337 |
-+ sqlarUncompressFunc, 0, 0); |
2338 |
-+ } |
2339 |
-+ return rc; |
2340 |
-+} |
2341 |
-+ |
2342 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2343 |
- #ifdef _WIN32 |
2344 |
- __declspec(dllexport) |
2345 |
- #endif |
2346 |
-@@ -109,16 +125,10 @@ |
2347 |
- char **pzErrMsg, |
2348 |
- const sqlite3_api_routines *pApi |
2349 |
- ){ |
2350 |
-- int rc = SQLITE_OK; |
2351 |
- SQLITE_EXTENSION_INIT2(pApi); |
2352 |
- (void)pzErrMsg; /* Unused parameter */ |
2353 |
-- rc = sqlite3_create_function(db, "sqlar_compress", 1, |
2354 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2355 |
-- sqlarCompressFunc, 0, 0); |
2356 |
-- if( rc==SQLITE_OK ){ |
2357 |
-- rc = sqlite3_create_function(db, "sqlar_uncompress", 2, |
2358 |
-- SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2359 |
-- sqlarUncompressFunc, 0, 0); |
2360 |
-- } |
2361 |
-- return rc; |
2362 |
-+ return sqlite3SqlarInit(db); |
2363 |
- } |
2364 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2365 |
-+ |
2366 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
2367 |
---- /ext/misc/totype.c |
2368 |
-+++ /ext/misc/totype.c |
2369 |
-@@ -491,17 +491,8 @@ |
2370 |
- #pragma warning(default: 4748) |
2371 |
- #endif |
2372 |
- |
2373 |
--#ifdef _WIN32 |
2374 |
--__declspec(dllexport) |
2375 |
--#endif |
2376 |
--int sqlite3_totype_init( |
2377 |
-- sqlite3 *db, |
2378 |
-- char **pzErrMsg, |
2379 |
-- const sqlite3_api_routines *pApi |
2380 |
--){ |
2381 |
-+int sqlite3TotypeInit(sqlite3 *db){ |
2382 |
- int rc = SQLITE_OK; |
2383 |
-- SQLITE_EXTENSION_INIT2(pApi); |
2384 |
-- (void)pzErrMsg; /* Unused parameter */ |
2385 |
- rc = sqlite3_create_function(db, "tointeger", 1, |
2386 |
- SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, 0, |
2387 |
- tointegerFunc, 0, 0); |
2388 |
-@@ -512,3 +503,18 @@ |
2389 |
- } |
2390 |
- return rc; |
2391 |
- } |
2392 |
-+ |
2393 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2394 |
-+#ifdef _WIN32 |
2395 |
-+__declspec(dllexport) |
2396 |
-+#endif |
2397 |
-+int sqlite3_totype_init( |
2398 |
-+ sqlite3 *db, |
2399 |
-+ char **pzErrMsg, |
2400 |
-+ const sqlite3_api_routines *pApi |
2401 |
-+){ |
2402 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
2403 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2404 |
-+ return sqlite3TotypeInit(db); |
2405 |
-+} |
2406 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2407 |
---- /ext/misc/uint.c |
2408 |
-+++ /ext/misc/uint.c |
2409 |
-@@ -78,6 +78,11 @@ |
2410 |
- return (nKey1 - i) - (nKey2 - j); |
2411 |
- } |
2412 |
- |
2413 |
-+int sqlite3UintInit(sqlite3 *db){ |
2414 |
-+ return sqlite3_create_collation(db, "UINT", SQLITE_UTF8, 0, uintCollFunc); |
2415 |
-+} |
2416 |
-+ |
2417 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2418 |
- #ifdef _WIN32 |
2419 |
- __declspec(dllexport) |
2420 |
- #endif |
2421 |
-@@ -88,5 +93,6 @@ |
2422 |
- ){ |
2423 |
- SQLITE_EXTENSION_INIT2(pApi); |
2424 |
- (void)pzErrMsg; /* Unused parameter */ |
2425 |
-- return sqlite3_create_collation(db, "uint", SQLITE_UTF8, 0, uintCollFunc); |
2426 |
-+ return sqlite3UintInit(db); |
2427 |
- } |
2428 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2429 |
---- /ext/misc/uuid.c |
2430 |
-+++ /ext/misc/uuid.c |
2431 |
-@@ -206,21 +206,12 @@ |
2432 |
- sqlite3_result_blob(context, pBlob, 16, SQLITE_TRANSIENT); |
2433 |
- } |
2434 |
- |
2435 |
--#ifdef _WIN32 |
2436 |
--__declspec(dllexport) |
2437 |
--#endif |
2438 |
--int sqlite3_uuid_init( |
2439 |
-- sqlite3 *db, |
2440 |
-- char **pzErrMsg, |
2441 |
-- const sqlite3_api_routines *pApi |
2442 |
--){ |
2443 |
-+int sqlite3UuidInit(sqlite3 *db){ |
2444 |
- int rc = SQLITE_OK; |
2445 |
-- SQLITE_EXTENSION_INIT2(pApi); |
2446 |
-- (void)pzErrMsg; /* Unused parameter */ |
2447 |
- rc = sqlite3_create_function(db, "uuid", 0, SQLITE_UTF8|SQLITE_INNOCUOUS, 0, |
2448 |
- sqlite3UuidFunc, 0, 0); |
2449 |
- if( rc==SQLITE_OK ){ |
2450 |
-- rc = sqlite3_create_function(db, "uuid_str", 1, |
2451 |
-+ rc = sqlite3_create_function(db, "uuid_str", 1, |
2452 |
- SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC, |
2453 |
- 0, sqlite3UuidStrFunc, 0, 0); |
2454 |
- } |
2455 |
-@@ -231,3 +222,18 @@ |
2456 |
- } |
2457 |
- return rc; |
2458 |
- } |
2459 |
-+ |
2460 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2461 |
-+#ifdef _WIN32 |
2462 |
-+__declspec(dllexport) |
2463 |
-+#endif |
2464 |
-+int sqlite3_uuid_init( |
2465 |
-+ sqlite3 *db, |
2466 |
-+ char **pzErrMsg, |
2467 |
-+ const sqlite3_api_routines *pApi |
2468 |
-+){ |
2469 |
-+ SQLITE_EXTENSION_INIT2(pApi); |
2470 |
-+ (void)pzErrMsg; /* Unused parameter */ |
2471 |
-+ return sqlite3UuidInit(db); |
2472 |
-+} |
2473 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2474 |
---- /ext/misc/zipfile.c |
2475 |
-+++ /ext/misc/zipfile.c |
2476 |
-@@ -24,6 +24,8 @@ |
2477 |
- ** * No support for zip64 extensions |
2478 |
- ** * Only the "inflate/deflate" (zlib) compression method is supported |
2479 |
- */ |
2480 |
-+#ifdef SQLITE_HAVE_ZLIB |
2481 |
-+ |
2482 |
- #include "sqlite3ext.h" |
2483 |
- SQLITE_EXTENSION_INIT1 |
2484 |
- #include <stdio.h> |
2485 |
-@@ -2139,7 +2141,7 @@ |
2486 |
- /* |
2487 |
- ** Register the "zipfile" virtual table. |
2488 |
- */ |
2489 |
--static int zipfileRegister(sqlite3 *db){ |
2490 |
-+int sqlite3ZipfileInit(sqlite3 *db){ |
2491 |
- static sqlite3_module zipfileModule = { |
2492 |
- 1, /* iVersion */ |
2493 |
- zipfileConnect, /* xCreate */ |
2494 |
-@@ -2173,9 +2175,10 @@ |
2495 |
- return rc; |
2496 |
- } |
2497 |
- #else /* SQLITE_OMIT_VIRTUALTABLE */ |
2498 |
--# define zipfileRegister(x) SQLITE_OK |
2499 |
-+# define sqlite3ZipfileInit(x) SQLITE_OK |
2500 |
- #endif |
2501 |
- |
2502 |
-+#if !defined(SQLITE_CORE) || defined(SQLITE_TEST) |
2503 |
- #ifdef _WIN32 |
2504 |
- __declspec(dllexport) |
2505 |
- #endif |
2506 |
-@@ -2186,5 +2189,8 @@ |
2507 |
- ){ |
2508 |
- SQLITE_EXTENSION_INIT2(pApi); |
2509 |
- (void)pzErrMsg; /* Unused parameter */ |
2510 |
-- return zipfileRegister(db); |
2511 |
-+ return sqlite3ZipfileInit(db); |
2512 |
- } |
2513 |
-+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_TEST) */ |
2514 |
-+ |
2515 |
-+#endif /* SQLITE_HAVE_ZLIB */ |
2516 |
|
2517 |
diff --git a/dev-db/sqlite/files/sqlite-3.34.0-build_2.1.patch b/dev-db/sqlite/files/sqlite-3.34.0-build_2.1.patch |
2518 |
deleted file mode 100644 |
2519 |
index 16210a6bddc..00000000000 |
2520 |
--- a/dev-db/sqlite/files/sqlite-3.34.0-build_2.1.patch |
2521 |
+++ /dev/null |
2522 |
@@ -1,291 +0,0 @@ |
2523 |
-Move some code to libsqlite3.so to avoid duplication. |
2524 |
-Link executables against libsqlite3.so. |
2525 |
-Increase timeout for fuzzcheck. |
2526 |
-Update list of optionally available functions. |
2527 |
-Fix building with dlopen() not available. |
2528 |
- |
2529 |
-SQLite revision: a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b |
2530 |
- |
2531 |
---- /Makefile.in |
2532 |
-+++ /Makefile.in |
2533 |
-@@ -313,6 +313,9 @@ |
2534 |
- # Source code for extensions |
2535 |
- # |
2536 |
- SRC += \ |
2537 |
-+ $(TOP)/ext/expert/sqlite3expert.c \ |
2538 |
-+ $(TOP)/ext/expert/sqlite3expert.h |
2539 |
-+SRC += \ |
2540 |
- $(TOP)/ext/fts1/fts1.c \ |
2541 |
- $(TOP)/ext/fts1/fts1.h \ |
2542 |
- $(TOP)/ext/fts1/fts1_hash.c \ |
2543 |
-@@ -365,8 +368,29 @@ |
2544 |
- $(TOP)/ext/rbu/sqlite3rbu.h \ |
2545 |
- $(TOP)/ext/rbu/sqlite3rbu.c |
2546 |
- SRC += \ |
2547 |
-+ $(TOP)/ext/misc/amatch.c \ |
2548 |
-+ $(TOP)/ext/misc/appendvfs.c \ |
2549 |
-+ $(TOP)/ext/misc/carray.c \ |
2550 |
-+ $(TOP)/ext/misc/completion.c \ |
2551 |
-+ $(TOP)/ext/misc/csv.c \ |
2552 |
-+ $(TOP)/ext/misc/dbdata.c \ |
2553 |
-+ $(TOP)/ext/misc/decimal.c \ |
2554 |
-+ $(TOP)/ext/misc/eval.c \ |
2555 |
-+ $(TOP)/ext/misc/fileio.c \ |
2556 |
-+ $(TOP)/ext/misc/ieee754.c \ |
2557 |
- $(TOP)/ext/misc/json1.c \ |
2558 |
-- $(TOP)/ext/misc/stmt.c |
2559 |
-+ $(TOP)/ext/misc/nextchar.c \ |
2560 |
-+ $(TOP)/ext/misc/percentile.c \ |
2561 |
-+ $(TOP)/ext/misc/regexp.c \ |
2562 |
-+ $(TOP)/ext/misc/series.c \ |
2563 |
-+ $(TOP)/ext/misc/sha1.c \ |
2564 |
-+ $(TOP)/ext/misc/shathree.c \ |
2565 |
-+ $(TOP)/ext/misc/sqlar.c \ |
2566 |
-+ $(TOP)/ext/misc/stmt.c \ |
2567 |
-+ $(TOP)/ext/misc/totype.c \ |
2568 |
-+ $(TOP)/ext/misc/uint.c \ |
2569 |
-+ $(TOP)/ext/misc/uuid.c \ |
2570 |
-+ $(TOP)/ext/misc/zipfile.c |
2571 |
- |
2572 |
- # Generated source code files |
2573 |
- # |
2574 |
-@@ -437,35 +461,21 @@ |
2575 |
- # Statically linked extensions |
2576 |
- # |
2577 |
- TESTSRC += \ |
2578 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
2579 |
- $(TOP)/ext/expert/test_expert.c \ |
2580 |
-- $(TOP)/ext/misc/amatch.c \ |
2581 |
-- $(TOP)/ext/misc/carray.c \ |
2582 |
- $(TOP)/ext/misc/cksumvfs.c \ |
2583 |
- $(TOP)/ext/misc/closure.c \ |
2584 |
-- $(TOP)/ext/misc/csv.c \ |
2585 |
-- $(TOP)/ext/misc/decimal.c \ |
2586 |
-- $(TOP)/ext/misc/eval.c \ |
2587 |
- $(TOP)/ext/misc/explain.c \ |
2588 |
-- $(TOP)/ext/misc/fileio.c \ |
2589 |
- $(TOP)/ext/misc/fuzzer.c \ |
2590 |
- $(TOP)/ext/fts5/fts5_tcl.c \ |
2591 |
- $(TOP)/ext/fts5/fts5_test_mi.c \ |
2592 |
- $(TOP)/ext/fts5/fts5_test_tok.c \ |
2593 |
-- $(TOP)/ext/misc/ieee754.c \ |
2594 |
- $(TOP)/ext/misc/mmapwarm.c \ |
2595 |
-- $(TOP)/ext/misc/nextchar.c \ |
2596 |
- $(TOP)/ext/misc/normalize.c \ |
2597 |
-- $(TOP)/ext/misc/percentile.c \ |
2598 |
- $(TOP)/ext/misc/prefixes.c \ |
2599 |
-- $(TOP)/ext/misc/regexp.c \ |
2600 |
- $(TOP)/ext/misc/remember.c \ |
2601 |
-- $(TOP)/ext/misc/series.c \ |
2602 |
- $(TOP)/ext/misc/spellfix.c \ |
2603 |
-- $(TOP)/ext/misc/totype.c \ |
2604 |
- $(TOP)/ext/misc/unionvtab.c \ |
2605 |
- $(TOP)/ext/misc/wholenumber.c \ |
2606 |
-- $(TOP)/ext/misc/zipfile.c \ |
2607 |
- $(TOP)/ext/userauth/userauth.c |
2608 |
- |
2609 |
- # Source code to the library files needed by the test fixture |
2610 |
-@@ -647,25 +657,25 @@ |
2611 |
- |
2612 |
- libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
2613 |
- $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
2614 |
-- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
2615 |
-+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ |
2616 |
- -rpath "$(TCLLIBDIR)" \ |
2617 |
- -version-info "8:6:8" \ |
2618 |
- -avoid-version |
2619 |
- |
2620 |
--sqlite3$(TEXE): shell.c sqlite3.c |
2621 |
-- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ |
2622 |
-- shell.c sqlite3.c \ |
2623 |
-- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
2624 |
-+sqlite3$(TEXE): shell.c libsqlite3.la |
2625 |
-+ $(LTLINK) $(READLINE_FLAGS) -o $@ \ |
2626 |
-+ shell.c libsqlite3.la \ |
2627 |
-+ $(LIBREADLINE) |
2628 |
- |
2629 |
--sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h |
2630 |
-- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) |
2631 |
-+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la |
2632 |
-+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la |
2633 |
- |
2634 |
--dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h |
2635 |
-- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) |
2636 |
-+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la |
2637 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la |
2638 |
- |
2639 |
--scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo |
2640 |
-+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la |
2641 |
- $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ |
2642 |
-- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) |
2643 |
-+ $(TOP)/ext/misc/scrub.c libsqlite3.la |
2644 |
- |
2645 |
- srcck1$(BEXE): $(TOP)/tool/srcck1.c |
2646 |
- $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c |
2647 |
-@@ -776,7 +786,7 @@ |
2648 |
- # Rule to build the amalgamation |
2649 |
- # |
2650 |
- sqlite3.lo: sqlite3.c |
2651 |
-- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c |
2652 |
-+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c |
2653 |
- |
2654 |
- # Rules to build the LEMON compiler generator |
2655 |
- # |
2656 |
-@@ -1082,18 +1092,6 @@ |
2657 |
- # Source files that go into making shell.c |
2658 |
- SHELL_SRC = \ |
2659 |
- $(TOP)/src/shell.c.in \ |
2660 |
-- $(TOP)/ext/misc/appendvfs.c \ |
2661 |
-- $(TOP)/ext/misc/completion.c \ |
2662 |
-- $(TOP)/ext/misc/decimal.c \ |
2663 |
-- $(TOP)/ext/misc/fileio.c \ |
2664 |
-- $(TOP)/ext/misc/ieee754.c \ |
2665 |
-- $(TOP)/ext/misc/series.c \ |
2666 |
-- $(TOP)/ext/misc/shathree.c \ |
2667 |
-- $(TOP)/ext/misc/sqlar.c \ |
2668 |
-- $(TOP)/ext/misc/uint.c \ |
2669 |
-- $(TOP)/ext/expert/sqlite3expert.c \ |
2670 |
-- $(TOP)/ext/expert/sqlite3expert.h \ |
2671 |
-- $(TOP)/ext/misc/zipfile.c \ |
2672 |
- $(TOP)/ext/misc/memtrace.c \ |
2673 |
- $(TOP)/src/test_windirent.c |
2674 |
- |
2675 |
-@@ -1263,11 +1261,11 @@ |
2676 |
- |
2677 |
- # Fuzz testing |
2678 |
- fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
2679 |
-- ./fuzzcheck$(TEXE) $(FUZZDATA) |
2680 |
-+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) |
2681 |
- ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
2682 |
- |
2683 |
- valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
2684 |
-- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) |
2685 |
-+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) |
2686 |
- valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
2687 |
- |
2688 |
- # The veryquick.test TCL tests. |
2689 |
-@@ -1301,24 +1299,23 @@ |
2690 |
- shelltest: $(TESTPROGS) |
2691 |
- ./testfixture$(TEXT) $(TOP)/test/permutations.test shell |
2692 |
- |
2693 |
--sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
2694 |
-+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
2695 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c |
2696 |
- |
2697 |
--sqlite3_analyzer$(TEXE): sqlite3_analyzer.c |
2698 |
-- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) |
2699 |
-+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la |
2700 |
-+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) |
2701 |
- |
2702 |
--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 |
2703 |
-+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
2704 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c |
2705 |
- |
2706 |
--sqltclsh$(TEXE): sqltclsh.c |
2707 |
-- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) |
2708 |
-+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la |
2709 |
-+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) |
2710 |
- |
2711 |
--sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c |
2712 |
-- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) |
2713 |
-+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la |
2714 |
-+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la |
2715 |
- |
2716 |
- CHECKER_DEPS =\ |
2717 |
- $(TOP)/tool/mkccode.tcl \ |
2718 |
-- sqlite3.c \ |
2719 |
- $(TOP)/src/tclsqlite.c \ |
2720 |
- $(TOP)/ext/repair/sqlite3_checker.tcl \ |
2721 |
- $(TOP)/ext/repair/checkindex.c \ |
2722 |
-@@ -1329,36 +1326,36 @@ |
2723 |
- sqlite3_checker.c: $(CHECKER_DEPS) |
2724 |
- $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ |
2725 |
- |
2726 |
--sqlite3_checker$(TEXE): sqlite3_checker.c |
2727 |
-- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) |
2728 |
-+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la |
2729 |
-+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) |
2730 |
- |
2731 |
--dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo |
2732 |
-+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la |
2733 |
- $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ |
2734 |
-- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) |
2735 |
-+ $(TOP)/ext/misc/dbdump.c libsqlite3.la |
2736 |
- |
2737 |
--dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
2738 |
-- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c |
2739 |
-+dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
2740 |
-+ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c |
2741 |
- |
2742 |
--showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo |
2743 |
-- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) |
2744 |
-+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la |
2745 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la |
2746 |
- |
2747 |
--showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo |
2748 |
-- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) |
2749 |
-+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la |
2750 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la |
2751 |
- |
2752 |
--showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo |
2753 |
-- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) |
2754 |
-+showjournal$(TEXE): $(TOP)/tool/showjournal.c |
2755 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c |
2756 |
- |
2757 |
--showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo |
2758 |
-- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) |
2759 |
-+showwal$(TEXE): $(TOP)/tool/showwal.c |
2760 |
-+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c |
2761 |
- |
2762 |
- showshm$(TEXE): $(TOP)/tool/showshm.c |
2763 |
- $(LTLINK) -o $@ $(TOP)/tool/showshm.c |
2764 |
- |
2765 |
--index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo |
2766 |
-- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS) |
2767 |
-+index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la |
2768 |
-+ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la |
2769 |
- |
2770 |
--changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo |
2771 |
-- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) |
2772 |
-+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la |
2773 |
-+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la |
2774 |
- |
2775 |
- changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo |
2776 |
- $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS) |
2777 |
-@@ -1383,11 +1380,11 @@ |
2778 |
- kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c |
2779 |
- $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) |
2780 |
- |
2781 |
--rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo |
2782 |
-- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) |
2783 |
-+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la |
2784 |
-+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la |
2785 |
- |
2786 |
--loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
2787 |
-- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) |
2788 |
-+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
2789 |
-+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ |
2790 |
- |
2791 |
- # This target will fail if the SQLite amalgamation contains any exported |
2792 |
- # symbols that do not begin with "sqlite3_". It is run as part of the |
2793 |
---- /configure.ac |
2794 |
-+++ /configure.ac |
2795 |
-@@ -108,7 +108,7 @@ |
2796 |
- ######### |
2797 |
- # Figure out whether or not we have these functions |
2798 |
- # |
2799 |
--AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_size strchrnul usleep utime pread pread64 pwrite pwrite64]) |
2800 |
-+AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime]) |
2801 |
- |
2802 |
- ######### |
2803 |
- # By default, we use the amalgamation (this may be changed below...) |
2804 |
-@@ -582,6 +582,9 @@ |
2805 |
- if test "${enable_load_extension}" = "yes" ; then |
2806 |
- OPT_FEATURE_FLAGS="" |
2807 |
- AC_SEARCH_LIBS(dlopen, dl) |
2808 |
-+ if test "${ac_cv_search_dlopen}" = "no" ; then |
2809 |
-+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
2810 |
-+ fi |
2811 |
- else |
2812 |
- OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
2813 |
- fi |
2814 |
|
2815 |
diff --git a/dev-db/sqlite/files/sqlite-3.34.0-build_2.2.patch b/dev-db/sqlite/files/sqlite-3.34.0-build_2.2.patch |
2816 |
deleted file mode 100644 |
2817 |
index 1aa60a0b162..00000000000 |
2818 |
--- a/dev-db/sqlite/files/sqlite-3.34.0-build_2.2.patch |
2819 |
+++ /dev/null |
2820 |
@@ -1,441 +0,0 @@ |
2821 |
-Move some code to libsqlite3.so to avoid duplication. |
2822 |
-Initialize some extensions in libsqlite3.so. |
2823 |
-Update test suite. |
2824 |
- |
2825 |
-SQLite revision: a26b6597e3ae272231b96f9982c3bcc17ddec2f2b6eb4df06a224b91089fed5b |
2826 |
- |
2827 |
---- /ext/repair/sqlite3_checker.c.in |
2828 |
-+++ /ext/repair/sqlite3_checker.c.in |
2829 |
-@@ -2,6 +2,7 @@ |
2830 |
- ** Read an SQLite database file and analyze its space utilization. Generate |
2831 |
- ** text on standard output. |
2832 |
- */ |
2833 |
-+#define SQLITE_CORE 1 |
2834 |
- #define TCLSH_INIT_PROC sqlite3_checker_init_proc |
2835 |
- #define SQLITE_ENABLE_DBPAGE_VTAB 1 |
2836 |
- #define SQLITE_ENABLE_JSON1 1 |
2837 |
-@@ -14,7 +15,7 @@ |
2838 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
2839 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
2840 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
2841 |
--INCLUDE sqlite3.c |
2842 |
-+#include "sqlite3.h" |
2843 |
- INCLUDE $ROOT/src/tclsqlite.c |
2844 |
- INCLUDE $ROOT/ext/misc/btreeinfo.c |
2845 |
- INCLUDE $ROOT/ext/repair/checkindex.c |
2846 |
---- /src/main.c |
2847 |
-+++ /src/main.c |
2848 |
-@@ -50,12 +50,36 @@ |
2849 |
- #ifdef SQLITE_ENABLE_FTS5 |
2850 |
- int sqlite3Fts5Init(sqlite3*); |
2851 |
- #endif |
2852 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
2853 |
-+int sqlite3DbdataRegister(sqlite3*); |
2854 |
-+#endif |
2855 |
- #ifdef SQLITE_ENABLE_JSON1 |
2856 |
- int sqlite3Json1Init(sqlite3*); |
2857 |
- #endif |
2858 |
- #ifdef SQLITE_ENABLE_STMTVTAB |
2859 |
- int sqlite3StmtVtabInit(sqlite3*); |
2860 |
- #endif |
2861 |
-+int sqlite3AmatchInit(sqlite3*); |
2862 |
-+int sqlite3CarrayInit(sqlite3*); |
2863 |
-+int sqlite3CompletionVtabInit(sqlite3*); |
2864 |
-+int sqlite3CsvInit(sqlite3*); |
2865 |
-+int sqlite3DecimalInit(sqlite3*); |
2866 |
-+int sqlite3EvalInit(sqlite3*); |
2867 |
-+int sqlite3FileioInit(sqlite3*); |
2868 |
-+int sqlite3IeeeInit(sqlite3*); |
2869 |
-+int sqlite3NextcharInit(sqlite3*); |
2870 |
-+int sqlite3PercentileInit(sqlite3*); |
2871 |
-+int sqlite3RegexpInit(sqlite3*); |
2872 |
-+int sqlite3SeriesInit(sqlite3*); |
2873 |
-+int sqlite3ShaInit(sqlite3*); |
2874 |
-+int sqlite3ShathreeInit(sqlite3*); |
2875 |
-+int sqlite3TotypeInit(sqlite3*); |
2876 |
-+int sqlite3UintInit(sqlite3*); |
2877 |
-+int sqlite3UuidInit(sqlite3*); |
2878 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) |
2879 |
-+int sqlite3ZipfileInit(sqlite3*); |
2880 |
-+int sqlite3SqlarInit(sqlite3*); |
2881 |
-+#endif |
2882 |
- |
2883 |
- /* |
2884 |
- ** An array of pointers to extension initializer functions for |
2885 |
-@@ -83,6 +107,9 @@ |
2886 |
- #ifdef SQLITE_ENABLE_DBPAGE_VTAB |
2887 |
- sqlite3DbpageRegister, |
2888 |
- #endif |
2889 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
2890 |
-+ sqlite3DbdataRegister, |
2891 |
-+#endif |
2892 |
- #ifdef SQLITE_ENABLE_DBSTAT_VTAB |
2893 |
- sqlite3DbstatRegister, |
2894 |
- #endif |
2895 |
-@@ -96,6 +123,27 @@ |
2896 |
- #ifdef SQLITE_ENABLE_BYTECODE_VTAB |
2897 |
- sqlite3VdbeBytecodeVtabInit, |
2898 |
- #endif |
2899 |
-+ sqlite3AmatchInit, |
2900 |
-+ sqlite3CarrayInit, |
2901 |
-+ sqlite3CompletionVtabInit, |
2902 |
-+ sqlite3CsvInit, |
2903 |
-+ sqlite3DecimalInit, |
2904 |
-+ sqlite3EvalInit, |
2905 |
-+ sqlite3FileioInit, |
2906 |
-+ sqlite3IeeeInit, |
2907 |
-+ sqlite3NextcharInit, |
2908 |
-+ sqlite3PercentileInit, |
2909 |
-+ sqlite3RegexpInit, |
2910 |
-+ sqlite3SeriesInit, |
2911 |
-+ sqlite3ShaInit, |
2912 |
-+ sqlite3ShathreeInit, |
2913 |
-+ sqlite3TotypeInit, |
2914 |
-+ sqlite3UintInit, |
2915 |
-+ sqlite3UuidInit, |
2916 |
-+#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_HAVE_ZLIB) |
2917 |
-+ sqlite3ZipfileInit, |
2918 |
-+ sqlite3SqlarInit, |
2919 |
-+#endif |
2920 |
- }; |
2921 |
- |
2922 |
- #ifndef SQLITE_AMALGAMATION |
2923 |
---- /src/shell.c.in |
2924 |
-+++ /src/shell.c.in |
2925 |
-@@ -69,6 +69,7 @@ |
2926 |
- #include <stdio.h> |
2927 |
- #include <assert.h> |
2928 |
- #include "sqlite3.h" |
2929 |
-+#include "ext/expert/sqlite3expert.h" |
2930 |
- typedef sqlite3_int64 i64; |
2931 |
- typedef sqlite3_uint64 u64; |
2932 |
- typedef unsigned char u8; |
2933 |
-@@ -135,6 +136,10 @@ |
2934 |
- # define SHELL_USE_LOCAL_GETLINE 1 |
2935 |
- #endif |
2936 |
- |
2937 |
-+#ifdef SQLITE_HAVE_ZLIB |
2938 |
-+#include <zlib.h> |
2939 |
-+#endif |
2940 |
-+ |
2941 |
- |
2942 |
- #if defined(_WIN32) || defined(WIN32) |
2943 |
- # if SQLITE_OS_WINRT |
2944 |
-@@ -1018,25 +1023,7 @@ |
2945 |
- INCLUDE test_windirent.c |
2946 |
- #define dirent DIRENT |
2947 |
- #endif |
2948 |
--INCLUDE ../ext/misc/shathree.c |
2949 |
--INCLUDE ../ext/misc/fileio.c |
2950 |
--INCLUDE ../ext/misc/completion.c |
2951 |
--INCLUDE ../ext/misc/appendvfs.c |
2952 |
- INCLUDE ../ext/misc/memtrace.c |
2953 |
--INCLUDE ../ext/misc/uint.c |
2954 |
--INCLUDE ../ext/misc/decimal.c |
2955 |
--INCLUDE ../ext/misc/ieee754.c |
2956 |
--INCLUDE ../ext/misc/series.c |
2957 |
--#ifdef SQLITE_HAVE_ZLIB |
2958 |
--INCLUDE ../ext/misc/zipfile.c |
2959 |
--INCLUDE ../ext/misc/sqlar.c |
2960 |
--#endif |
2961 |
--INCLUDE ../ext/expert/sqlite3expert.h |
2962 |
--INCLUDE ../ext/expert/sqlite3expert.c |
2963 |
-- |
2964 |
--#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
2965 |
--INCLUDE ../ext/misc/dbdata.c |
2966 |
--#endif |
2967 |
- |
2968 |
- #if defined(SQLITE_ENABLE_SESSION) |
2969 |
- /* |
2970 |
-@@ -4608,20 +4595,6 @@ |
2971 |
- #ifndef SQLITE_OMIT_LOAD_EXTENSION |
2972 |
- sqlite3_enable_load_extension(p->db, 1); |
2973 |
- #endif |
2974 |
-- sqlite3_fileio_init(p->db, 0, 0); |
2975 |
-- sqlite3_shathree_init(p->db, 0, 0); |
2976 |
-- sqlite3_completion_init(p->db, 0, 0); |
2977 |
-- sqlite3_uint_init(p->db, 0, 0); |
2978 |
-- sqlite3_decimal_init(p->db, 0, 0); |
2979 |
-- sqlite3_ieee_init(p->db, 0, 0); |
2980 |
-- sqlite3_series_init(p->db, 0, 0); |
2981 |
--#if !defined(SQLITE_OMIT_VIRTUALTABLE) && defined(SQLITE_ENABLE_DBPAGE_VTAB) |
2982 |
-- sqlite3_dbdata_init(p->db, 0, 0); |
2983 |
--#endif |
2984 |
--#ifdef SQLITE_HAVE_ZLIB |
2985 |
-- sqlite3_zipfile_init(p->db, 0, 0); |
2986 |
-- sqlite3_sqlar_init(p->db, 0, 0); |
2987 |
--#endif |
2988 |
- sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, |
2989 |
- shellAddSchemaName, 0, 0); |
2990 |
- sqlite3_create_function(p->db, "shell_module_schema", 1, SQLITE_UTF8, 0, |
2991 |
-@@ -6644,8 +6617,6 @@ |
2992 |
- ); |
2993 |
- goto end_ar_command; |
2994 |
- } |
2995 |
-- sqlite3_fileio_init(cmd.db, 0, 0); |
2996 |
-- sqlite3_sqlar_init(cmd.db, 0, 0); |
2997 |
- sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, |
2998 |
- shellPutsFunc, 0, 0); |
2999 |
- |
3000 |
-@@ -11076,6 +11047,7 @@ |
3001 |
- #endif |
3002 |
- } |
3003 |
- data.out = stdout; |
3004 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); |
3005 |
- sqlite3_appendvfs_init(0,0,0); |
3006 |
- |
3007 |
- /* Go ahead and open the database file if it already exists. If the |
3008 |
---- /src/test_config.c |
3009 |
-+++ /src/test_config.c |
3010 |
-@@ -353,6 +353,8 @@ |
3011 |
- Tcl_SetVar2(interp, "sqlite_options", "datetime", "1", TCL_GLOBAL_ONLY); |
3012 |
- #endif |
3013 |
- |
3014 |
-+ Tcl_SetVar2(interp, "sqlite_options", "decimal", "1", TCL_GLOBAL_ONLY); |
3015 |
-+ |
3016 |
- #ifdef SQLITE_OMIT_DECLTYPE |
3017 |
- Tcl_SetVar2(interp, "sqlite_options", "decltype", "0", TCL_GLOBAL_ONLY); |
3018 |
- #else |
3019 |
-@@ -540,6 +542,8 @@ |
3020 |
- Tcl_SetVar2(interp, "sqlite_options", "progress", "1", TCL_GLOBAL_ONLY); |
3021 |
- #endif |
3022 |
- |
3023 |
-+ Tcl_SetVar2(interp, "sqlite_options", "regexp", "1", TCL_GLOBAL_ONLY); |
3024 |
-+ |
3025 |
- #ifdef SQLITE_OMIT_REINDEX |
3026 |
- Tcl_SetVar2(interp, "sqlite_options", "reindex", "0", TCL_GLOBAL_ONLY); |
3027 |
- #else |
3028 |
-@@ -662,6 +666,8 @@ |
3029 |
- Tcl_SetVar2(interp, "sqlite_options", "truncate_opt", "1", TCL_GLOBAL_ONLY); |
3030 |
- #endif |
3031 |
- |
3032 |
-+ Tcl_SetVar2(interp, "sqlite_options", "uint", "1", TCL_GLOBAL_ONLY); |
3033 |
-+ |
3034 |
- #ifdef SQLITE_OMIT_UTF16 |
3035 |
- Tcl_SetVar2(interp, "sqlite_options", "utf16", "0", TCL_GLOBAL_ONLY); |
3036 |
- #else |
3037 |
---- /test/e_expr.test |
3038 |
-+++ /test/e_expr.test |
3039 |
-@@ -1079,7 +1079,7 @@ |
3040 |
- # |
3041 |
- # There is a regexp function if ICU is enabled though. |
3042 |
- # |
3043 |
--ifcapable !icu { |
3044 |
-+ifcapable !icu&&!regexp { |
3045 |
- do_catchsql_test e_expr-18.1.1 { |
3046 |
- SELECT regexp('abc', 'def') |
3047 |
- } {1 {no such function: regexp}} |
3048 |
---- /test/icu.test |
3049 |
-+++ /test/icu.test |
3050 |
-@@ -41,7 +41,7 @@ |
3051 |
- # |
3052 |
- test_expr icu-1.1 {i1='hello'} {i1 REGEXP 'hello'} 1 |
3053 |
- test_expr icu-1.2 {i1='hello'} {i1 REGEXP '.ello'} 1 |
3054 |
-- test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell'} 0 |
3055 |
-+ test_expr icu-1.3 {i1='hello'} {i1 REGEXP '.ell$'} 0 |
3056 |
- test_expr icu-1.4 {i1='hello'} {i1 REGEXP '.ell.*'} 1 |
3057 |
- test_expr icu-1.5 {i1=NULL} {i1 REGEXP '.ell.*'} {} |
3058 |
- |
3059 |
---- /test/pragma.test |
3060 |
-+++ /test/pragma.test |
3061 |
-@@ -1370,17 +1370,62 @@ |
3062 |
- } ;# ifcapable trigger |
3063 |
- |
3064 |
- ifcapable schema_pragmas { |
3065 |
-- do_test pragma-11.1 { |
3066 |
-- execsql2 { |
3067 |
-- pragma collation_list; |
3068 |
-+ ifcapable decimal { |
3069 |
-+ ifcapable uint { |
3070 |
-+ do_test pragma-11.1 { |
3071 |
-+ execsql2 { |
3072 |
-+ pragma collation_list; |
3073 |
-+ } |
3074 |
-+ } {seq 0 name UINT seq 1 name decimal seq 2 name RTRIM seq 3 name NOCASE seq 4 name BINARY} |
3075 |
-+ do_test pragma-11.2 { |
3076 |
-+ db collate New_Collation blah... |
3077 |
-+ execsql { |
3078 |
-+ pragma collation_list; |
3079 |
-+ } |
3080 |
-+ } {0 New_Collation 1 UINT 2 decimal 3 RTRIM 4 NOCASE 5 BINARY} |
3081 |
- } |
3082 |
-- } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY} |
3083 |
-- do_test pragma-11.2 { |
3084 |
-- db collate New_Collation blah... |
3085 |
-- execsql { |
3086 |
-- pragma collation_list; |
3087 |
-+ ifcapable !uint { |
3088 |
-+ do_test pragma-11.1 { |
3089 |
-+ execsql2 { |
3090 |
-+ pragma collation_list; |
3091 |
-+ } |
3092 |
-+ } {seq 0 name decimal seq 1 name RTRIM seq 2 name NOCASE seq 3 name BINARY} |
3093 |
-+ do_test pragma-11.2 { |
3094 |
-+ db collate New_Collation blah... |
3095 |
-+ execsql { |
3096 |
-+ pragma collation_list; |
3097 |
-+ } |
3098 |
-+ } {0 New_Collation 1 decimal 2 RTRIM 3 NOCASE 4 BINARY} |
3099 |
- } |
3100 |
-- } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY} |
3101 |
-+ } |
3102 |
-+ ifcapable !decimal { |
3103 |
-+ ifcapable uint { |
3104 |
-+ do_test pragma-11.1 { |
3105 |
-+ execsql2 { |
3106 |
-+ pragma collation_list; |
3107 |
-+ } |
3108 |
-+ } {seq 0 name UINT seq 1 name RTRIM seq 2 name NOCASE seq 3 name BINARY} |
3109 |
-+ do_test pragma-11.2 { |
3110 |
-+ db collate New_Collation blah... |
3111 |
-+ execsql { |
3112 |
-+ pragma collation_list; |
3113 |
-+ } |
3114 |
-+ } {0 New_Collation 1 UINT 2 RTRIM 3 NOCASE 4 BINARY} |
3115 |
-+ } |
3116 |
-+ ifcapable !uint { |
3117 |
-+ do_test pragma-11.1 { |
3118 |
-+ execsql2 { |
3119 |
-+ pragma collation_list; |
3120 |
-+ } |
3121 |
-+ } {seq 0 name RTRIM seq 1 name NOCASE seq 2 name BINARY} |
3122 |
-+ do_test pragma-11.2 { |
3123 |
-+ db collate New_Collation blah... |
3124 |
-+ execsql { |
3125 |
-+ pragma collation_list; |
3126 |
-+ } |
3127 |
-+ } {0 New_Collation 1 RTRIM 2 NOCASE 3 BINARY} |
3128 |
-+ } |
3129 |
-+ } |
3130 |
- } |
3131 |
- |
3132 |
- ifcapable schema_pragmas&&tempdb { |
3133 |
---- /test/sessionfuzz.c |
3134 |
-+++ /test/sessionfuzz.c |
3135 |
-@@ -698,49 +698,6 @@ |
3136 |
- #include <stdio.h> |
3137 |
- #include <string.h> |
3138 |
- #include <assert.h> |
3139 |
--#ifndef OMIT_ZLIB |
3140 |
--#include "zlib.h" |
3141 |
--#endif |
3142 |
-- |
3143 |
--/* |
3144 |
--** Implementation of the "sqlar_uncompress(X,SZ)" SQL function |
3145 |
--** |
3146 |
--** Parameter SZ is interpreted as an integer. If it is less than or |
3147 |
--** equal to zero, then this function returns a copy of X. Or, if |
3148 |
--** SZ is equal to the size of X when interpreted as a blob, also |
3149 |
--** return a copy of X. Otherwise, decompress blob X using zlib |
3150 |
--** utility function uncompress() and return the results (another |
3151 |
--** blob). |
3152 |
--*/ |
3153 |
--static void sqlarUncompressFunc( |
3154 |
-- sqlite3_context *context, |
3155 |
-- int argc, |
3156 |
-- sqlite3_value **argv |
3157 |
--){ |
3158 |
--#ifdef OMIT_ZLIB |
3159 |
-- sqlite3_result_value(context, argv[0]); |
3160 |
--#else |
3161 |
-- uLong nData; |
3162 |
-- uLongf sz; |
3163 |
-- |
3164 |
-- assert( argc==2 ); |
3165 |
-- sz = sqlite3_value_int(argv[1]); |
3166 |
-- |
3167 |
-- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){ |
3168 |
-- sqlite3_result_value(context, argv[0]); |
3169 |
-- }else{ |
3170 |
-- const Bytef *pData= sqlite3_value_blob(argv[0]); |
3171 |
-- Bytef *pOut = sqlite3_malloc(sz); |
3172 |
-- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){ |
3173 |
-- sqlite3_result_error(context, "error in uncompress()", -1); |
3174 |
-- }else{ |
3175 |
-- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT); |
3176 |
-- } |
3177 |
-- sqlite3_free(pOut); |
3178 |
-- } |
3179 |
--#endif |
3180 |
--} |
3181 |
-- |
3182 |
- |
3183 |
- /* Run a chunk of SQL. If any errors happen, print an error message |
3184 |
- ** and exit. |
3185 |
---- /tool/mksqlite3c.tcl |
3186 |
-+++ /tool/mksqlite3c.tcl |
3187 |
-@@ -129,6 +129,7 @@ |
3188 |
- rtree.h |
3189 |
- sqlite3session.h |
3190 |
- sqlite3.h |
3191 |
-+ sqlite3expert.h |
3192 |
- sqlite3ext.h |
3193 |
- sqlite3rbu.h |
3194 |
- sqliteicu.h |
3195 |
-@@ -416,6 +417,28 @@ |
3196 |
- sqlite3session.c |
3197 |
- fts5.c |
3198 |
- stmt.c |
3199 |
-+ amatch.c |
3200 |
-+ appendvfs.c |
3201 |
-+ carray.c |
3202 |
-+ completion.c |
3203 |
-+ csv.c |
3204 |
-+ dbdata.c |
3205 |
-+ decimal.c |
3206 |
-+ eval.c |
3207 |
-+ fileio.c |
3208 |
-+ ieee754.c |
3209 |
-+ nextchar.c |
3210 |
-+ percentile.c |
3211 |
-+ regexp.c |
3212 |
-+ series.c |
3213 |
-+ sha1.c |
3214 |
-+ shathree.c |
3215 |
-+ sqlar.c |
3216 |
-+ sqlite3expert.c |
3217 |
-+ totype.c |
3218 |
-+ uint.c |
3219 |
-+ uuid.c |
3220 |
-+ zipfile.c |
3221 |
- } { |
3222 |
- copy_file tsrc/$file |
3223 |
- } |
3224 |
---- /tool/sqlite3_analyzer.c.in |
3225 |
-+++ /tool/sqlite3_analyzer.c.in |
3226 |
-@@ -14,9 +14,6 @@ |
3227 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
3228 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
3229 |
- #define SQLITE_OMIT_LOAD_EXTENSION 1 |
3230 |
--#ifndef USE_EXTERNAL_SQLITE |
3231 |
--INCLUDE sqlite3.c |
3232 |
--#endif |
3233 |
- INCLUDE $ROOT/src/tclsqlite.c |
3234 |
- |
3235 |
- const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ |
3236 |
---- /tool/sqltclsh.c.in |
3237 |
-+++ /tool/sqltclsh.c.in |
3238 |
-@@ -27,21 +27,13 @@ |
3239 |
- #define SQLITE_OMIT_SHARED_CACHE 1 |
3240 |
- #define SQLITE_DEFAULT_MEMSTATUS 0 |
3241 |
- #define SQLITE_MAX_EXPR_DEPTH 0 |
3242 |
--INCLUDE sqlite3.c |
3243 |
--INCLUDE $ROOT/ext/misc/appendvfs.c |
3244 |
--#ifdef SQLITE_HAVE_ZLIB |
3245 |
--INCLUDE $ROOT/ext/misc/zipfile.c |
3246 |
--INCLUDE $ROOT/ext/misc/sqlar.c |
3247 |
--#endif |
3248 |
-+#include "sqlite3.h" |
3249 |
- INCLUDE $ROOT/src/tclsqlite.c |
3250 |
- |
3251 |
- const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ |
3252 |
- (void)interp; |
3253 |
-+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); |
3254 |
- sqlite3_appendvfs_init(0,0,0); |
3255 |
--#ifdef SQLITE_HAVE_ZLIB |
3256 |
-- sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); |
3257 |
-- sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); |
3258 |
--#endif |
3259 |
- |
3260 |
- return |
3261 |
- BEGIN_STRING |
3262 |
|
3263 |
diff --git a/dev-db/sqlite/sqlite-3.33.0.ebuild b/dev-db/sqlite/sqlite-3.33.0.ebuild |
3264 |
deleted file mode 100644 |
3265 |
index 2ce5d1d4506..00000000000 |
3266 |
--- a/dev-db/sqlite/sqlite-3.33.0.ebuild |
3267 |
+++ /dev/null |
3268 |
@@ -1,374 +0,0 @@ |
3269 |
-# Copyright 1999-2021 Gentoo Authors |
3270 |
-# Distributed under the terms of the GNU General Public License v2 |
3271 |
- |
3272 |
-EAPI="7" |
3273 |
- |
3274 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
3275 |
- |
3276 |
-if [[ "${PV}" != "9999" ]]; then |
3277 |
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" |
3278 |
- DOC_PV="${SRC_PV}" |
3279 |
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" |
3280 |
-fi |
3281 |
- |
3282 |
-DESCRIPTION="SQL database engine" |
3283 |
-HOMEPAGE="https://sqlite.org/" |
3284 |
-if [[ "${PV}" == "9999" ]]; then |
3285 |
- SRC_URI="" |
3286 |
-else |
3287 |
- SRC_URI="https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip |
3288 |
- doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip )" |
3289 |
-fi |
3290 |
- |
3291 |
-LICENSE="public-domain" |
3292 |
-SLOT="3" |
3293 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
3294 |
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
3295 |
-if [[ "${PV}" == "9999" ]]; then |
3296 |
- PROPERTIES="live" |
3297 |
-fi |
3298 |
-RESTRICT="!test? ( test )" |
3299 |
- |
3300 |
-if [[ "${PV}" == "9999" ]]; then |
3301 |
- BDEPEND=">=dev-lang/tcl-8.6:0 |
3302 |
- dev-vcs/fossil" |
3303 |
-else |
3304 |
- BDEPEND="app-arch/unzip |
3305 |
- >=dev-lang/tcl-8.6:0" |
3306 |
-fi |
3307 |
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
3308 |
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
3309 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
3310 |
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
3311 |
- tools? ( dev-lang/tcl:0= )" |
3312 |
-DEPEND="${RDEPEND} |
3313 |
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
3314 |
- |
3315 |
-if [[ "${PV}" == "9999" ]]; then |
3316 |
- S="${WORKDIR}/${PN}" |
3317 |
-else |
3318 |
- S="${WORKDIR}/${PN}-src-${SRC_PV}" |
3319 |
-fi |
3320 |
- |
3321 |
-src_unpack() { |
3322 |
- if [[ "${PV}" == "9999" ]]; then |
3323 |
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" |
3324 |
- addwrite "${distdir}" |
3325 |
- mkdir -p "${distdir}/fossil-src/${PN}" || die |
3326 |
- |
3327 |
- mkdir "${WORKDIR}/${PN}" || die |
3328 |
- pushd "${WORKDIR}/${PN}" > /dev/null || die |
3329 |
- if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite.fossil" ]]; then |
3330 |
- einfo fossil clone --verbose https://sqlite.org/src sqlite.fossil |
3331 |
- fossil clone --verbose https://sqlite.org/src sqlite.fossil || die |
3332 |
- echo |
3333 |
- else |
3334 |
- cp -p "${distdir}/fossil-src/${PN}/sqlite.fossil" . || die |
3335 |
- einfo fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src |
3336 |
- fossil pull --repository sqlite.fossil --verbose https://sqlite.org/src || die |
3337 |
- echo |
3338 |
- fi |
3339 |
- cp -p sqlite.fossil "${distdir}/fossil-src/${PN}" || die |
3340 |
- einfo fossil open --quiet sqlite.fossil |
3341 |
- fossil open --quiet sqlite.fossil || die |
3342 |
- echo |
3343 |
- popd > /dev/null || die |
3344 |
- |
3345 |
- if use doc; then |
3346 |
- mkdir "${WORKDIR}/${PN}-doc" || die |
3347 |
- pushd "${WORKDIR}/${PN}-doc" > /dev/null || die |
3348 |
- if [[ ! -f "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" ]]; then |
3349 |
- einfo fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil |
3350 |
- fossil clone --verbose https://sqlite.org/docsrc sqlite-doc.fossil || die |
3351 |
- echo |
3352 |
- else |
3353 |
- cp -p "${distdir}/fossil-src/${PN}/sqlite-doc.fossil" . || die |
3354 |
- einfo fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc |
3355 |
- fossil pull --repository sqlite-doc.fossil --verbose https://sqlite.org/docsrc || die |
3356 |
- echo |
3357 |
- fi |
3358 |
- cp -p sqlite-doc.fossil "${distdir}/fossil-src/${PN}" || die |
3359 |
- einfo fossil open --quiet sqlite-doc.fossil |
3360 |
- fossil open --quiet sqlite-doc.fossil || die |
3361 |
- echo |
3362 |
- popd > /dev/null || die |
3363 |
- fi |
3364 |
- else |
3365 |
- default |
3366 |
- fi |
3367 |
-} |
3368 |
- |
3369 |
-src_prepare() { |
3370 |
- eapply "${FILESDIR}/"${PN}-3.33.0-build_{1.1,1.2,2.1,2.2}.patch |
3371 |
- |
3372 |
- eapply_user |
3373 |
- |
3374 |
- eautoreconf |
3375 |
- |
3376 |
- multilib_copy_sources |
3377 |
-} |
3378 |
- |
3379 |
-multilib_src_configure() { |
3380 |
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" |
3381 |
- local options=() |
3382 |
- |
3383 |
- options+=( |
3384 |
- --enable-load-extension |
3385 |
- --enable-threadsafe |
3386 |
- ) |
3387 |
- |
3388 |
- # Support detection of misuse of SQLite API. |
3389 |
- # https://sqlite.org/compile.html#enable_api_armor |
3390 |
- append-cppflags -DSQLITE_ENABLE_API_ARMOR |
3391 |
- |
3392 |
- # Support bytecode and tables_used virtual tables. |
3393 |
- # https://sqlite.org/compile.html#enable_bytecode_vtab |
3394 |
- # https://sqlite.org/bytecodevtab.html |
3395 |
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB |
3396 |
- |
3397 |
- # Support column metadata functions. |
3398 |
- # https://sqlite.org/compile.html#enable_column_metadata |
3399 |
- # https://sqlite.org/c3ref/column_database_name.html |
3400 |
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
3401 |
- |
3402 |
- # Support sqlite_dbpage virtual table. |
3403 |
- # https://sqlite.org/compile.html#enable_dbpage_vtab |
3404 |
- # https://sqlite.org/dbpage.html |
3405 |
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
3406 |
- |
3407 |
- # Support dbstat virtual table. |
3408 |
- # https://sqlite.org/compile.html#enable_dbstat_vtab |
3409 |
- # https://sqlite.org/dbstat.html |
3410 |
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
3411 |
- |
3412 |
- # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
3413 |
- # https://sqlite.org/compile.html#enable_deserialize |
3414 |
- # https://sqlite.org/c3ref/serialize.html |
3415 |
- # https://sqlite.org/c3ref/deserialize.html |
3416 |
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
3417 |
- |
3418 |
- # Support comments in output of EXPLAIN. |
3419 |
- # https://sqlite.org/compile.html#enable_explain_comments |
3420 |
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
3421 |
- |
3422 |
- # Support Full-Text Search versions 3, 4 and 5. |
3423 |
- # https://sqlite.org/compile.html#enable_fts3 |
3424 |
- # https://sqlite.org/compile.html#enable_fts3_parenthesis |
3425 |
- # https://sqlite.org/compile.html#enable_fts4 |
3426 |
- # https://sqlite.org/compile.html#enable_fts5 |
3427 |
- # https://sqlite.org/fts3.html |
3428 |
- # https://sqlite.org/fts5.html |
3429 |
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
3430 |
- options+=(--enable-fts5) |
3431 |
- |
3432 |
- # Support hidden columns. |
3433 |
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
3434 |
- |
3435 |
- # Support JSON1 extension. |
3436 |
- # https://sqlite.org/compile.html#enable_json1 |
3437 |
- # https://sqlite.org/json1.html |
3438 |
- append-cppflags -DSQLITE_ENABLE_JSON1 |
3439 |
- |
3440 |
- # Support memsys5 memory allocator. |
3441 |
- # https://sqlite.org/compile.html#enable_memsys5 |
3442 |
- # https://sqlite.org/malloc.html#memsys5 |
3443 |
- append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
3444 |
- |
3445 |
- # Support sqlite3_normalized_sql() function. |
3446 |
- # https://sqlite.org/c3ref/expanded_sql.html |
3447 |
- append-cppflags -DSQLITE_ENABLE_NORMALIZE |
3448 |
- |
3449 |
- # Support sqlite_offset() function. |
3450 |
- # https://sqlite.org/compile.html#enable_offset_sql_func |
3451 |
- # https://sqlite.org/lang_corefunc.html#sqlite_offset |
3452 |
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
3453 |
- |
3454 |
- # Support pre-update hook functions. |
3455 |
- # https://sqlite.org/compile.html#enable_preupdate_hook |
3456 |
- # https://sqlite.org/c3ref/preupdate_count.html |
3457 |
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
3458 |
- |
3459 |
- # Support Resumable Bulk Update extension. |
3460 |
- # https://sqlite.org/compile.html#enable_rbu |
3461 |
- # https://sqlite.org/rbu.html |
3462 |
- append-cppflags -DSQLITE_ENABLE_RBU |
3463 |
- |
3464 |
- # Support R*Trees. |
3465 |
- # https://sqlite.org/compile.html#enable_rtree |
3466 |
- # https://sqlite.org/compile.html#enable_geopoly |
3467 |
- # https://sqlite.org/rtree.html |
3468 |
- # https://sqlite.org/geopoly.html |
3469 |
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY |
3470 |
- |
3471 |
- # Support Session extension. |
3472 |
- # https://sqlite.org/compile.html#enable_session |
3473 |
- # https://sqlite.org/sessionintro.html |
3474 |
- append-cppflags -DSQLITE_ENABLE_SESSION |
3475 |
- |
3476 |
- # Support scan status functions. |
3477 |
- # https://sqlite.org/compile.html#enable_stmt_scanstatus |
3478 |
- # https://sqlite.org/c3ref/stmt_scanstatus.html |
3479 |
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
3480 |
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
3481 |
- |
3482 |
- # Support sqlite_stmt virtual table. |
3483 |
- # https://sqlite.org/compile.html#enable_stmtvtab |
3484 |
- # https://sqlite.org/stmt.html |
3485 |
- append-cppflags -DSQLITE_ENABLE_STMTVTAB |
3486 |
- |
3487 |
- # Support unknown() function. |
3488 |
- # https://sqlite.org/compile.html#enable_unknown_sql_function |
3489 |
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
3490 |
- |
3491 |
- # Support unlock notification. |
3492 |
- # https://sqlite.org/compile.html#enable_unlock_notify |
3493 |
- # https://sqlite.org/c3ref/unlock_notify.html |
3494 |
- # https://sqlite.org/unlock_notify.html |
3495 |
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
3496 |
- |
3497 |
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
3498 |
- # https://sqlite.org/compile.html#enable_update_delete_limit |
3499 |
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses |
3500 |
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses |
3501 |
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
3502 |
- |
3503 |
- # Support soundex() function. |
3504 |
- # https://sqlite.org/compile.html#soundex |
3505 |
- # https://sqlite.org/lang_corefunc.html#soundex |
3506 |
- append-cppflags -DSQLITE_SOUNDEX |
3507 |
- |
3508 |
- # Support URI filenames. |
3509 |
- # https://sqlite.org/compile.html#use_uri |
3510 |
- # https://sqlite.org/uri.html |
3511 |
- append-cppflags -DSQLITE_USE_URI |
3512 |
- |
3513 |
- # debug USE flag. |
3514 |
- options+=($(use_enable debug)) |
3515 |
- |
3516 |
- # icu USE flag. |
3517 |
- if use icu; then |
3518 |
- # Support ICU extension. |
3519 |
- # https://sqlite.org/compile.html#enable_icu |
3520 |
- append-cppflags -DSQLITE_ENABLE_ICU |
3521 |
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
3522 |
- fi |
3523 |
- |
3524 |
- # readline USE flag. |
3525 |
- options+=( |
3526 |
- --disable-editline |
3527 |
- $(use_enable readline) |
3528 |
- ) |
3529 |
- if use readline; then |
3530 |
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline") |
3531 |
- fi |
3532 |
- |
3533 |
- # secure-delete USE flag. |
3534 |
- if use secure-delete; then |
3535 |
- # Enable secure_delete pragma by default. |
3536 |
- # https://sqlite.org/compile.html#secure_delete |
3537 |
- # https://sqlite.org/pragma.html#pragma_secure_delete |
3538 |
- append-cppflags -DSQLITE_SECURE_DELETE |
3539 |
- fi |
3540 |
- |
3541 |
- # static-libs USE flag. |
3542 |
- options+=($(use_enable static-libs static)) |
3543 |
- |
3544 |
- # tcl, test, tools USE flags. |
3545 |
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
3546 |
- options+=( |
3547 |
- --enable-tcl |
3548 |
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
3549 |
- ) |
3550 |
- else |
3551 |
- options+=(--disable-tcl) |
3552 |
- fi |
3553 |
- |
3554 |
- if [[ "${CHOST}" == *-mint* ]]; then |
3555 |
- # sys/mman.h not available in MiNTLib. |
3556 |
- # https://sqlite.org/compile.html#omit_wal |
3557 |
- append-cppflags -DSQLITE_OMIT_WAL |
3558 |
- fi |
3559 |
- |
3560 |
- if [[ "${ABI}" == "x86" ]]; then |
3561 |
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
3562 |
- append-cflags -mfpmath=sse |
3563 |
- else |
3564 |
- append-cflags -ffloat-store |
3565 |
- fi |
3566 |
- fi |
3567 |
- |
3568 |
- econf "${options[@]}" |
3569 |
-} |
3570 |
- |
3571 |
-multilib_src_compile() { |
3572 |
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
3573 |
- |
3574 |
- if use tools && multilib_is_native_abi; then |
3575 |
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
3576 |
- fi |
3577 |
-} |
3578 |
- |
3579 |
-multilib_src_test() { |
3580 |
- if [[ "${EUID}" -eq 0 ]]; then |
3581 |
- ewarn "Skipping tests due to root permissions" |
3582 |
- return |
3583 |
- fi |
3584 |
- |
3585 |
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" |
3586 |
- |
3587 |
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
3588 |
-} |
3589 |
- |
3590 |
-multilib_src_install() { |
3591 |
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
3592 |
- |
3593 |
- if use tools && multilib_is_native_abi; then |
3594 |
- install_tool() { |
3595 |
- if [[ -f ".libs/${1}" ]]; then |
3596 |
- newbin ".libs/${1}" "${2}" |
3597 |
- else |
3598 |
- newbin "${1}" "${2}" |
3599 |
- fi |
3600 |
- } |
3601 |
- |
3602 |
- install_tool changeset sqlite3-changeset |
3603 |
- install_tool dbdump sqlite3-db-dump |
3604 |
- install_tool dbhash sqlite3-db-hash |
3605 |
- install_tool dbtotxt sqlite3-db-to-txt |
3606 |
- install_tool index_usage sqlite3-index-usage |
3607 |
- install_tool rbu sqlite3-rbu |
3608 |
- install_tool scrub sqlite3-scrub |
3609 |
- install_tool showdb sqlite3-show-db |
3610 |
- install_tool showjournal sqlite3-show-journal |
3611 |
- install_tool showshm sqlite3-show-shm |
3612 |
- install_tool showstat4 sqlite3-show-stat4 |
3613 |
- install_tool showwal sqlite3-show-wal |
3614 |
- install_tool sqldiff sqlite3-diff |
3615 |
- install_tool sqlite3_analyzer sqlite3-analyzer |
3616 |
- install_tool sqlite3_checker sqlite3-checker |
3617 |
- install_tool sqlite3_expert sqlite3-expert |
3618 |
- install_tool sqltclsh sqlite3-tclsh |
3619 |
- |
3620 |
- unset -f install_tool |
3621 |
- fi |
3622 |
-} |
3623 |
- |
3624 |
-multilib_src_install_all() { |
3625 |
- find "${D}" -name "*.la" -type f -delete || die |
3626 |
- |
3627 |
- doman sqlite3.1 |
3628 |
- |
3629 |
- if use doc; then |
3630 |
- if [[ "${PV}" == "9999" ]]; then |
3631 |
- pushd "${WORKDIR}/${PN}-doc" > /dev/null || die |
3632 |
- else |
3633 |
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die |
3634 |
- fi |
3635 |
- rm *.db *.txt || die |
3636 |
- ( |
3637 |
- docinto html |
3638 |
- dodoc -r * |
3639 |
- ) |
3640 |
- popd > /dev/null || die |
3641 |
- fi |
3642 |
-} |
3643 |
|
3644 |
diff --git a/dev-db/sqlite/sqlite-3.34.0.ebuild b/dev-db/sqlite/sqlite-3.34.0.ebuild |
3645 |
deleted file mode 100644 |
3646 |
index e9d419d08e7..00000000000 |
3647 |
--- a/dev-db/sqlite/sqlite-3.34.0.ebuild |
3648 |
+++ /dev/null |
3649 |
@@ -1,434 +0,0 @@ |
3650 |
-# Copyright 1999-2021 Gentoo Authors |
3651 |
-# Distributed under the terms of the GNU General Public License v2 |
3652 |
- |
3653 |
-EAPI="7" |
3654 |
- |
3655 |
-inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
3656 |
- |
3657 |
-if [[ "${PV}" != "9999" ]]; then |
3658 |
- SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" |
3659 |
- DOC_PV="${SRC_PV}" |
3660 |
- # DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" |
3661 |
-fi |
3662 |
- |
3663 |
-DESCRIPTION="SQL database engine" |
3664 |
-HOMEPAGE="https://sqlite.org/" |
3665 |
-if [[ "${PV}" == "9999" ]]; then |
3666 |
- SRC_URI="" |
3667 |
-else |
3668 |
- SRC_URI="https://sqlite.org/2020/${PN}-src-${SRC_PV}.zip |
3669 |
- doc? ( https://sqlite.org/2020/${PN}-doc-${DOC_PV}.zip )" |
3670 |
-fi |
3671 |
- |
3672 |
-LICENSE="public-domain" |
3673 |
-SLOT="3" |
3674 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
3675 |
-IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
3676 |
-if [[ "${PV}" == "9999" ]]; then |
3677 |
- PROPERTIES="live" |
3678 |
-fi |
3679 |
-RESTRICT="!test? ( test )" |
3680 |
- |
3681 |
-if [[ "${PV}" == "9999" ]]; then |
3682 |
- BDEPEND=">=dev-lang/tcl-8.6:0 |
3683 |
- dev-vcs/fossil" |
3684 |
-else |
3685 |
- BDEPEND="app-arch/unzip |
3686 |
- >=dev-lang/tcl-8.6:0" |
3687 |
-fi |
3688 |
-RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
3689 |
- icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
3690 |
- readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
3691 |
- tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
3692 |
- tools? ( dev-lang/tcl:0= )" |
3693 |
-DEPEND="${RDEPEND} |
3694 |
- test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
3695 |
- |
3696 |
-if [[ "${PV}" == "9999" ]]; then |
3697 |
- S="${WORKDIR}/${PN}" |
3698 |
-else |
3699 |
- S="${WORKDIR}/${PN}-src-${SRC_PV}" |
3700 |
-fi |
3701 |
- |
3702 |
-_fossil_fetch() { |
3703 |
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" |
3704 |
- local repo_id="${1}" |
3705 |
- local repo_uri="${2}" |
3706 |
- |
3707 |
- local -x FOSSIL_HOME="${HOME}" |
3708 |
- |
3709 |
- mkdir -p "${T}/fossil/${repo_id}" || die |
3710 |
- pushd "${T}/fossil/${repo_id}" > /dev/null || die |
3711 |
- |
3712 |
- if [[ -n "${EVCS_OFFLINE}" ]]; then |
3713 |
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then |
3714 |
- die "Network activity disabled using EVCS_OFFLINE and clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" |
3715 |
- fi |
3716 |
- else |
3717 |
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then |
3718 |
- einfo fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" |
3719 |
- fossil clone --verbose "${repo_uri}" "${repo_id}.fossil" || die |
3720 |
- echo |
3721 |
- else |
3722 |
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" . || die |
3723 |
- einfo fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" |
3724 |
- fossil pull --repository "${repo_id}.fossil" --verbose "${repo_uri}" || die |
3725 |
- echo |
3726 |
- fi |
3727 |
- |
3728 |
- ( |
3729 |
- addwrite "${distdir}" |
3730 |
- mkdir -p "${distdir}/fossil-src/${repo_id}" || die |
3731 |
- cp -p "${repo_id}.fossil" "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" || die |
3732 |
- ) |
3733 |
- fi |
3734 |
- |
3735 |
- popd > /dev/null || die |
3736 |
-} |
3737 |
- |
3738 |
-_fossil_checkout() { |
3739 |
- local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" |
3740 |
- local repo_id="${1}" |
3741 |
- local branch_or_commit="${2}" |
3742 |
- local target_directory="${3}" |
3743 |
- |
3744 |
- local -x FOSSIL_HOME="${HOME}" |
3745 |
- |
3746 |
- if [[ ! -f "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" ]]; then |
3747 |
- die "Clone of repository missing: \"${distdir}/fossil-src/${repo_id}/${repo_id}.fossil\"" |
3748 |
- fi |
3749 |
- |
3750 |
- if [[ ! -f "${T}/fossil/${repo_id}/${repo_id}.fossil" ]]; then |
3751 |
- mkdir -p "${T}/fossil/${repo_id}" || die |
3752 |
- cp -p "${distdir}/fossil-src/${repo_id}/${repo_id}.fossil" "${T}/fossil/${repo_id}" || die |
3753 |
- fi |
3754 |
- |
3755 |
- mkdir "${target_directory}" || die |
3756 |
- pushd "${target_directory}" > /dev/null || die |
3757 |
- |
3758 |
- einfo fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" |
3759 |
- fossil open --quiet "${T}/fossil/${repo_id}/${repo_id}.fossil" "${branch_or_commit}" || die |
3760 |
- echo |
3761 |
- |
3762 |
- popd > /dev/null || die |
3763 |
-} |
3764 |
- |
3765 |
-fossil_fetch() { |
3766 |
- local repo_id="${1}" |
3767 |
- local repo_uri="${2}" |
3768 |
- local target_directory="${3}" |
3769 |
- |
3770 |
- local branch_or_commit="${EFOSSIL_COMMIT:-${EFOSSIL_BRANCH:-trunk}}" |
3771 |
- |
3772 |
- _fossil_fetch "${repo_id}" "${repo_uri}" |
3773 |
- _fossil_checkout "${repo_id}" "${branch_or_commit}" "${target_directory}" |
3774 |
-} |
3775 |
- |
3776 |
-src_unpack() { |
3777 |
- if [[ "${PV}" == "9999" ]]; then |
3778 |
- fossil_fetch sqlite https://sqlite.org/src "${WORKDIR}/${PN}" |
3779 |
- if use doc; then |
3780 |
- fossil_fetch sqlite-doc https://sqlite.org/docsrc "${WORKDIR}/${PN}-doc" |
3781 |
- fi |
3782 |
- else |
3783 |
- default |
3784 |
- fi |
3785 |
-} |
3786 |
- |
3787 |
-src_prepare() { |
3788 |
- eapply "${FILESDIR}/"${PN}-3.34.0-build_{1.1,1.2,2.1,2.2}.patch |
3789 |
- |
3790 |
- eapply_user |
3791 |
- |
3792 |
- eautoreconf |
3793 |
- |
3794 |
- multilib_copy_sources |
3795 |
-} |
3796 |
- |
3797 |
-multilib_src_configure() { |
3798 |
- local -x CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" |
3799 |
- local options=() |
3800 |
- |
3801 |
- options+=( |
3802 |
- --enable-load-extension |
3803 |
- --enable-threadsafe |
3804 |
- ) |
3805 |
- |
3806 |
- # Support detection of misuse of SQLite API. |
3807 |
- # https://sqlite.org/compile.html#enable_api_armor |
3808 |
- append-cppflags -DSQLITE_ENABLE_API_ARMOR |
3809 |
- |
3810 |
- # Support bytecode and tables_used virtual tables. |
3811 |
- # https://sqlite.org/compile.html#enable_bytecode_vtab |
3812 |
- # https://sqlite.org/bytecodevtab.html |
3813 |
- append-cppflags -DSQLITE_ENABLE_BYTECODE_VTAB |
3814 |
- |
3815 |
- # Support column metadata functions. |
3816 |
- # https://sqlite.org/compile.html#enable_column_metadata |
3817 |
- # https://sqlite.org/c3ref/column_database_name.html |
3818 |
- append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
3819 |
- |
3820 |
- # Support sqlite_dbpage virtual table. |
3821 |
- # https://sqlite.org/compile.html#enable_dbpage_vtab |
3822 |
- # https://sqlite.org/dbpage.html |
3823 |
- append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
3824 |
- |
3825 |
- # Support dbstat virtual table. |
3826 |
- # https://sqlite.org/compile.html#enable_dbstat_vtab |
3827 |
- # https://sqlite.org/dbstat.html |
3828 |
- append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
3829 |
- |
3830 |
- # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
3831 |
- # https://sqlite.org/compile.html#enable_deserialize |
3832 |
- # https://sqlite.org/c3ref/serialize.html |
3833 |
- # https://sqlite.org/c3ref/deserialize.html |
3834 |
- append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
3835 |
- |
3836 |
- # Support comments in output of EXPLAIN. |
3837 |
- # https://sqlite.org/compile.html#enable_explain_comments |
3838 |
- append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
3839 |
- |
3840 |
- # Support Full-Text Search versions 3, 4 and 5. |
3841 |
- # https://sqlite.org/compile.html#enable_fts3 |
3842 |
- # https://sqlite.org/compile.html#enable_fts3_parenthesis |
3843 |
- # https://sqlite.org/compile.html#enable_fts4 |
3844 |
- # https://sqlite.org/compile.html#enable_fts5 |
3845 |
- # https://sqlite.org/fts3.html |
3846 |
- # https://sqlite.org/fts5.html |
3847 |
- append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
3848 |
- options+=(--enable-fts5) |
3849 |
- |
3850 |
- # Support hidden columns. |
3851 |
- append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
3852 |
- |
3853 |
- # Support JSON1 extension. |
3854 |
- # https://sqlite.org/compile.html#enable_json1 |
3855 |
- # https://sqlite.org/json1.html |
3856 |
- append-cppflags -DSQLITE_ENABLE_JSON1 |
3857 |
- |
3858 |
- # Support memsys5 memory allocator. |
3859 |
- # https://sqlite.org/compile.html#enable_memsys5 |
3860 |
- # https://sqlite.org/malloc.html#memsys5 |
3861 |
- append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
3862 |
- |
3863 |
- # Support sqlite3_normalized_sql() function. |
3864 |
- # https://sqlite.org/c3ref/expanded_sql.html |
3865 |
- append-cppflags -DSQLITE_ENABLE_NORMALIZE |
3866 |
- |
3867 |
- # Support sqlite_offset() function. |
3868 |
- # https://sqlite.org/compile.html#enable_offset_sql_func |
3869 |
- # https://sqlite.org/lang_corefunc.html#sqlite_offset |
3870 |
- append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
3871 |
- |
3872 |
- # Support pre-update hook functions. |
3873 |
- # https://sqlite.org/compile.html#enable_preupdate_hook |
3874 |
- # https://sqlite.org/c3ref/preupdate_count.html |
3875 |
- append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
3876 |
- |
3877 |
- # Support Resumable Bulk Update extension. |
3878 |
- # https://sqlite.org/compile.html#enable_rbu |
3879 |
- # https://sqlite.org/rbu.html |
3880 |
- append-cppflags -DSQLITE_ENABLE_RBU |
3881 |
- |
3882 |
- # Support R*Trees. |
3883 |
- # https://sqlite.org/compile.html#enable_rtree |
3884 |
- # https://sqlite.org/compile.html#enable_geopoly |
3885 |
- # https://sqlite.org/rtree.html |
3886 |
- # https://sqlite.org/geopoly.html |
3887 |
- append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY |
3888 |
- |
3889 |
- # Support Session extension. |
3890 |
- # https://sqlite.org/compile.html#enable_session |
3891 |
- # https://sqlite.org/sessionintro.html |
3892 |
- append-cppflags -DSQLITE_ENABLE_SESSION |
3893 |
- |
3894 |
- # Support scan status functions. |
3895 |
- # https://sqlite.org/compile.html#enable_stmt_scanstatus |
3896 |
- # https://sqlite.org/c3ref/stmt_scanstatus.html |
3897 |
- # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
3898 |
- append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
3899 |
- |
3900 |
- # Support sqlite_stmt virtual table. |
3901 |
- # https://sqlite.org/compile.html#enable_stmtvtab |
3902 |
- # https://sqlite.org/stmt.html |
3903 |
- append-cppflags -DSQLITE_ENABLE_STMTVTAB |
3904 |
- |
3905 |
- # Support unknown() function. |
3906 |
- # https://sqlite.org/compile.html#enable_unknown_sql_function |
3907 |
- append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
3908 |
- |
3909 |
- # Support unlock notification. |
3910 |
- # https://sqlite.org/compile.html#enable_unlock_notify |
3911 |
- # https://sqlite.org/c3ref/unlock_notify.html |
3912 |
- # https://sqlite.org/unlock_notify.html |
3913 |
- append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
3914 |
- |
3915 |
- # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
3916 |
- # https://sqlite.org/compile.html#enable_update_delete_limit |
3917 |
- # https://sqlite.org/lang_delete.html#optional_limit_and_order_by_clauses |
3918 |
- # https://sqlite.org/lang_update.html#optional_limit_and_order_by_clauses |
3919 |
- append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
3920 |
- |
3921 |
- # Support soundex() function. |
3922 |
- # https://sqlite.org/compile.html#soundex |
3923 |
- # https://sqlite.org/lang_corefunc.html#soundex |
3924 |
- append-cppflags -DSQLITE_SOUNDEX |
3925 |
- |
3926 |
- # Support URI filenames. |
3927 |
- # https://sqlite.org/compile.html#use_uri |
3928 |
- # https://sqlite.org/uri.html |
3929 |
- append-cppflags -DSQLITE_USE_URI |
3930 |
- |
3931 |
- # debug USE flag. |
3932 |
- options+=($(use_enable debug)) |
3933 |
- |
3934 |
- # icu USE flag. |
3935 |
- if use icu; then |
3936 |
- # Support ICU extension. |
3937 |
- # https://sqlite.org/compile.html#enable_icu |
3938 |
- append-cppflags -DSQLITE_ENABLE_ICU |
3939 |
- sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
3940 |
- fi |
3941 |
- |
3942 |
- # readline USE flag. |
3943 |
- options+=( |
3944 |
- --disable-editline |
3945 |
- $(use_enable readline) |
3946 |
- ) |
3947 |
- if use readline; then |
3948 |
- options+=(--with-readline-inc="-I${ESYSROOT}/usr/include/readline") |
3949 |
- fi |
3950 |
- |
3951 |
- # secure-delete USE flag. |
3952 |
- if use secure-delete; then |
3953 |
- # Enable secure_delete pragma by default. |
3954 |
- # https://sqlite.org/compile.html#secure_delete |
3955 |
- # https://sqlite.org/pragma.html#pragma_secure_delete |
3956 |
- append-cppflags -DSQLITE_SECURE_DELETE |
3957 |
- fi |
3958 |
- |
3959 |
- # static-libs USE flag. |
3960 |
- options+=($(use_enable static-libs static)) |
3961 |
- |
3962 |
- # tcl, test, tools USE flags. |
3963 |
- if use tcl || use test || { use tools && multilib_is_native_abi; }; then |
3964 |
- options+=( |
3965 |
- --enable-tcl |
3966 |
- --with-tcl="${ESYSROOT}/usr/$(get_libdir)" |
3967 |
- ) |
3968 |
- else |
3969 |
- options+=(--disable-tcl) |
3970 |
- fi |
3971 |
- |
3972 |
- if [[ "${CHOST}" == *-mint* ]]; then |
3973 |
- # sys/mman.h not available in MiNTLib. |
3974 |
- # https://sqlite.org/compile.html#omit_wal |
3975 |
- append-cppflags -DSQLITE_OMIT_WAL |
3976 |
- fi |
3977 |
- |
3978 |
- if [[ "${ABI}" == "x86" ]]; then |
3979 |
- if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
3980 |
- append-cflags -mfpmath=sse |
3981 |
- else |
3982 |
- append-cflags -ffloat-store |
3983 |
- fi |
3984 |
- fi |
3985 |
- |
3986 |
- econf "${options[@]}" |
3987 |
-} |
3988 |
- |
3989 |
-multilib_src_compile() { |
3990 |
- emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
3991 |
- |
3992 |
- if use tools && multilib_is_native_abi; then |
3993 |
- emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
3994 |
- fi |
3995 |
- |
3996 |
- if [[ "${PV}" == "9999" ]] && use doc && multilib_is_native_abi; then |
3997 |
- emake tclsqlite3.c |
3998 |
- |
3999 |
- local build_directory="$(pwd)" |
4000 |
- build_directory="${build_directory##*/}" |
4001 |
- |
4002 |
- mkdir "${WORKDIR}/${PN}-doc-build" || die |
4003 |
- pushd "${WORKDIR}/${PN}-doc-build" > /dev/null || die |
4004 |
- |
4005 |
- emake -f "../${PN}-doc/Makefile" -j1 SRC="../${PN}" BLD="../${build_directory}" DOC="../${PN}-doc" CC="$(tc-getBUILD_CC)" TCLINC="" TCLFLAGS="$($(tc-getBUILD_PKG_CONFIG) --libs tcl) -ldl -lm" base doc |
4006 |
- rmdir doc/matrix{/*,} || die |
4007 |
- |
4008 |
- popd > /dev/null || die |
4009 |
- fi |
4010 |
-} |
4011 |
- |
4012 |
-multilib_src_test() { |
4013 |
- if [[ "${EUID}" -eq 0 ]]; then |
4014 |
- ewarn "Skipping tests due to root permissions" |
4015 |
- return |
4016 |
- fi |
4017 |
- |
4018 |
- local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" |
4019 |
- |
4020 |
- emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
4021 |
-} |
4022 |
- |
4023 |
-multilib_src_install() { |
4024 |
- emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
4025 |
- |
4026 |
- if use tools && multilib_is_native_abi; then |
4027 |
- install_tool() { |
4028 |
- if [[ -f ".libs/${1}" ]]; then |
4029 |
- newbin ".libs/${1}" "${2}" |
4030 |
- else |
4031 |
- newbin "${1}" "${2}" |
4032 |
- fi |
4033 |
- } |
4034 |
- |
4035 |
- install_tool changeset sqlite3-changeset |
4036 |
- install_tool dbdump sqlite3-db-dump |
4037 |
- install_tool dbhash sqlite3-db-hash |
4038 |
- install_tool dbtotxt sqlite3-db-to-txt |
4039 |
- install_tool index_usage sqlite3-index-usage |
4040 |
- install_tool rbu sqlite3-rbu |
4041 |
- install_tool scrub sqlite3-scrub |
4042 |
- install_tool showdb sqlite3-show-db |
4043 |
- install_tool showjournal sqlite3-show-journal |
4044 |
- install_tool showshm sqlite3-show-shm |
4045 |
- install_tool showstat4 sqlite3-show-stat4 |
4046 |
- install_tool showwal sqlite3-show-wal |
4047 |
- install_tool sqldiff sqlite3-diff |
4048 |
- install_tool sqlite3_analyzer sqlite3-analyzer |
4049 |
- install_tool sqlite3_checker sqlite3-checker |
4050 |
- install_tool sqlite3_expert sqlite3-expert |
4051 |
- install_tool sqltclsh sqlite3-tclsh |
4052 |
- |
4053 |
- unset -f install_tool |
4054 |
- fi |
4055 |
-} |
4056 |
- |
4057 |
-multilib_src_install_all() { |
4058 |
- find "${ED}" -name "*.la" -delete || die |
4059 |
- |
4060 |
- doman sqlite3.1 |
4061 |
- |
4062 |
- if use doc; then |
4063 |
- if [[ "${PV}" == "9999" ]]; then |
4064 |
- pushd "${WORKDIR}/${PN}-doc-build/doc" > /dev/null || die |
4065 |
- else |
4066 |
- pushd "${WORKDIR}/${PN}-doc-${DOC_PV}" > /dev/null || die |
4067 |
- fi |
4068 |
- |
4069 |
- find "(" -name "*.db" -o -name "*.txt" ")" -delete || die |
4070 |
- if [[ "${PV}" != "9999" ]]; then |
4071 |
- rm search search.d/admin || die |
4072 |
- rmdir search.d || die |
4073 |
- find -name "*~" -delete || die |
4074 |
- fi |
4075 |
- |
4076 |
- ( |
4077 |
- docinto html |
4078 |
- dodoc -r * |
4079 |
- ) |
4080 |
- |
4081 |
- popd > /dev/null || die |
4082 |
- fi |
4083 |
-} |