mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-17 18:06:59 +02:00
bump(dev-db/sqlite): sync with upstream
This commit is contained in:
David Michael
parent
5aaa269672
commit
c284a26bef
@ -1,311 +0,0 @@
|
||||
# ChangeLog for dev-db/sqlite
|
||||
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
|
||||
# (auto-generated from git log)
|
||||
|
||||
*sqlite-3.8.10.2 (09 Aug 2015)
|
||||
*sqlite-3.8.10.1 (09 Aug 2015)
|
||||
*sqlite-2.8.16-r5 (09 Aug 2015)
|
||||
|
||||
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org> +files/maketcllib.sh,
|
||||
+files/sqlite-2.8.15-alignement-fix.patch, +files/sqlite-2.8.16-exit.patch,
|
||||
+files/sqlite-2.8.16-multilib.patch,
|
||||
+files/sqlite-3.8.1-autoconf-dlopen_check.patch,
|
||||
+files/sqlite-3.8.1-src-dlopen_check.patch,
|
||||
+files/sqlite-3.8.1-tests-icu-52.patch, +metadata.xml,
|
||||
+sqlite-2.8.16-r5.ebuild, +sqlite-3.8.10.1.ebuild, +sqlite-3.8.10.2.ebuild:
|
||||
proj/gentoo: Initial commit
|
||||
|
||||
This commit represents a new era for Gentoo:
|
||||
Storing the gentoo-x86 tree in Git, as converted from CVS.
|
||||
|
||||
This commit is the start of the NEW history.
|
||||
Any historical data is intended to be grafted onto this point.
|
||||
|
||||
Creation process:
|
||||
1. Take final CVS checkout snapshot
|
||||
2. Remove ALL ChangeLog* files
|
||||
3. Transform all Manifests to thin
|
||||
4. Remove empty Manifests
|
||||
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
|
||||
5.1. Do not touch files with -kb/-ko keyword flags.
|
||||
|
||||
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
|
||||
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
|
||||
tests
|
||||
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
|
||||
project
|
||||
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
|
||||
developer, wrote Git features for the migration
|
||||
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
|
||||
cvs2svn
|
||||
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
|
||||
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
|
||||
work in migration
|
||||
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
|
||||
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
|
||||
the bikeshed
|
||||
|
||||
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
|
||||
Use https by default
|
||||
|
||||
Convert all URLs for sites supporting encrypted connections from http to
|
||||
https
|
||||
|
||||
Signed-off-by: Justin Lecher <jlec@gentoo.org>
|
||||
|
||||
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
|
||||
Revert DOCTYPE SYSTEM https changes in metadata.xml
|
||||
|
||||
repoman does not yet accept the https version.
|
||||
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
|
||||
|
||||
Bug: https://bugs.gentoo.org/552720
|
||||
|
||||
*sqlite-3.8.11.1 (25 Aug 2015)
|
||||
|
||||
25 Aug 2015; Mike Gilbert <floppym@gentoo.org> +sqlite-3.8.11.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
25 Aug 2015; Mike Gilbert <floppym@gentoo.org> sqlite-3.8.11.1.ebuild:
|
||||
Downgrade accidental stable keywords
|
||||
|
||||
Package-Manager: portage-2.2.20_p40
|
||||
|
||||
*sqlite-3.9.1 (21 Oct 2015)
|
||||
|
||||
21 Oct 2015; Mike Gilbert <floppym@gentoo.org> +sqlite-3.9.1.ebuild:
|
||||
Version bump.
|
||||
|
||||
23 Oct 2015; Mike Gilbert <floppym@gentoo.org> sqlite-3.9.1.ebuild:
|
||||
Fix building with USE="-tcl -test tools".
|
||||
|
||||
*sqlite-3.9.2 (03 Nov 2015)
|
||||
|
||||
03 Nov 2015; Mike Gilbert <floppym@gentoo.org> +sqlite-3.9.2.ebuild:
|
||||
Version bump.
|
||||
|
||||
14 Dec 2015; Agostino Sarubbo <ago@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
amd64 stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.24
|
||||
RepoMan-Options: --include-arches="amd64"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
19 Dec 2015; Markus Meier <maekke@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
arm stable, bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="arm"
|
||||
|
||||
20 Dec 2015; Jeroen Roovers <jer@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
Stable for HPPA PPC64 (bug #567998).
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --ignore-arches
|
||||
|
||||
25 Dec 2015; Agostino Sarubbo <ago@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
x86 stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.24
|
||||
RepoMan-Options: --include-arches="x86"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
26 Dec 2015; Agostino Sarubbo <ago@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
ppc stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.24
|
||||
RepoMan-Options: --include-arches="ppc"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
27 Dec 2015; Mikle Kolyada <zlogene@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
sparc stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.24
|
||||
|
||||
*sqlite-3.10.0 (09 Jan 2016)
|
||||
|
||||
09 Jan 2016; Ian Delaney <idella4@gentoo.org> +sqlite-3.10.0.ebuild:
|
||||
Version bump.
|
||||
|
||||
10 Jan 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
alpha stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="alpha"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
11 Jan 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.9.2.ebuild:
|
||||
ia64 stable wrt bug #567998
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="ia64"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
||||
Replace all herds with appropriate projects (GLEP 67)
|
||||
|
||||
Replace all uses of herd with appropriate project maintainers, or no
|
||||
maintainers in case of herds requested to be disbanded.
|
||||
|
||||
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
|
||||
Set appropriate maintainer types in metadata.xml (GLEP 67)
|
||||
|
||||
*sqlite-3.10.2 (01 Feb 2016)
|
||||
|
||||
01 Feb 2016; Mike Gilbert <floppym@gentoo.org> +sqlite-3.10.2.ebuild:
|
||||
Version bump.
|
||||
|
||||
20 Feb 2016; Pacho Ramos <pacho@gentoo.org>
|
||||
-files/sqlite-2.8.15-alignement-fix.patch, -files/sqlite-2.8.16-exit.patch,
|
||||
-files/sqlite-2.8.16-multilib.patch, -sqlite-2.8.16-r5.ebuild:
|
||||
Drop masked for removal version (#249418)
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
|
||||
*sqlite-3.11.0 (03 Mar 2016)
|
||||
|
||||
03 Mar 2016; Mike Gilbert <floppym@gentoo.org> +files/sqlite-3.11.0-full_tar
|
||||
ball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch,
|
||||
+files/sqlite-3.11.0-full_tarball-build.patch, +files/sqlite-3.11.0-nonfull_
|
||||
tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch,
|
||||
+files/sqlite-3.11.0-nonfull_tarball-build.patch, +sqlite-3.11.0.ebuild:
|
||||
Version bump (3.11.0).
|
||||
|
||||
Link executables against libsqlite3.so instead of statically including code
|
||||
from sqlite3.c.
|
||||
Backport SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER from 3.12.0.
|
||||
|
||||
*sqlite-3.11.1 (04 Mar 2016)
|
||||
|
||||
04 Mar 2016; Mike Gilbert <floppym@gentoo.org> +sqlite-3.11.1.ebuild:
|
||||
Version bump (3.11.1).
|
||||
|
||||
06 Mar 2016; Jeroen Roovers <jer@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
Stable for PPC64 (bug #574420).
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
RepoMan-Options: --ignore-arches
|
||||
|
||||
06 Mar 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
amd64 stable wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="amd64"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
06 Mar 2016; Jeroen Roovers <jer@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
Stable for HPPA (bug #574420).
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
RepoMan-Options: --ignore-arches
|
||||
|
||||
12 Mar 2016; Markus Meier <maekke@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
arm stable, bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.27
|
||||
RepoMan-Options: --include-arches="arm"
|
||||
|
||||
15 Mar 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
x86 stable wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="x86"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
15 Mar 2016; Tobias Klausmann <klausman@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
3.11.1-r0: add alpha keyword
|
||||
|
||||
Gentoo-Bug: 574420
|
||||
|
||||
Package-Manager: portage-2.2.28
|
||||
|
||||
16 Mar 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
ppc stable wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="ppc"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
19 Mar 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
sparc stable wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="sparc"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
20 Mar 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
ia64 stable wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="ia64"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
31 Mar 2016; Steev Klimaszewski <steev@gentoo.org> sqlite-3.11.1.ebuild:
|
||||
Stabilize arm64 wrt bug #574420
|
||||
|
||||
Package-Manager: portage-2.2.28
|
||||
|
||||
*sqlite-3.12.0 (02 Apr 2016)
|
||||
|
||||
02 Apr 2016; Mike Gilbert <floppym@gentoo.org>
|
||||
+files/sqlite-3.12.0-nonfull_tarball-build.patch, +sqlite-3.12.0.ebuild:
|
||||
Version bump (3.12.0).
|
||||
|
||||
04 Apr 2016; Jeroen Roovers <jer@gentoo.org> sqlite-3.12.0.ebuild:
|
||||
Stable for HPPA PPC64 (bug #578940).
|
||||
|
||||
Package-Manager: portage-2.2.28
|
||||
RepoMan-Options: --ignore-arches
|
||||
|
||||
08 Apr 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.12.0.ebuild:
|
||||
amd64 stable wrt bug #578940
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="amd64"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
*sqlite-3.12.1 (09 Apr 2016)
|
||||
|
||||
09 Apr 2016; Mike Gilbert <floppym@gentoo.org> +sqlite-3.12.1.ebuild:
|
||||
Version bump (3.12.1).
|
||||
|
||||
11 Apr 2016; Agostino Sarubbo <ago@gentoo.org> sqlite-3.12.0.ebuild:
|
||||
x86 stable wrt bug #578940
|
||||
|
||||
Package-Manager: portage-2.2.26
|
||||
RepoMan-Options: --include-arches="x86"
|
||||
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
|
||||
|
||||
19 Apr 2016; Markus Meier <maekke@gentoo.org> sqlite-3.12.0.ebuild:
|
||||
arm stable, bug #578940
|
||||
|
||||
Package-Manager: portage-2.2.28
|
||||
RepoMan-Options: --include-arches="arm"
|
||||
|
||||
*sqlite-3.12.2 (20 Apr 2016)
|
||||
|
||||
20 Apr 2016; Mike Gilbert <floppym@gentoo.org> +sqlite-3.12.2.ebuild:
|
||||
Version bump (3.12.2).
|
||||
|
||||
28 Apr 2016; Mike Gilbert <floppym@gentoo.org> -files/maketcllib.sh,
|
||||
-files/sqlite-3.8.1-autoconf-dlopen_check.patch,
|
||||
-files/sqlite-3.8.1-src-dlopen_check.patch,
|
||||
-files/sqlite-3.8.1-tests-icu-52.patch, -sqlite-3.8.10.1.ebuild,
|
||||
-sqlite-3.8.10.2.ebuild, -sqlite-3.8.11.1.ebuild, -sqlite-3.9.1.ebuild,
|
||||
-sqlite-3.9.2.ebuild, -sqlite-3.10.0.ebuild, -sqlite-3.10.2.ebuild,
|
||||
-sqlite-3.11.0.ebuild:
|
||||
Delete old versions.
|
||||
|
||||
20 May 2016; Tobias Klausmann <klausman@gentoo.org> sqlite-3.12.0.ebuild:
|
||||
3.12.0-r0: add alpha keyword
|
||||
|
||||
Gentoo-Bug: 578940
|
||||
|
||||
Package-Manager: portage-2.3.0_rc1
|
||||
|
||||
*sqlite-3.13.0 (30 May 2016)
|
||||
|
||||
30 May 2016; Mike Gilbert <floppym@gentoo.org>
|
||||
+files/sqlite-3.13.0-full_tarball-build.patch, +sqlite-3.13.0.ebuild:
|
||||
Version bump (3.13.0).
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,29 +1,12 @@
|
||||
AUX sqlite-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 14405 SHA256 ddce4fdc675e54a0a8a0537a315876cb881e5ae1f0c0193cea28f09b10bc7954 SHA512 4586762f41c6eeca64621e53a7369b9258a88880e52db2e8a98f02f46fe5db5d93cf3104ff8e2c99880c633bba2ce59bcb30552091efb34f6eb19f078fe3eedd WHIRLPOOL b95894b95a0f68378e61d59817de9709dc929f04625ff39a838dbeda57a07ddb636ac614b46e1c22bb0f071440a04c51b98a38d38d93b1d167022be3ee4d0080
|
||||
AUX sqlite-3.11.0-full_tarball-build.patch 4933 SHA256 9b76ab242a0486a94f9efeac6f6cab3364c4a5bd47c2b51be098d5db53015118 SHA512 303c419cbcff868249ae4691865f04b732faf0df09d49102ee35fd37df085a5a0e9e4e7ce7c856bb80af3177670ba0bac08ded1244dd452883ac32dab4727877 WHIRLPOOL 5abb65e9255b643af210fbd79d0f414b6393a026252f3faa4d12f40cf238295dfee3e922635879271916a7e817b8330fb459ea8c225dc13a9812d3161a6f5742
|
||||
AUX sqlite-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch 8426 SHA256 097b2714ddddc7af74ecb8baa68ac1f7b18b73539aaab5315d1fcba52a6c222e SHA512 0ae94f82b016035b2ec415ab271701b7f48e21f0749c1f98dcf1e86f8fba6c5551121fa70791a8c0b1156dccbcf160f05d4f5e0003f53bc820ceff91eb9745f8 WHIRLPOOL b8eb1ccc0cbdf32bf572348aa93119f194b549d9b60d1a9aaf8e91b727bcd53d520247e2f3126c1acb5621338a9f35b32d0695e080a354cfc5a6dde29e181db9
|
||||
AUX sqlite-3.11.0-nonfull_tarball-build.patch 1325 SHA256 080dc8d6b7bc465326215bfa08592d5b5bdb7793c095141efa992de4d687f0d3 SHA512 07ef0eacb494a3bcec81cf6a10e86d7bb88b18807226efdffb35f28cd95032b92851db14fc8a1f465312201a866e5d4e1af02f863e89a16b718c6352680036b9 WHIRLPOOL 8bc0bef6f4ebd714ec4ce12660a956fc106f4f25d5514cc578114a4ac64d011ecd7e4597eb93793c79621e03c18a9f70e11c62c26c496eee4a4bdfe23ba9f813
|
||||
AUX sqlite-3.12.0-nonfull_tarball-build.patch 403 SHA256 8cc4b6d013c432fe59f4ee10f3b98a2c8ba3471a44f68c92e555e4884b9fe2ce SHA512 6c82a7be2d5f6e898469d8aed78470773617b9d77a9d491454e4b7b29abd6b29bb2854b96318f98eb71215deaa9bc7d753ac57cb52f73cf0aec12a23afdc8294 WHIRLPOOL 94dbe52c9cee7a07df5a647c95044fc3b356b2d2bfbbd0cc0566a31363e26f2990e0eb2ffaacaaf8922d5db4bc1268dba153860cf5f8d79b75ce9c5db3fa37de
|
||||
AUX sqlite-3.13.0-full_tarball-build.patch 5192 SHA256 76841d686bb96fbc68ac6fcc773bcf02ad432c900d18c3a4dcd8b5df396dddd1 SHA512 95d421b92cfee4772fea26f699b92a6cafdcbe087370d003960c14f75a714b23d24b15a9c8e31552d224fdaef89d871464519077b211b89e8b97bc1fb53c5428 WHIRLPOOL 8b5c5878c5690ae367f39032dba7cb9a38eb6e446e60f1db74b0272b29003ffaccde872dbec418a6a5fbcced1bc965ce2130b5da78f7151efa9d7a0f574e7e58
|
||||
DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 SHA512 c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 WHIRLPOOL b8062e2030dffd8b44cc0eba32c93312b8ae20064004c460321a4251806037fe62ec5ef83499e491cb248786b9302f0495de0c0624128d0063cbff71b77b8864
|
||||
DIST sqlite-autoconf-3120000.tar.gz 2374101 SHA256 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e SHA512 84a9107ca9045ddc724d7e37dfe2b1dc00a106769260c7bd429a95beedc46a906985b65e0b2bf597de23dd56d132b9ef6888a8c4e5f8a731c8a5c026b971d89e WHIRLPOOL 4ec76b383670f2ee9c50870587696a3c86357161344851b487f54a03c668dac8c4272738b44e5a4048dd00bf2b3122904c53b6d2195f9b48aef3ad928f34b85b
|
||||
DIST sqlite-autoconf-3120100.tar.gz 2374576 SHA256 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c SHA512 eb0b892bb6a1783df9b712d5f78c9f5fb5aa8ff1b1735fd2806e96b1c04e2a5f87b2e47469185195611a5cf6c446ec32935e9ae0b01734383a8fefc1bcaf5842 WHIRLPOOL 0284241a3fd6dbee16ba5fe4c1a0dc15b1b3134bd39ba8a2219c2da4e426e3572809459bbdc8bbf3fa4ea055406b85c547d8e7f05afcb57baa712653ce0d6f64
|
||||
DIST sqlite-autoconf-3120200.tar.gz 2374804 SHA256 fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb SHA512 e56b8d5b8fb41d27437659db669259198663c266c0b3faf44ba9b130441550fb79bd040e6488f56280b33230d9cf4e51c7906f968ffdd36206354bfabc4b6eb4 WHIRLPOOL bd1231f0cce91281c9e42338ae698a06446078d2070f4f16b5472ed4004dbf1913339a3f0e5a34d87d0e71390a130c347f3c97353967530b65b23e1492664b7e
|
||||
DIST sqlite-autoconf-3130000.tar.gz 2459805 SHA256 e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b SHA512 c2547ff9a144c46829344058b4f8dcc5b8c9c823cbc667be2944dc7beecb9cc213858cc9ce302a763200278397d9a0fc6bb35c542028a124ef0980fedd574c2f WHIRLPOOL b9bcfb2eecf30719f7a673d569949b4e497c9682de08ca6f0ccc6c67a8f1541a51e88108bebde94a14802516b114c9f8cad83fbdbb130774b3082a8107657255
|
||||
DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812
|
||||
DIST sqlite-doc-3120000.zip 5402611 SHA256 346d9d56a0193d9396948192b7eca9e45c2adfeea6bbf71df62502830da510f3 SHA512 7879d006e528d692ea5718f27d03e2dfe2a5e54aa135be983b992836102720df4dc690d84795115a25ed19a663e895a3f3f8a59d0de079c451d215e07081281e WHIRLPOOL 00f5bc4b82af1ba8d43ae4d0761dacd2e608009812a12fee9aedd333baec9b36f74542c60de4acacd19f5ef898d3bd57dfb705f3b21219ba3862ca91c2f76402
|
||||
DIST sqlite-doc-3120100.zip 5410493 SHA256 dbe53c076922c711a467dde57432583fbf9a12eac57cb75f6116a310880eb088 SHA512 d0117618d97744255248b9160816203147ba2afdb0bea5fe02d5e464541e09bc9147189317c6f849cc56059d6ae96e3e4b2a30cd8d0bc7b0e1ecacb573cfcdd4 WHIRLPOOL e3f054eda83301b9e4b5170bf9c56895756e4ac78a1c6256467c990fafccaeadec5f7ca54f1bf118bcb950f25db63df6c0972a138d36a10a0a9cfdf688eb207b
|
||||
DIST sqlite-doc-3120200.zip 5416790 SHA256 67c640c4b01b961016717db61e3e43c63c33248c78ce0de9f10b88ea7ce97670 SHA512 4ded937565b2d9b63ae55495d4b536bc0056e0d9aa7119ee54ddea127c42ba7de17986db7b85c172043fab1112132cbc126a102b248770fca6cde9a8fda438ae WHIRLPOOL 7eefecb6d0450c85ec3f30cdeb853117f4067e1bace7d3c0524e5c6cb13d2e31772211aec8562f972491da413d9bd79022bc29c16968b086562e7f17bff984eb
|
||||
DIST sqlite-doc-3130000.zip 5550186 SHA256 510606a9cdd89814b2d44e7b7f284ebb0a58153e1800de6daadfab445190f79c SHA512 0bf4544a07bd92533bc248dc16ed43c4fcad870ab535591618d3006f38c2741a8c0ed1da082444ea1af2f57936575c678bc12b651252426b908660023b36cd39 WHIRLPOOL 78fd5de701224e39d07fbb03a9193dff45237845b215d83f27a623f289d9da0df7082d53115e90474856b775d350ee3f9d2970ca2c1a4a33b24543de06fd3b9a
|
||||
DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e
|
||||
DIST sqlite-src-3120000.zip 9367749 SHA256 d891e7ffd56cd97d069a6ed99d7e85cbe655b0a97ca6b5398c7806e888642df1 SHA512 9669e33e328b826f4692725ec09e21d85f4f2c386c624a81b0535f41ca7d2f996ebf5018db8ecdfdac18cff39a881a953111801499705dfb599f00e3bb5d10e4 WHIRLPOOL 865aaecbe331ec93b1a8c5b965c3edc43d35994c2db79d336febb27860ee91d68753d3ea274b4639f3e05d3f0a589fb21aedac33bc2120a4de8d094383d7b923
|
||||
DIST sqlite-src-3120100.zip 9368459 SHA256 49b9819683f8f7329a78d2008e3f7c4e02126b556b95e5dfe3be102b9e741cff SHA512 6d0d7230343ca460215b5764d4a546631ddc2bcfc0777051379fb4632ccf9c36a53d26eda6811823156be166643c001c994a0f52498c6196ed13b34e931d55e1 WHIRLPOOL e41fd7a1ba870efb5421657975990c1d7e1ecc27023882771474a62e82b2ae305bc3d0b8556e0627de886d35e1b375fec223b3f70582d64fc5345c525b293131
|
||||
DIST sqlite-src-3120200.zip 9370396 SHA256 2c16caa653e57f3c71873aa88797c97117981d6b0974254ce24d933dd27f9a86 SHA512 6cc9718c23ca3f65a42cc715eb67c8d174ecf0e397457efb6bfc5bd2efc9a51ea2f84266d31826068bf46efc550eb277b3c8e93cb85c5d23645e8b8ae4e2fc07 WHIRLPOOL ffdbbc384189f0d62a93ee8219051ff936b7c0c2fd39449f6ff72a734ab219f23f049648de7c0ec510a74aad85ba07ef0c8bebea4c3b83e043464744d2c039f4
|
||||
DIST sqlite-src-3130000.zip 9506412 SHA256 b46b62dc27abbde52db69d8e2a710469b9af613ba251eb98e412d4f3827f915b SHA512 4cb7531105869ff7db5c08aa8e4d303fa3d80c8c67e21d9a835a09f7dddb4c9dbba837e2030dd4af6bcdb00a305b057cbd6430e11b3f2ae5e470f27b69b6c1e6 WHIRLPOOL 901f6cd343daaa62970f8d768e3c6ccb0b1da75fb5643b27e76f60d224005a08955fde9df5b8bb63250ab27994e2428ce19e21b4a1ccabec47cd4b8df4a13657
|
||||
EBUILD sqlite-3.11.1.ebuild 7518 SHA256 de50b5c26c744cfc34ea505f429a340f365efa800370497567c73d94e1c86ff7 SHA512 f95373f37c6b85781f86480fc5214b05e309b37864a6bf1366c021b7d17b6239d3bb17ecd1b2843099646bf0f266c2bbc8c917ab7f4eb1ffd541b39a6306112b WHIRLPOOL 52336e092edb6070ed61f662ca16fdb4557a32888bd6656a68072b985e18459573f506a318afd5f329aba6320fc57436cf1476b3a7dc56a7689d4c105f2b30dc
|
||||
EBUILD sqlite-3.12.0.ebuild 6986 SHA256 11a23d8e75c03c4e3515ddb20682d384504bebbdef896dc17c1e09460b2c1528 SHA512 504211d84f97e8da2f4d53c9de8afd89955410a9c91cb0fa5dc48726b4d6b314e1a48f1b6e40f8b6ba2cdec3f517a2b5623fe01e21f417780dfa640bb80b97b1 WHIRLPOOL f1fd886f3ad3ec224283a19287e9f5dbbab4796ce19fd1d57ba0bf76b3ffb2a9228500e5a7a4b6829032142bbc29c37d6cc793a6b9021ae8f2b9b81260eb40f5
|
||||
EBUILD sqlite-3.12.1.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49
|
||||
EBUILD sqlite-3.12.2.ebuild 6992 SHA256 6f2e0de7c7bfc1673bd97a0b9a5c0526bea85e08dc8ce742b46d1e0dc44c767e SHA512 2677c1c39a10715c41e0802a5e6df356bbd66f15eeebfd862f26b203e23b472520ac06a5ec823565b57f61e27817cb856de86a7e3861525acc228954eab1c205 WHIRLPOOL afc6c37f03fa6d4d5a5e5d5c7954f37af324e6426505e7653b1fd759f6f6c747278ddeaa48e5d8b9300839267cd140ea074d5be82970ead538588773a0f34a49
|
||||
EBUILD sqlite-3.13.0.ebuild 7145 SHA256 e06db96b44d4622e92145f3d0e45a6c7aa41a9eab0c005a56ce11ca25a451b44 SHA512 420723f7fa7676f2b5f72968b75b27cc9fb88879a999ef4e4f4986b473a54477ae5d25859863d4a0682d20b6f219b903ded98ae38039fd9409d8f9b506b7cd2e WHIRLPOOL e727c4325f6e34fe096f3064a9f62a4362a2bad909a7ee0ab5e02735797b7a80772aa0b1e66d58413d993b951d66909b50c5234c523a41d8cacb90af1bc0e761
|
||||
MISC ChangeLog 10282 SHA256 54f018e6b56f9b11f23c362a1c94c1ea3dba338ce10f4a771526c6600d67f05f SHA512 88736ab0a9b46ca8d8593e72769267d4ca1454f5b502be243d9e9862c07d8d303891c173fddc61712e9a4ec825fb6fc77b67be8cf4829a540f3ea77a32eea478 WHIRLPOOL 684ac1be5f7af9f917640edada5a366f1591c47a867d3c18170f4e4585bdd11e31a84c3611310bc4e71c28df63128041169e673ec117ff64e92a213877eede68
|
||||
MISC ChangeLog-2015 77763 SHA256 c33481b0e8ff18658a72ce845ef033f46d7e2e47fd368f276485936b8249e366 SHA512 ae9ede8a42eb81bdbfd39c201aaed8a295c2eb61999d7961aed59f1d439241b57ffff0548b11317abdf2342a2e35daeb8ba98dea3fbd1904653192c3e2b3c86c WHIRLPOOL 892423e0771ee903650e396b9eb63ca76abe782ce5d3f2e1f993d0c65f3ee1b23e38a743557e09f7d11c6466ffe7c8bf7fb4a372ed58e33c1397d9c9b24f1783
|
||||
MISC metadata.xml 745 SHA256 0430582d0c0d1d5687f3e488e11f0b0c60f91fa51196df62c5ccd4a57b79912b SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849 WHIRLPOOL 7c9f0a1ab683d8c10a5eccebdd88f1f470c72ae4b547fc0a465da4cd6c640d0b8658d9767dfd6e16bdfbb54219edc584b0c7e80ed6b4e963032b7aaeeab672d5
|
||||
DIST sqlite-autoconf-3200100.tar.gz 2565638 BLAKE2B bd1d32c211ea906cb2dbf78ea54d364db1a642d8a3b2751a427521a9da3391a2cd23c1ecdc5ff70b68f4166c583e69373f566cb04847295542185ab598e79c1b SHA512 56e3d326ea2225cadc628c3518d46d9f7c4bafa0e3612f2b7ab0dc0d79fcbb7e095f6d84a9a48e1c6d83adcdc8706ad5ac4404f0f622c7fe38cfde3a7e7e69f0
|
||||
DIST sqlite-autoconf-3210000.tar.gz 2568942 BLAKE2B 83a7095fd5fd5447a3c16816ceb9f51f393de9689942bd4eb4c6eafe357a1dd1783500f8faf2765fa6628da6a39f550237b661af1337ac063ca285f5f0a5218e SHA512 8f00708965eacef171620c49538f75768d350ec3f2bfef412a5c70af865ab03b6a64ce1e65d9fdb3d66f4d00262a30fc162b01fd69f63c05c14d5243374b6298
|
||||
DIST sqlite-autoconf-3220000.tar.gz 2644649 BLAKE2B e73fd7846362e6cc07eb96ea18e8883c1473c2b07c6e0c89e7e65726c5a6556b50bac71904a5b3a431ba40ff72b32e55c3e5ab7461567b5643560a0790a9a4dd SHA512 13e791bb1d7ba7edb5d84f4945f36ce2e03898a5bb1612d28799ef35a100f32e85cbb38f4ef65a7b43d020e5d48bf09b2e79cbb2003cc8aca2b09458b8c5d5bc
|
||||
DIST sqlite-autoconf-3230100.tar.gz 2675362 BLAKE2B 2dd075f0dc05425563a8e679bb463724296294b5845746f06b51a24c9601be203ee0f2213f43eaca0757fcbb54b777cee746d873c98f377a0b010d8066d7fcb5 SHA512 52cae7ed0678b763d40373ae260672b906861379428529a58a017cbc82419a6b109e0b2ac7ff5532e6d941693cc4ab68e6563f424b92b3b27c8916859a6e4826
|
||||
DIST sqlite-doc-3200100.zip 5759028 BLAKE2B a633672b739160873e64b89e1350c85b0002fd8f268b6ae0f5189de12f411125fbb309585175727b8915fe1468b3e70e7c33239826232c3e7bc8c1c59132bec0 SHA512 518ca59644cecfcd67f511268112e421c5d7bbd77ef1e33304bf306ef110becf1e2a7fe37c506ec6892edb9d5c6ee77657b374c2e061f49890d18af062dea2b3
|
||||
DIST sqlite-doc-3210000.zip 5800635 BLAKE2B c9e15fe7373045783d05bd7b0a70f980e3c8a3c0ec4243f85fe338788830a58e82f1c6b3c053efe75caa33e99a6162e2f9831e4f5b9577c0bf90a305ee2f0381 SHA512 799c7279166b489d1a5acc9410808c2d4b78e64037fc15b60764180fe1c698f35e27e86793140302f560cfa583baa2c33e416d5c9e1842ec58c6cb6093729334
|
||||
DIST sqlite-doc-3220000.zip 5856836 BLAKE2B 1be73848040f3ae9734a44c94e4c36cae269d79abb20467f9f8368754e1ae07f4c25490be985b44d08f427e281fc268c6569dc0f5bbb6254621c62798507d687 SHA512 f9141d3907e5c1a3008d3b7e111e46e7ff1f010358eb682d3e1187a67deb7cca7ba1d5fbc5b19da26ee8df3a0c71a098fd0e8d8ca89c25e5ad2b3e12ba7dc312
|
||||
DIST sqlite-doc-3230100.zip 8882546 BLAKE2B 1e80647e3789b9130a93e881933fb1260794d9ccf359969a16bdeb0df5a51787eaf8404641c4b760bedd45063d46f8874fd74a4da1fef0234f3d8e92db754d76 SHA512 d3a42621480a928446c5f71d0f2ee68e245b071971da38438f9070bd5bcbe1930ea5bd20e06c68543df75badd2e4565abc94420df50b7152c9cd129587471471
|
||||
DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca35584092c663fed176fdd69164623bbe58afd15cd74fcd32a0cec893cffdb0f096873188c42ec5595ef7d635c79ad SHA512 845a0d64c9356aadf178c04dd716bbd37a7353526b06cfa8e8f65653cf6a1893a5c5e8c78d20b43910c34d9167272cf517749c91ed0ba7686977e3d0327e8939
|
||||
DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
|
||||
DIST sqlite-src-3220000.zip 10721627 BLAKE2B ed4cf93c36c095edeccd6ee4dac5419c516264a42eb9d6d2e333b1d4a134c6198dfcd2bbae41dff811616f0dc7f9e9bb487f9c5b5f631fcb5885540a84bf527a SHA512 e35defb0ffcc10100399051bc734746de40fa3dc5cd673eac470fb58cd8bd6d911b6dacb5e8489e2dd79c6ae75faaeb8c02384f64c4595963e62bd3faeb9446c
|
||||
DIST sqlite-src-3230100.zip 10849436 BLAKE2B 6bed0a45c83ddb51d665835d174f623b30b1c3b81562fdea2317b58d876a0852136fe4f8a3ebc7679676f366e19c84d0ad2f54d3d8c73712145099975f80cf1a SHA512 69a87b76860c3b172d9e68b0fc0b8c157b606375e2b7d793ce4bd4b898ef737cd721189bc6a3342c749e224e60fa96203d449668c49dff2ebdc682b49630a59b
|
||||
|
||||
@ -1,443 +0,0 @@
|
||||
https://www.sqlite.org/cgi/src/info/374b5108087a2eae
|
||||
|
||||
--- ext/fts3/fts3_tokenizer.c
|
||||
+++ ext/fts3/fts3_tokenizer.c
|
||||
@@ -30,6 +30,18 @@
|
||||
#include <string.h>
|
||||
|
||||
/*
|
||||
+** Return true if the two-argument version of fts3_tokenizer()
|
||||
+** has been activated via a prior call to sqlite3_db_config(db,
|
||||
+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
|
||||
+*/
|
||||
+static int fts3TokenizerEnabled(sqlite3_context *context){
|
||||
+ sqlite3 *db = sqlite3_context_db_handle(context);
|
||||
+ int isEnabled = 0;
|
||||
+ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled);
|
||||
+ return isEnabled;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
** Implementation of the SQL scalar function for accessing the underlying
|
||||
** hash table. This function may be called as follows:
|
||||
**
|
||||
@@ -49,7 +61,7 @@
|
||||
** is a blob containing the pointer stored as the hash data corresponding
|
||||
** to string <key-name> (after the hash-table is updated, if applicable).
|
||||
*/
|
||||
-static void scalarFunc(
|
||||
+static void fts3TokenizerFunc(
|
||||
sqlite3_context *context,
|
||||
int argc,
|
||||
sqlite3_value **argv
|
||||
@@ -67,27 +79,23 @@
|
||||
nName = sqlite3_value_bytes(argv[0])+1;
|
||||
|
||||
if( argc==2 ){
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
- void *pOld;
|
||||
- int n = sqlite3_value_bytes(argv[1]);
|
||||
- if( zName==0 || n!=sizeof(pPtr) ){
|
||||
- sqlite3_result_error(context, "argument type mismatch", -1);
|
||||
- return;
|
||||
- }
|
||||
- pPtr = *(void **)sqlite3_value_blob(argv[1]);
|
||||
- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
|
||||
- if( pOld==pPtr ){
|
||||
- sqlite3_result_error(context, "out of memory", -1);
|
||||
+ if( fts3TokenizerEnabled(context) ){
|
||||
+ void *pOld;
|
||||
+ int n = sqlite3_value_bytes(argv[1]);
|
||||
+ if( zName==0 || n!=sizeof(pPtr) ){
|
||||
+ sqlite3_result_error(context, "argument type mismatch", -1);
|
||||
+ return;
|
||||
+ }
|
||||
+ pPtr = *(void **)sqlite3_value_blob(argv[1]);
|
||||
+ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
|
||||
+ if( pOld==pPtr ){
|
||||
+ sqlite3_result_error(context, "out of memory", -1);
|
||||
+ }
|
||||
+ }else{
|
||||
+ sqlite3_result_error(context, "fts3tokenize disabled", -1);
|
||||
return;
|
||||
}
|
||||
-#else
|
||||
- sqlite3_result_error(context, "fts3tokenize: "
|
||||
- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1
|
||||
- );
|
||||
- return;
|
||||
-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
|
||||
- }else
|
||||
- {
|
||||
+ }else{
|
||||
if( zName ){
|
||||
pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
|
||||
}
|
||||
@@ -98,7 +106,6 @@
|
||||
return;
|
||||
}
|
||||
}
|
||||
-
|
||||
sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
|
||||
}
|
||||
|
||||
@@ -336,7 +343,6 @@
|
||||
Tcl_DecrRefCount(pRet);
|
||||
}
|
||||
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
static
|
||||
int registerTokenizer(
|
||||
sqlite3 *db,
|
||||
@@ -358,7 +364,6 @@
|
||||
|
||||
return sqlite3_finalize(pStmt);
|
||||
}
|
||||
-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
|
||||
|
||||
|
||||
static
|
||||
@@ -431,13 +436,13 @@
|
||||
assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
|
||||
|
||||
/* Test the storage function */
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
- rc = registerTokenizer(db, "nosuchtokenizer", p1);
|
||||
- assert( rc==SQLITE_OK );
|
||||
- rc = queryTokenizer(db, "nosuchtokenizer", &p2);
|
||||
- assert( rc==SQLITE_OK );
|
||||
- assert( p2==p1 );
|
||||
-#endif
|
||||
+ if( fts3TokenizerEnabled(context) ){
|
||||
+ rc = registerTokenizer(db, "nosuchtokenizer", p1);
|
||||
+ assert( rc==SQLITE_OK );
|
||||
+ rc = queryTokenizer(db, "nosuchtokenizer", &p2);
|
||||
+ assert( rc==SQLITE_OK );
|
||||
+ assert( p2==p1 );
|
||||
+ }
|
||||
|
||||
sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
|
||||
}
|
||||
@@ -453,7 +458,7 @@
|
||||
** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
|
||||
**
|
||||
** This function adds a scalar function (see header comment above
|
||||
-** scalarFunc() in this file for details) and, if ENABLE_TABLE is
|
||||
+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is
|
||||
** defined at compilation time, a temporary virtual table (see header
|
||||
** comment above struct HashTableVtab) to the database schema. Both
|
||||
** provide read/write access to the contents of *pHash.
|
||||
@@ -482,10 +487,10 @@
|
||||
#endif
|
||||
|
||||
if( SQLITE_OK==rc ){
|
||||
- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0);
|
||||
+ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0);
|
||||
}
|
||||
if( SQLITE_OK==rc ){
|
||||
- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0);
|
||||
+ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0);
|
||||
}
|
||||
#ifdef SQLITE_TEST
|
||||
if( SQLITE_OK==rc ){
|
||||
--- src/main.c
|
||||
+++ src/main.c
|
||||
@@ -797,8 +797,9 @@
|
||||
int op; /* The opcode */
|
||||
u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */
|
||||
} aFlagOp[] = {
|
||||
- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys },
|
||||
- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer },
|
||||
};
|
||||
unsigned int i;
|
||||
rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
|
||||
@@ -2815,6 +2816,9 @@
|
||||
#if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK)
|
||||
| SQLITE_CellSizeCk
|
||||
#endif
|
||||
+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER)
|
||||
+ | SQLITE_Fts3Tokenizer
|
||||
+#endif
|
||||
;
|
||||
sqlite3HashInit(&db->aCollSeq);
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
--- src/sqlite.h.in
|
||||
+++ src/sqlite.h.in
|
||||
@@ -1904,11 +1904,25 @@
|
||||
** following this call. The second parameter may be a NULL pointer, in
|
||||
** which case the trigger setting is not reported back. </dd>
|
||||
**
|
||||
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
|
||||
+** <dd> ^This option is used to enable or disable the two-argument
|
||||
+** version of the [fts3_tokenizer()] function which is part of the
|
||||
+** [FTS3] full-text search engine extension.
|
||||
+** There should be two additional arguments.
|
||||
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
|
||||
+** positive to enable fts3_tokenizer() or negative to leave the setting
|
||||
+** unchanged.
|
||||
+** The second parameter is a pointer to an integer into which
|
||||
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
|
||||
+** following this call. The second parameter may be a NULL pointer, in
|
||||
+** which case the new setting is not reported back. </dd>
|
||||
+**
|
||||
** </dl>
|
||||
*/
|
||||
-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
|
||||
|
||||
|
||||
/*
|
||||
--- src/sqliteInt.h
|
||||
+++ src/sqliteInt.h
|
||||
@@ -1317,6 +1317,7 @@
|
||||
#define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */
|
||||
#define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */
|
||||
#define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */
|
||||
+#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */
|
||||
|
||||
|
||||
/*
|
||||
--- src/test1.c
|
||||
+++ src/test1.c
|
||||
@@ -6921,6 +6921,53 @@
|
||||
}
|
||||
|
||||
/*
|
||||
+** tclcmd: sqlite3_db_config DB SETTING VALUE
|
||||
+**
|
||||
+** Invoke sqlite3_db_config() for one of the setting values.
|
||||
+*/
|
||||
+static int test_sqlite3_db_config(
|
||||
+ void *clientData,
|
||||
+ Tcl_Interp *interp,
|
||||
+ int objc,
|
||||
+ Tcl_Obj *CONST objv[]
|
||||
+){
|
||||
+ static const struct {
|
||||
+ const char *zName;
|
||||
+ int eVal;
|
||||
+ } aSetting[] = {
|
||||
+ { "FKEY", SQLITE_DBCONFIG_ENABLE_FKEY },
|
||||
+ { "TRIGGER", SQLITE_DBCONFIG_ENABLE_TRIGGER },
|
||||
+ { "FTS3_TOKENIZER", SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER },
|
||||
+ };
|
||||
+ int i;
|
||||
+ int v;
|
||||
+ const char *zSetting;
|
||||
+ sqlite3 *db;
|
||||
+
|
||||
+ if( objc!=4 ){
|
||||
+ Tcl_WrongNumArgs(interp, 1, objv, "DB SETTING VALUE");
|
||||
+ return TCL_ERROR;
|
||||
+ }
|
||||
+ if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
|
||||
+ zSetting = Tcl_GetString(objv[2]);
|
||||
+ if( sqlite3_strglob("SQLITE_*", zSetting)==0 ) zSetting += 7;
|
||||
+ if( sqlite3_strglob("DBCONFIG_*", zSetting)==0 ) zSetting += 9;
|
||||
+ if( sqlite3_strglob("ENABLE_*", zSetting)==0 ) zSetting += 7;
|
||||
+ for(i=0; i<ArraySize(aSetting); i++){
|
||||
+ if( strcmp(zSetting, aSetting[i].zName)==0 ) break;
|
||||
+ }
|
||||
+ if( i>=ArraySize(aSetting) ){
|
||||
+ Tcl_SetObjResult(interp,
|
||||
+ Tcl_NewStringObj("unknown sqlite3_db_config setting", -1));
|
||||
+ return TCL_ERROR;
|
||||
+ }
|
||||
+ if( Tcl_GetIntFromObj(interp, objv[3], &v) ) return TCL_ERROR;
|
||||
+ sqlite3_db_config(db, aSetting[i].eVal, v, &v);
|
||||
+ Tcl_SetObjResult(interp, Tcl_NewIntObj(v));
|
||||
+ return TCL_OK;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
** Register commands with the TCL interpreter.
|
||||
*/
|
||||
int Sqlitetest1_Init(Tcl_Interp *interp){
|
||||
@@ -6989,6 +7036,7 @@
|
||||
Tcl_ObjCmdProc *xProc;
|
||||
void *clientData;
|
||||
} aObjCmd[] = {
|
||||
+ { "sqlite3_db_config", test_sqlite3_db_config, 0 },
|
||||
{ "bad_behavior", test_bad_behavior, (void*)&iZero },
|
||||
{ "register_dbstat_vtab", test_register_dbstat_vtab },
|
||||
{ "sqlite3_connection_pointer", get_sqlite_pointer, 0 },
|
||||
--- src/test_config.c
|
||||
+++ src/test_config.c
|
||||
@@ -370,12 +370,6 @@
|
||||
Tcl_SetVar2(interp, "sqlite_options", "fts3", "0", TCL_GLOBAL_ONLY);
|
||||
#endif
|
||||
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "1", TCL_GLOBAL_ONLY);
|
||||
-#else
|
||||
- Tcl_SetVar2(interp, "sqlite_options", "fts3_tokenizer", "0", TCL_GLOBAL_ONLY);
|
||||
-#endif
|
||||
-
|
||||
#ifdef SQLITE_ENABLE_FTS5
|
||||
Tcl_SetVar2(interp, "sqlite_options", "fts5", "1", TCL_GLOBAL_ONLY);
|
||||
#else
|
||||
--- test/fts3atoken.test
|
||||
+++ test/fts3atoken.test
|
||||
@@ -56,40 +56,41 @@
|
||||
#
|
||||
# 5: Test that the table created to use tokenizer 'blah' is usable.
|
||||
#
|
||||
-ifcapable fts3_tokenizer {
|
||||
- do_test fts3atoken-1.1 {
|
||||
- catchsql {
|
||||
- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
|
||||
- }
|
||||
- } {1 {unknown tokenizer: blah}}
|
||||
- do_test fts3atoken-1.2 {
|
||||
- execsql {
|
||||
- SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
|
||||
- }
|
||||
- } {0}
|
||||
- do_test fts3atoken-1.3 {
|
||||
- execsql {
|
||||
- SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple');
|
||||
- }
|
||||
- } {1}
|
||||
- do_test fts3atoken-1.4 {
|
||||
- catchsql {
|
||||
- CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
|
||||
- }
|
||||
- } {0 {}}
|
||||
- do_test fts3atoken-1.5 {
|
||||
- execsql {
|
||||
- INSERT INTO t1(content) VALUES('There was movement at the station');
|
||||
- INSERT INTO t1(content) VALUES('For the word has passed around');
|
||||
- INSERT INTO t1(content) VALUES('That the colt from ol regret had got');
|
||||
- SELECT content FROM t1 WHERE content MATCH 'movement'
|
||||
- }
|
||||
- } {{There was movement at the station}}
|
||||
-} else {
|
||||
- do_catchsql_test 1.6 {
|
||||
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
|
||||
+do_test fts3atoken-1.1 {
|
||||
+ catchsql {
|
||||
+ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
|
||||
+ }
|
||||
+} {1 {unknown tokenizer: blah}}
|
||||
+do_test fts3atoken-1.2 {
|
||||
+ execsql {
|
||||
SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
|
||||
- } {1 {fts3tokenize: disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER}}
|
||||
-}
|
||||
+ }
|
||||
+} {0}
|
||||
+do_test fts3atoken-1.3 {
|
||||
+ execsql {
|
||||
+ SELECT fts3_tokenizer('blah') == fts3_tokenizer('simple');
|
||||
+ }
|
||||
+} {1}
|
||||
+do_test fts3atoken-1.4 {
|
||||
+ catchsql {
|
||||
+ CREATE VIRTUAL TABLE t1 USING fts3(content, tokenize blah);
|
||||
+ }
|
||||
+} {0 {}}
|
||||
+do_test fts3atoken-1.5 {
|
||||
+ execsql {
|
||||
+ INSERT INTO t1(content) VALUES('There was movement at the station');
|
||||
+ INSERT INTO t1(content) VALUES('For the word has passed around');
|
||||
+ INSERT INTO t1(content) VALUES('That the colt from ol regret had got');
|
||||
+ SELECT content FROM t1 WHERE content MATCH 'movement'
|
||||
+ }
|
||||
+} {{There was movement at the station}}
|
||||
+
|
||||
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 0
|
||||
+do_catchsql_test 1.6 {
|
||||
+ SELECT fts3_tokenizer('blah', fts3_tokenizer('simple')) IS NULL;
|
||||
+} {1 {fts3tokenize disabled}}
|
||||
+
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
# Test cases fts3atoken-2.* test error cases in the scalar function based
|
||||
@@ -212,14 +213,14 @@
|
||||
do_catchsql_test 6.2.1 {
|
||||
SELECT fts3_tokenizer(NULL);
|
||||
} {1 {unknown tokenizer: }}
|
||||
-ifcapable fts3_tokenizer {
|
||||
- do_catchsql_test 6.2.2 {
|
||||
- SELECT fts3_tokenizer(NULL, X'1234567812345678');
|
||||
- } {1 {argument type mismatch}}
|
||||
- do_catchsql_test 6.2.3 {
|
||||
- SELECT fts3_tokenizer(NULL, X'12345678');
|
||||
- } {1 {argument type mismatch}}
|
||||
-}
|
||||
+
|
||||
+sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
|
||||
+do_catchsql_test 6.2.2 {
|
||||
+ SELECT fts3_tokenizer(NULL, X'1234567812345678');
|
||||
+} {1 {argument type mismatch}}
|
||||
+do_catchsql_test 6.2.3 {
|
||||
+ SELECT fts3_tokenizer(NULL, X'12345678');
|
||||
+} {1 {argument type mismatch}}
|
||||
|
||||
|
||||
finish_test
|
||||
--- test/fts4langid.test
|
||||
+++ test/fts4langid.test
|
||||
@@ -358,31 +358,30 @@
|
||||
}
|
||||
}
|
||||
|
||||
-ifcapable fts3_tokenizer {
|
||||
- do_test 4.1.0 {
|
||||
- reset_db
|
||||
- set ptr [fts3_test_tokenizer]
|
||||
- execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) }
|
||||
- build_multilingual_db_2 db
|
||||
- } {}
|
||||
- do_execsql_test 4.1.1 {
|
||||
- SELECT docid FROM t4 WHERE t4 MATCH 'quick';
|
||||
- } {0}
|
||||
- do_execsql_test 4.1.2 {
|
||||
- SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1;
|
||||
- } {}
|
||||
- do_execsql_test 4.1.3 {
|
||||
- SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1;
|
||||
- } {1}
|
||||
- for {set i 0} {$i < 50} {incr i} {
|
||||
- do_execsql_test 4.1.4.$i {
|
||||
- SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i;
|
||||
- } [expr 0==($i%2)]
|
||||
- }
|
||||
- do_catchsql_test 4.1.5 {
|
||||
- INSERT INTO t4(content, lid) VALUES('hello world', 101)
|
||||
- } {1 {SQL logic error or missing database}}
|
||||
+do_test 4.1.0 {
|
||||
+ reset_db
|
||||
+ set ptr [fts3_test_tokenizer]
|
||||
+ sqlite3_db_config db SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1
|
||||
+ execsql { SELECT fts3_tokenizer('testtokenizer', $ptr) }
|
||||
+ build_multilingual_db_2 db
|
||||
+} {}
|
||||
+do_execsql_test 4.1.1 {
|
||||
+ SELECT docid FROM t4 WHERE t4 MATCH 'quick';
|
||||
+} {0}
|
||||
+do_execsql_test 4.1.2 {
|
||||
+ SELECT docid FROM t4 WHERE t4 MATCH 'quick' AND lid=1;
|
||||
+} {}
|
||||
+do_execsql_test 4.1.3 {
|
||||
+ SELECT docid FROM t4 WHERE t4 MATCH 'Quick' AND lid=1;
|
||||
+} {1}
|
||||
+for {set i 0} {$i < 50} {incr i} {
|
||||
+ do_execsql_test 4.1.4.$i {
|
||||
+ SELECT count(*) FROM t4 WHERE t4 MATCH 'fox' AND lid=$i;
|
||||
+ } [expr 0==($i%2)]
|
||||
}
|
||||
+do_catchsql_test 4.1.5 {
|
||||
+ INSERT INTO t4(content, lid) VALUES('hello world', 101)
|
||||
+} {1 {SQL logic error or missing database}}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test cases 5.*
|
||||
@ -1,232 +0,0 @@
|
||||
https://www.sqlite.org/cgi/src/info/374b5108087a2eae
|
||||
|
||||
--- sqlite3.c
|
||||
+++ sqlite3.c
|
||||
@@ -2121,11 +2121,25 @@
|
||||
** following this call. The second parameter may be a NULL pointer, in
|
||||
** which case the trigger setting is not reported back. </dd>
|
||||
**
|
||||
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
|
||||
+** <dd> ^This option is used to enable or disable the two-argument
|
||||
+** version of the [fts3_tokenizer()] function which is part of the
|
||||
+** [FTS3] full-text search engine extension.
|
||||
+** There should be two additional arguments.
|
||||
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
|
||||
+** positive to enable fts3_tokenizer() or negative to leave the setting
|
||||
+** unchanged.
|
||||
+** The second parameter is a pointer to an integer into which
|
||||
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
|
||||
+** following this call. The second parameter may be a NULL pointer, in
|
||||
+** which case the new setting is not reported back. </dd>
|
||||
+**
|
||||
** </dl>
|
||||
*/
|
||||
-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
|
||||
|
||||
|
||||
/*
|
||||
@@ -12206,6 +12220,7 @@
|
||||
#define SQLITE_VdbeEQP 0x04000000 /* Debug EXPLAIN QUERY PLAN */
|
||||
#define SQLITE_Vacuum 0x08000000 /* Currently in a VACUUM */
|
||||
#define SQLITE_CellSizeCk 0x10000000 /* Check btree cell sizes on load */
|
||||
+#define SQLITE_Fts3Tokenizer 0x20000000 /* Enable fts3_tokenizer(2) */
|
||||
|
||||
|
||||
/*
|
||||
@@ -133589,8 +133604,9 @@
|
||||
int op; /* The opcode */
|
||||
u32 mask; /* Mask of the bit in sqlite3.flags to set/clear */
|
||||
} aFlagOp[] = {
|
||||
- { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys },
|
||||
- { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_FKEY, SQLITE_ForeignKeys },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_TRIGGER, SQLITE_EnableTrigger },
|
||||
+ { SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, SQLITE_Fts3Tokenizer },
|
||||
};
|
||||
unsigned int i;
|
||||
rc = SQLITE_ERROR; /* IMP: R-42790-23372 */
|
||||
@@ -135607,6 +135623,9 @@
|
||||
#if defined(SQLITE_ENABLE_OVERSIZE_CELL_CHECK)
|
||||
| SQLITE_CellSizeCk
|
||||
#endif
|
||||
+#if defined(SQLITE_ENABLE_FTS3_TOKENIZER)
|
||||
+ | SQLITE_Fts3Tokenizer
|
||||
+#endif
|
||||
;
|
||||
sqlite3HashInit(&db->aCollSeq);
|
||||
#ifndef SQLITE_OMIT_VIRTUALTABLE
|
||||
@@ -146857,6 +146876,18 @@
|
||||
/* #include <string.h> */
|
||||
|
||||
/*
|
||||
+** Return true if the two-argument version of fts3_tokenizer()
|
||||
+** has been activated via a prior call to sqlite3_db_config(db,
|
||||
+** SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, 0);
|
||||
+*/
|
||||
+static int fts3TokenizerEnabled(sqlite3_context *context){
|
||||
+ sqlite3 *db = sqlite3_context_db_handle(context);
|
||||
+ int isEnabled = 0;
|
||||
+ sqlite3_db_config(db,SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER,-1,&isEnabled);
|
||||
+ return isEnabled;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
** Implementation of the SQL scalar function for accessing the underlying
|
||||
** hash table. This function may be called as follows:
|
||||
**
|
||||
@@ -146876,7 +146907,7 @@
|
||||
** is a blob containing the pointer stored as the hash data corresponding
|
||||
** to string <key-name> (after the hash-table is updated, if applicable).
|
||||
*/
|
||||
-static void scalarFunc(
|
||||
+static void fts3TokenizerFunc(
|
||||
sqlite3_context *context,
|
||||
int argc,
|
||||
sqlite3_value **argv
|
||||
@@ -146894,27 +146925,23 @@
|
||||
nName = sqlite3_value_bytes(argv[0])+1;
|
||||
|
||||
if( argc==2 ){
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
- void *pOld;
|
||||
- int n = sqlite3_value_bytes(argv[1]);
|
||||
- if( zName==0 || n!=sizeof(pPtr) ){
|
||||
- sqlite3_result_error(context, "argument type mismatch", -1);
|
||||
- return;
|
||||
- }
|
||||
- pPtr = *(void **)sqlite3_value_blob(argv[1]);
|
||||
- pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
|
||||
- if( pOld==pPtr ){
|
||||
- sqlite3_result_error(context, "out of memory", -1);
|
||||
+ if( fts3TokenizerEnabled(context) ){
|
||||
+ void *pOld;
|
||||
+ int n = sqlite3_value_bytes(argv[1]);
|
||||
+ if( zName==0 || n!=sizeof(pPtr) ){
|
||||
+ sqlite3_result_error(context, "argument type mismatch", -1);
|
||||
+ return;
|
||||
+ }
|
||||
+ pPtr = *(void **)sqlite3_value_blob(argv[1]);
|
||||
+ pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
|
||||
+ if( pOld==pPtr ){
|
||||
+ sqlite3_result_error(context, "out of memory", -1);
|
||||
+ }
|
||||
+ }else{
|
||||
+ sqlite3_result_error(context, "fts3tokenize disabled", -1);
|
||||
return;
|
||||
}
|
||||
-#else
|
||||
- sqlite3_result_error(context, "fts3tokenize: "
|
||||
- "disabled - rebuild with -DSQLITE_ENABLE_FTS3_TOKENIZER", -1
|
||||
- );
|
||||
- return;
|
||||
-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
|
||||
- }else
|
||||
- {
|
||||
+ }else{
|
||||
if( zName ){
|
||||
pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
|
||||
}
|
||||
@@ -146925,7 +146952,6 @@
|
||||
return;
|
||||
}
|
||||
}
|
||||
-
|
||||
sqlite3_result_blob(context, (void *)&pPtr, sizeof(pPtr), SQLITE_TRANSIENT);
|
||||
}
|
||||
|
||||
@@ -147163,7 +147189,6 @@
|
||||
Tcl_DecrRefCount(pRet);
|
||||
}
|
||||
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
static
|
||||
int registerTokenizer(
|
||||
sqlite3 *db,
|
||||
@@ -147185,7 +147210,6 @@
|
||||
|
||||
return sqlite3_finalize(pStmt);
|
||||
}
|
||||
-#endif /* SQLITE_ENABLE_FTS3_TOKENIZER */
|
||||
|
||||
|
||||
static
|
||||
@@ -147258,13 +147282,13 @@
|
||||
assert( 0==strcmp(sqlite3_errmsg(db), "unknown tokenizer: nosuchtokenizer") );
|
||||
|
||||
/* Test the storage function */
|
||||
-#ifdef SQLITE_ENABLE_FTS3_TOKENIZER
|
||||
- rc = registerTokenizer(db, "nosuchtokenizer", p1);
|
||||
- assert( rc==SQLITE_OK );
|
||||
- rc = queryTokenizer(db, "nosuchtokenizer", &p2);
|
||||
- assert( rc==SQLITE_OK );
|
||||
- assert( p2==p1 );
|
||||
-#endif
|
||||
+ if( fts3TokenizerEnabled(context) ){
|
||||
+ rc = registerTokenizer(db, "nosuchtokenizer", p1);
|
||||
+ assert( rc==SQLITE_OK );
|
||||
+ rc = queryTokenizer(db, "nosuchtokenizer", &p2);
|
||||
+ assert( rc==SQLITE_OK );
|
||||
+ assert( p2==p1 );
|
||||
+ }
|
||||
|
||||
sqlite3_result_text(context, "ok", -1, SQLITE_STATIC);
|
||||
}
|
||||
@@ -147280,7 +147304,7 @@
|
||||
** sqlite3Fts3HashInit(pHash, FTS3_HASH_STRING, 1);
|
||||
**
|
||||
** This function adds a scalar function (see header comment above
|
||||
-** scalarFunc() in this file for details) and, if ENABLE_TABLE is
|
||||
+** fts3TokenizerFunc() in this file for details) and, if ENABLE_TABLE is
|
||||
** defined at compilation time, a temporary virtual table (see header
|
||||
** comment above struct HashTableVtab) to the database schema. Both
|
||||
** provide read/write access to the contents of *pHash.
|
||||
@@ -147309,10 +147333,10 @@
|
||||
#endif
|
||||
|
||||
if( SQLITE_OK==rc ){
|
||||
- rc = sqlite3_create_function(db, zName, 1, any, p, scalarFunc, 0, 0);
|
||||
+ rc = sqlite3_create_function(db, zName, 1, any, p, fts3TokenizerFunc, 0, 0);
|
||||
}
|
||||
if( SQLITE_OK==rc ){
|
||||
- rc = sqlite3_create_function(db, zName, 2, any, p, scalarFunc, 0, 0);
|
||||
+ rc = sqlite3_create_function(db, zName, 2, any, p, fts3TokenizerFunc, 0, 0);
|
||||
}
|
||||
#ifdef SQLITE_TEST
|
||||
if( SQLITE_OK==rc ){
|
||||
--- sqlite3.h
|
||||
+++ sqlite3.h
|
||||
@@ -1904,11 +1904,25 @@
|
||||
** following this call. The second parameter may be a NULL pointer, in
|
||||
** which case the trigger setting is not reported back. </dd>
|
||||
**
|
||||
+** <dt>SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER</dt>
|
||||
+** <dd> ^This option is used to enable or disable the two-argument
|
||||
+** version of the [fts3_tokenizer()] function which is part of the
|
||||
+** [FTS3] full-text search engine extension.
|
||||
+** There should be two additional arguments.
|
||||
+** The first argument is an integer which is 0 to disable fts3_tokenizer() or
|
||||
+** positive to enable fts3_tokenizer() or negative to leave the setting
|
||||
+** unchanged.
|
||||
+** The second parameter is a pointer to an integer into which
|
||||
+** is written 0 or 1 to indicate whether fts3_tokenizer is disabled or enabled
|
||||
+** following this call. The second parameter may be a NULL pointer, in
|
||||
+** which case the new setting is not reported back. </dd>
|
||||
+**
|
||||
** </dl>
|
||||
*/
|
||||
-#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
-#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_LOOKASIDE 1001 /* void* int int */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FKEY 1002 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_TRIGGER 1003 /* int int* */
|
||||
+#define SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER 1004 /* int int* */
|
||||
|
||||
|
||||
/*
|
||||
@ -1,38 +0,0 @@
|
||||
Link executables against libsqlite3.so.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- Makefile.am
|
||||
+++ Makefile.am
|
||||
@@ -1,15 +1,16 @@
|
||||
|
||||
-AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
|
||||
+AM_CFLAGS = @THREADSAFE_FLAGS@ @DYNAMIC_EXTENSION_FLAGS@ @FTS5_FLAGS@ @JSON1_FLAGS@ -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_RTREE
|
||||
|
||||
lib_LTLIBRARIES = libsqlite3.la
|
||||
libsqlite3_la_SOURCES = sqlite3.c
|
||||
libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
|
||||
|
||||
bin_PROGRAMS = sqlite3
|
||||
-sqlite3_SOURCES = shell.c sqlite3.c sqlite3.h
|
||||
-sqlite3_LDADD = @READLINE_LIBS@
|
||||
+sqlite3_SOURCES = shell.c sqlite3.h
|
||||
+EXTRA_sqlite3_SOURCES = sqlite3.c
|
||||
+sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
|
||||
sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
|
||||
-sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
+sqlite3_CFLAGS = $(AM_CFLAGS)
|
||||
|
||||
include_HEADERS = sqlite3.h sqlite3ext.h
|
||||
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -89,6 +89,9 @@
|
||||
[], [enable_dynamic_extensions=yes])
|
||||
if test x"$enable_dynamic_extensions" != "xno"; then
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
+ fi
|
||||
else
|
||||
DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
fi
|
||||
@ -2,7 +2,7 @@ Fix building with dlopen() not available.
|
||||
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -89,6 +89,9 @@
|
||||
@@ -102,6 +102,9 @@
|
||||
[], [enable_dynamic_extensions=yes])
|
||||
if test x"$enable_dynamic_extensions" != "xno"; then
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
@ -4,16 +4,15 @@ Fix building with dlopen() not available.
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -555,7 +555,7 @@
|
||||
# Extra compiler options for various shell tools
|
||||
@@ -565,6 +565,7 @@
|
||||
#
|
||||
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
|
||||
-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
|
||||
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
@@ -576,18 +576,18 @@
|
||||
# SHELL_OPT += -DSQLITE_ENABLE_FTS5
|
||||
+SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
|
||||
@@ -591,25 +592,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
@ -32,14 +31,25 @@ Fix building with dlopen() not available.
|
||||
+ $(TOP)/src/shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -656,7 +656,7 @@
|
||||
@@ -685,7 +686,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
@ -48,7 +58,7 @@ Fix building with dlopen() not available.
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1082,13 +1082,13 @@
|
||||
@@ -1115,13 +1116,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
@ -63,16 +73,16 @@ Fix building with dlopen() not available.
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# Minimal testing that runs in less than 3 minutes
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1114,32 +1114,32 @@
|
||||
@@ -1151,36 +1152,35 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
echo "#define TCLSH 2" > $@
|
||||
echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
|
||||
- echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
|
||||
- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
|
||||
+ cat $(TOP)/src/tclsqlite.c >> $@
|
||||
echo "static const char *tclsh_main_loop(void){" >> $@
|
||||
@ -85,6 +95,12 @@ Fix building with dlopen() not available.
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
@ -112,20 +128,25 @@ Fix building with dlopen() not available.
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1153,8 +1153,8 @@
|
||||
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
|
||||
@@ -1199,11 +1199,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -570,6 +570,9 @@
|
||||
@@ -584,6 +584,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
@ -0,0 +1,33 @@
|
||||
https://sqlite.org/src/info/42f0777555675875
|
||||
|
||||
--- ext/misc/csv.c
|
||||
+++ ext/misc/csv.c
|
||||
@@ -78,7 +78,7 @@
|
||||
int nAlloc; /* Space allocated for z[] */
|
||||
int nLine; /* Current line number */
|
||||
int bNotFirst; /* True if prior text has been seen */
|
||||
- char cTerm; /* Character that terminated the most recent field */
|
||||
+ int cTerm; /* Character that terminated the most recent field */
|
||||
size_t iIn; /* Next unread character in the input buffer */
|
||||
size_t nIn; /* Number of characters in the input buffer */
|
||||
char *zIn; /* The input buffer */
|
||||
@@ -166,7 +166,7 @@
|
||||
if( p->in!=0 ) return csv_getc_refill(p);
|
||||
return EOF;
|
||||
}
|
||||
- return p->zIn[p->iIn++];
|
||||
+ return ((unsigned char*)p->zIn)[p->iIn++];
|
||||
}
|
||||
|
||||
/* Increase the size of p->z and append character c to the end.
|
||||
--- test/releasetest.tcl
|
||||
+++ test/releasetest.tcl
|
||||
@@ -114,7 +114,7 @@
|
||||
}
|
||||
"Debug-One" {
|
||||
--disable-shared
|
||||
- -O2
|
||||
+ -O2 -funsigned-char
|
||||
-DSQLITE_DEBUG=1
|
||||
-DSQLITE_MEMDEBUG=1
|
||||
-DSQLITE_MUTEX_NOOP=1
|
||||
@ -0,0 +1,95 @@
|
||||
https://www.sqlite.org/src/info/87ccdf9cbb928455
|
||||
|
||||
--- test/fts3conf.test
|
||||
+++ test/fts3conf.test
|
||||
@@ -136,47 +136,49 @@
|
||||
do_execsql_test 2.2.3 { SELECT * FROM t1 } {{a b c} {a b c}}
|
||||
fts3_integrity 2.2.4 db t1
|
||||
|
||||
-do_execsql_test 3.1 {
|
||||
- CREATE VIRTUAL TABLE t3 USING fts4;
|
||||
- REPLACE INTO t3(docid, content) VALUES (1, 'one two');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0100000002000000'}
|
||||
-
|
||||
-do_execsql_test 3.2 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
|
||||
-} {X'0200000003000000'}
|
||||
-
|
||||
-do_execsql_test 3.3 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0200000005000000'}
|
||||
-
|
||||
-do_execsql_test 3.4 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0100000006000000'}
|
||||
-
|
||||
-do_execsql_test 3.5 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
-} {X'0100000006000000'}
|
||||
-
|
||||
-do_execsql_test 3.6 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (3, 'one two');
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0100000002000000'}
|
||||
-
|
||||
-do_execsql_test 3.7 {
|
||||
- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four');
|
||||
- REPLACE INTO t3(docid, content) VALUES (NULL, 'one two three four five six');
|
||||
- SELECT docid FROM t3;
|
||||
-} {3 4 5}
|
||||
-
|
||||
-do_execsql_test 3.8 {
|
||||
- UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
|
||||
- SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
-} {X'0200000002000000'}
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ do_execsql_test 3.1 {
|
||||
+ CREATE VIRTUAL TABLE t3 USING fts4;
|
||||
+ REPLACE INTO t3(docid, content) VALUES (1, 'one two');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0100000002000000'}
|
||||
+
|
||||
+ do_execsql_test 3.2 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (2, 'one two three four');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'four'
|
||||
+ } {X'0200000003000000'}
|
||||
+
|
||||
+ do_execsql_test 3.3 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (1, 'one two three four five six');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0200000005000000'}
|
||||
+
|
||||
+ do_execsql_test 3.4 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 2 WHERE docid=1;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0100000006000000'}
|
||||
+
|
||||
+ do_execsql_test 3.5 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 3 WHERE docid=2;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'six'
|
||||
+ } {X'0100000006000000'}
|
||||
+
|
||||
+ do_execsql_test 3.6 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES (3, 'one two');
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0100000002000000'}
|
||||
+
|
||||
+ do_execsql_test 3.7 {
|
||||
+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four');
|
||||
+ REPLACE INTO t3(docid, content) VALUES(NULL,'one two three four five six');
|
||||
+ SELECT docid FROM t3;
|
||||
+ } {3 4 5}
|
||||
+
|
||||
+ do_execsql_test 3.8 {
|
||||
+ UPDATE OR REPLACE t3 SET docid = 5, content='three four' WHERE docid = 4;
|
||||
+ SELECT quote(matchinfo(t3, 'na')) FROM t3 WHERE t3 MATCH 'one'
|
||||
+ } {X'0200000002000000'}
|
||||
+}
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
# Test that the xSavepoint is invoked correctly if the first write
|
||||
@ -2,18 +2,9 @@ Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -550,7 +550,7 @@
|
||||
# Extra compiler options for various shell tools
|
||||
#
|
||||
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
|
||||
-SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
|
||||
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
@@ -571,18 +571,18 @@
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -600,25 +600,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
@ -23,23 +14,34 @@ Fix building with dlopen() not available.
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): $(TOP)/src/shell.c sqlite3.c
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- $(TOP)/src/shell.c sqlite3.c \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ $(TOP)/src/shell.c libsqlite3.la \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -650,7 +650,7 @@
|
||||
@@ -694,7 +694,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
@ -48,7 +50,7 @@ Fix building with dlopen() not available.
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1074,13 +1074,13 @@
|
||||
@@ -1145,13 +1145,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
@ -63,28 +65,27 @@ Fix building with dlopen() not available.
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# Minimal testing that runs in less than 3 minutes
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1106,29 +1106,29 @@
|
||||
@@ -1181,30 +1181,30 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
|
||||
echo "#define TCLSH 2" > $@
|
||||
echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
|
||||
- cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
|
||||
+ cat $(TOP)/src/tclsqlite.c >> $@
|
||||
echo "static const char *tclsh_main_loop(void){" >> $@
|
||||
echo "static const char *zMainloop = " >> $@
|
||||
$(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
|
||||
echo "; return zMainloop; }" >> $@
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
@ -105,22 +106,32 @@ Fix building with dlopen() not available.
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1142,8 +1142,8 @@
|
||||
speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
|
||||
@@ -1223,11 +1223,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
$(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -570,6 +570,9 @@
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -584,6 +584,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
@ -130,3 +141,13 @@ Fix building with dlopen() not available.
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,7 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-INCLUDE sqlite3.c
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
@ -0,0 +1,14 @@
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -102,6 +102,9 @@
|
||||
[], [enable_dynamic_extensions=yes])
|
||||
if test x"$enable_dynamic_extensions" != "xno"; then
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
+ fi
|
||||
else
|
||||
DYNAMIC_EXTENSION_FLAGS=-DSQLITE_OMIT_LOAD_EXTENSION=1
|
||||
fi
|
||||
@ -0,0 +1,405 @@
|
||||
Move some code to libsqlite3.so to avoid duplication.
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -307,6 +307,9 @@
|
||||
# Source code for extensions
|
||||
#
|
||||
SRC += \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.c \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.h
|
||||
+SRC += \
|
||||
$(TOP)/ext/fts1/fts1.c \
|
||||
$(TOP)/ext/fts1/fts1.h \
|
||||
$(TOP)/ext/fts1/fts1_hash.c \
|
||||
@@ -355,8 +358,11 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/json1.c \
|
||||
- $(TOP)/ext/misc/stmt.c
|
||||
+ $(TOP)/ext/misc/sqlar.c \
|
||||
+ $(TOP)/ext/misc/stmt.c \
|
||||
+ $(TOP)/ext/misc/zipfile.c
|
||||
|
||||
# Generated source code files
|
||||
#
|
||||
@@ -425,7 +431,6 @@
|
||||
# Statically linked extensions
|
||||
#
|
||||
TESTSRC += \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
$(TOP)/ext/expert/test_expert.c \
|
||||
$(TOP)/ext/misc/amatch.c \
|
||||
$(TOP)/ext/misc/carray.c \
|
||||
@@ -447,8 +452,7 @@
|
||||
$(TOP)/ext/misc/spellfix.c \
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.c \
|
||||
- $(TOP)/ext/misc/wholenumber.c \
|
||||
- $(TOP)/ext/misc/zipfile.c
|
||||
+ $(TOP)/ext/misc/wholenumber.c
|
||||
|
||||
# Source code to the library files needed by the test fixture
|
||||
#
|
||||
@@ -610,25 +614,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -704,7 +708,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -995,14 +999,9 @@
|
||||
# Source files that go into making shell.c
|
||||
SHELL_SRC = \
|
||||
$(TOP)/src/shell.c.in \
|
||||
- $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/shathree.c \
|
||||
$(TOP)/ext/misc/fileio.c \
|
||||
$(TOP)/ext/misc/completion.c \
|
||||
- $(TOP)/ext/misc/sqlar.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.h \
|
||||
- $(TOP)/ext/misc/zipfile.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
|
||||
@@ -1161,13 +1160,13 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA)
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
#
|
||||
@@ -1197,24 +1196,23 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-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
|
||||
+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
|
||||
|
||||
-sqltclsh$(TEXE): sqltclsh.c
|
||||
- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
|
||||
+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
|
||||
- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
|
||||
+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
|
||||
|
||||
CHECKER_DEPS =\
|
||||
$(TOP)/tool/mkccode.tcl \
|
||||
- sqlite3.c \
|
||||
$(TOP)/src/tclsqlite.c \
|
||||
$(TOP)/ext/repair/sqlite3_checker.tcl \
|
||||
$(TOP)/ext/repair/checkindex.c \
|
||||
@@ -1225,30 +1223,30 @@
|
||||
sqlite3_checker.c: $(CHECKER_DEPS)
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
|
||||
|
||||
-sqlite3_checker$(TEXE): sqlite3_checker.c
|
||||
- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
showshm$(TEXE): $(TOP)/tool/showshm.c
|
||||
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1267,11 +1265,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -590,6 +590,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /ext/misc/sqlar.c
|
||||
+++ /ext/misc/sqlar.c
|
||||
@@ -14,6 +14,8 @@
|
||||
** for working with sqlar archives and used by the shell tool's built-in
|
||||
** sqlar support.
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <zlib.h>
|
||||
@@ -119,3 +121,5 @@
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/misc/zipfile.c
|
||||
+++ /ext/misc/zipfile.c
|
||||
@@ -24,6 +24,8 @@
|
||||
** * No support for zip64 extensions
|
||||
** * Only the "inflate/deflate" (zlib) compression method is supported
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <stdio.h>
|
||||
@@ -1665,3 +1667,5 @@
|
||||
(void)pzErrMsg; /* Unused parameter */
|
||||
return zipfileRegister(db);
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/repair/sqlite3_checker.c.in
|
||||
+++ /ext/repair/sqlite3_checker.c.in
|
||||
@@ -2,6 +2,7 @@
|
||||
** Read an SQLite database file and analyze its space utilization. Generate
|
||||
** text on standard output.
|
||||
*/
|
||||
+#define SQLITE_CORE 1
|
||||
#define TCLSH_INIT_PROC sqlite3_checker_init_proc
|
||||
#define SQLITE_ENABLE_DBPAGE_VTAB 1
|
||||
#define SQLITE_ENABLE_JSON1 1
|
||||
@@ -14,7 +15,7 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
INCLUDE $ROOT/ext/misc/btreeinfo.c
|
||||
INCLUDE $ROOT/ext/repair/checkindex.c
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include "sqlite3.h"
|
||||
+#include "ext/expert/sqlite3expert.h"
|
||||
typedef sqlite3_int64 i64;
|
||||
typedef sqlite3_uint64 u64;
|
||||
typedef unsigned char u8;
|
||||
@@ -124,6 +125,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -963,13 +968,6 @@
|
||||
INCLUDE ../ext/misc/shathree.c
|
||||
INCLUDE ../ext/misc/fileio.c
|
||||
INCLUDE ../ext/misc/completion.c
|
||||
-INCLUDE ../ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE ../ext/misc/zipfile.c
|
||||
-INCLUDE ../ext/misc/sqlar.c
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -3467,7 +3465,9 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_zipfile_init(p->db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(p->db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
|
||||
@@ -5316,6 +5316,7 @@
|
||||
}
|
||||
sqlite3_fileio_init(cmd.db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(cmd.db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
|
||||
@@ -8222,6 +8223,7 @@
|
||||
#endif
|
||||
}
|
||||
data.out = stdout;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
|
||||
/* Go ahead and open the database file if it already exists. If the
|
||||
--- /tool/mksqlite3c.tcl
|
||||
+++ /tool/mksqlite3c.tcl
|
||||
@@ -116,6 +116,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -399,6 +400,10 @@
|
||||
json1.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ sqlar.c
|
||||
+ sqlite3expert.c
|
||||
+ zipfile.c
|
||||
} {
|
||||
copy_file tsrc/$file
|
||||
}
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,9 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-#ifndef USE_EXTERNAL_SQLITE
|
||||
-INCLUDE sqlite3.c
|
||||
-#endif
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
--- /tool/sqltclsh.c.in
|
||||
+++ /tool/sqltclsh.c.in
|
||||
@@ -27,19 +27,17 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
-INCLUDE $ROOT/ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE $ROOT/ext/misc/zipfile.c
|
||||
-INCLUDE $ROOT/ext/misc/sqlar.c
|
||||
-#endif
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
|
||||
(void)interp;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,15 @@
|
||||
https://sqlite.org/src/info/6185d190e250faae
|
||||
|
||||
--- /src/sqlite3ext.h
|
||||
+++ /src/sqlite3ext.h
|
||||
@@ -563,8 +563,8 @@
|
||||
#define sqlite3_value_pointer sqlite3_api->value_pointer
|
||||
/* Version 3.22.0 and later */
|
||||
#define sqlite3_vtab_nochange sqlite3_api->vtab_nochange
|
||||
-#define sqlite3_value_nochange sqltie3_api->value_nochange
|
||||
-#define sqlite3_vtab_collation sqltie3_api->vtab_collation
|
||||
+#define sqlite3_value_nochange sqlite3_api->value_nochange
|
||||
+#define sqlite3_vtab_collation sqlite3_api->vtab_collation
|
||||
#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
|
||||
|
||||
#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
|
||||
@ -0,0 +1,249 @@
|
||||
https://sqlite.org/src/info/e4766cabdf64d8e9
|
||||
https://sqlite.org/src/info/d9e59cfb8476e1ec
|
||||
https://sqlite.org/src/info/ba0631de60ca38bf
|
||||
https://sqlite.org/src/info/b685d3231097fb90
|
||||
|
||||
--- /test/fts3rank.test
|
||||
+++ /test/fts3rank.test
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
-set testprefix fts3expr5
|
||||
+set testprefix fts3rank
|
||||
|
||||
# If SQLITE_ENABLE_FTS3 is defined, omit this file.
|
||||
ifcapable !fts3 {
|
||||
@@ -56,9 +56,14 @@
|
||||
SELECT * FROM t1 ORDER BY rank(x'0000000000000000') DESC, rowid
|
||||
} {0 {{one two} one {one two} three {one two} two}}
|
||||
|
||||
-do_catchsql_test 1.5 {
|
||||
- SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
|
||||
-} {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+if {$tcl_platform(byteOrder)=="littleEndian"} {
|
||||
+ do_catchsql_test 1.5le {
|
||||
+ SELECT * FROM t1 ORDER BY rank(x'0100000001000000') DESC, rowid
|
||||
+ } {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+} else {
|
||||
+ do_catchsql_test 1.5be {
|
||||
+ SELECT * FROM t1 ORDER BY rank(x'0000000100000001') DESC, rowid
|
||||
+ } {1 {invalid matchinfo blob passed to function rank()}}
|
||||
+}
|
||||
|
||||
finish_test
|
||||
-
|
||||
--- /test/func6.test
|
||||
+++ /test/func6.test
|
||||
@@ -33,54 +33,125 @@
|
||||
CREATE TABLE t2(x TEXT PRIMARY KEY, y) WITHOUT ROWID;
|
||||
INSERT INTO t2(x,y) SELECT a, b FROM t1;
|
||||
}
|
||||
+
|
||||
+# Load the contents of $file from disk and return it encoded as a hex
|
||||
+# string.
|
||||
+proc loadhex {file} {
|
||||
+ set fd [open $file]
|
||||
+ fconfigure $fd -translation binary -encoding binary
|
||||
+ set data [read $fd]
|
||||
+ close $fd
|
||||
+ binary encode hex $data
|
||||
+}
|
||||
+
|
||||
+# Each argument is either an integer between 0 and 65535, a text value, or
|
||||
+# an empty string representing an SQL NULL. This command builds an SQLite
|
||||
+# record containing the values passed as arguments and returns it encoded
|
||||
+# as a hex string.
|
||||
+proc hexrecord {args} {
|
||||
+ set hdr ""
|
||||
+ set body ""
|
||||
+ foreach x $args {
|
||||
+ if {$x==""} {
|
||||
+ append hdr 00
|
||||
+ } elseif {[string is integer $x]==0} {
|
||||
+ set n [string length $x]
|
||||
+ append hdr [format %02x [expr $n*2 + 13]]
|
||||
+ append body [binary encode hex $x]
|
||||
+ } elseif {$x == 0} {
|
||||
+ append hdr 08
|
||||
+ } elseif {$x == 1} {
|
||||
+ append hdr 09
|
||||
+ } elseif {$x <= 127} {
|
||||
+ append hdr 01
|
||||
+ append body [format %02x $x]
|
||||
+ } else {
|
||||
+ append hdr 02
|
||||
+ append body [format %04x $x]
|
||||
+ }
|
||||
+ }
|
||||
+ set res [format %02x [expr 1 + [string length $hdr]/2]]
|
||||
+ append res $hdr
|
||||
+ append res $body
|
||||
+}
|
||||
+
|
||||
+# Argument $off is an offset into the database image encoded as a hex string
|
||||
+# in argument $hexdb. This command returns 0 if the offset contains the hex
|
||||
+# $hexrec, or throws an exception otherwise.
|
||||
+#
|
||||
+proc offset_contains_record {off hexdb hexrec} {
|
||||
+ set n [string length $hexrec]
|
||||
+ set off [expr $off*2]
|
||||
+ if { [string compare $hexrec [string range $hexdb $off [expr $off+$n-1]]] } {
|
||||
+ error "record not found!"
|
||||
+ }
|
||||
+ return 0
|
||||
+}
|
||||
+
|
||||
+# This command is the implementation of SQL function "offrec()". The first
|
||||
+# argument to this is an offset value. The remaining values are used to
|
||||
+# formulate an SQLite record. If database file test.db does not contain
|
||||
+# an equivalent record at the specified offset, an exception is thrown.
|
||||
+# Otherwise, 0 is returned.
|
||||
+#
|
||||
+proc offrec {args} {
|
||||
+ set offset [lindex $args 0]
|
||||
+ set rec [hexrecord {*}[lrange $args 1 end]]
|
||||
+ offset_contains_record $offset $::F $rec
|
||||
+}
|
||||
+set F [loadhex test.db]
|
||||
+db func offrec offrec
|
||||
+
|
||||
+# Test the sanity of the tests.
|
||||
+do_execsql_test func6-105 {
|
||||
+ SELECT sqlite_offset(d) FROM t1 ORDER BY rowid LIMIT 1;
|
||||
+} {8179}
|
||||
+do_test func6-106 {
|
||||
+ set r [hexrecord abc001 1 999 {}]
|
||||
+ offset_contains_record 8179 $F $r
|
||||
+} 0
|
||||
+
|
||||
+set z100 [string trim [string repeat "0 " 100]]
|
||||
+
|
||||
+# Test offsets within table b-tree t1.
|
||||
do_execsql_test func6-110 {
|
||||
- SELECT a, sqlite_offset(d)/4096 + 1,
|
||||
- sqlite_offset(d)%4096 FROM t1
|
||||
- ORDER BY rowid LIMIT 2;
|
||||
-} {abc001 2 4084 abc002 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY rowid
|
||||
+} $z100
|
||||
+
|
||||
do_execsql_test func6-120 {
|
||||
SELECT a, typeof(sqlite_offset(+a)) FROM t1
|
||||
ORDER BY rowid LIMIT 2;
|
||||
} {abc001 null abc002 null}
|
||||
+
|
||||
+# Test offsets within index b-tree t1a.
|
||||
do_execsql_test func6-130 {
|
||||
- SELECT a, sqlite_offset(a)/4096+1,
|
||||
- sqlite_offset(a)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 3 4087 abc002 3 4076}
|
||||
+ SELECT offrec(sqlite_offset(a), a, rowid) FROM t1 ORDER BY a
|
||||
+} $z100
|
||||
+
|
||||
+# Test offsets within table b-tree t1 with a temp b-tree ORDER BY.
|
||||
do_execsql_test func6-140 {
|
||||
- SELECT a, sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 2 4084 abc002 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(d), a, b, c, d) FROM t1 ORDER BY a
|
||||
+} $z100
|
||||
+
|
||||
+# Test offsets from both index t1a and table t1 in the same query.
|
||||
do_execsql_test func6-150 {
|
||||
- SELECT a,
|
||||
- sqlite_offset(a)/4096+1,
|
||||
- sqlite_offset(a)%4096,
|
||||
- sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY a LIMIT 2;
|
||||
-} {abc001 3 4087 2 4084 abc002 3 4076 2 4069}
|
||||
-do_execsql_test func6-160 {
|
||||
- SELECT b,
|
||||
- sqlite_offset(b)/4096+1,
|
||||
- sqlite_offset(b)%4096,
|
||||
- sqlite_offset(c)/4096+1,
|
||||
- sqlite_offset(c)%4096,
|
||||
- sqlite_offset(d)/4096+1,
|
||||
- sqlite_offset(d)%4096
|
||||
- FROM t1
|
||||
- ORDER BY b LIMIT 2;
|
||||
-} {1 4 4090 4 4090 2 4084 2 4 4081 4 4081 2 4069}
|
||||
+ SELECT offrec(sqlite_offset(a), a, rowid),
|
||||
+ offrec(sqlite_offset(d), a, b, c, d)
|
||||
+ FROM t1 ORDER BY a
|
||||
+} [concat $z100 $z100]
|
||||
|
||||
+# Test offsets from both index t1bc and table t1 in the same query.
|
||||
+do_execsql_test func6-160 {
|
||||
+ SELECT offrec(sqlite_offset(b), b, c, rowid),
|
||||
+ offrec(sqlite_offset(c), b, c, rowid),
|
||||
+ offrec(sqlite_offset(d), a, b, c, d)
|
||||
+ FROM t1
|
||||
+ ORDER BY b
|
||||
+} [concat $z100 $z100 $z100]
|
||||
|
||||
+# Test offsets in WITHOUT ROWID table t2.
|
||||
do_execsql_test func6-200 {
|
||||
- SELECT y, sqlite_offset(y)/4096+1,
|
||||
- sqlite_offset(y)%4096
|
||||
- FROM t2
|
||||
- ORDER BY x LIMIT 2;
|
||||
-} {1 5 4087 2 5 4076}
|
||||
+ SELECT offrec( sqlite_offset(y), x, y ) FROM t2 ORDER BY x
|
||||
+} $z100
|
||||
|
||||
finish_test
|
||||
--- /test/walro2.test
|
||||
+++ /test/walro2.test
|
||||
@@ -39,6 +39,18 @@
|
||||
}
|
||||
}
|
||||
|
||||
+# Most systems allocate the *-shm file in 32KB trunks. But on UNIX systems
|
||||
+# for which the getpagesize() call returns greater than 32K, the *-shm
|
||||
+# file is allocated in page-sized units (since you cannot mmap part of
|
||||
+# a page). The following code sets variable $MINSHMSZ to the smallest
|
||||
+# possible *-shm file (i.e. the greater of 32KB and the system page-size).
|
||||
+#
|
||||
+do_execsql_test 0.0 {
|
||||
+ PRAGMA journal_mode = wal;
|
||||
+ CREATE TABLE t1(x);
|
||||
+} {wal}
|
||||
+set MINSHMSZ [file size test.db-shm]
|
||||
+
|
||||
foreach bZeroShm {0 1} {
|
||||
set TN [expr $bZeroShm+1]
|
||||
do_multiclient_test tn {
|
||||
@@ -169,7 +181,7 @@
|
||||
} {a b c d e f g h 1 2}
|
||||
do_test $TN.3.2.2 {
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } {0 32768}
|
||||
+ } [list 0 $MINSHMSZ]
|
||||
|
||||
do_test $TN.3.3.0 {
|
||||
code2 { sqlite3 db2 test.db }
|
||||
@@ -182,7 +194,7 @@
|
||||
code2 { db2 close }
|
||||
code1 { db close }
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } [list [wal_file_size 4 1024] 32768]
|
||||
+ } [list [wal_file_size 4 1024] $MINSHMSZ]
|
||||
do_test $TN.3.3.1 {
|
||||
code1 { sqlite3 db file:test.db?readonly_shm=1 }
|
||||
sql1 { SELECT * FROM t1 }
|
||||
@@ -196,7 +208,7 @@
|
||||
}
|
||||
code2 { db2 close }
|
||||
list [file size test.db-wal] [file size test.db-shm]
|
||||
- } [list [wal_file_size 4 1024] 32768]
|
||||
+ } [list [wal_file_size 4 1024] $MINSHMSZ]
|
||||
do_test $TN.3.3.3 {
|
||||
sql1 { SELECT * FROM t1 }
|
||||
} {i ii}
|
||||
@ -0,0 +1,407 @@
|
||||
Move some code to libsqlite3.so to avoid duplication.
|
||||
Link executables against libsqlite3.so.
|
||||
Increase timeout for fuzzcheck.
|
||||
Fix building with dlopen() not available.
|
||||
|
||||
--- /Makefile.in
|
||||
+++ /Makefile.in
|
||||
@@ -308,6 +308,9 @@
|
||||
# Source code for extensions
|
||||
#
|
||||
SRC += \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.c \
|
||||
+ $(TOP)/ext/expert/sqlite3expert.h
|
||||
+SRC += \
|
||||
$(TOP)/ext/fts1/fts1.c \
|
||||
$(TOP)/ext/fts1/fts1.h \
|
||||
$(TOP)/ext/fts1/fts1_hash.c \
|
||||
@@ -356,8 +359,11 @@
|
||||
$(TOP)/ext/rbu/sqlite3rbu.h \
|
||||
$(TOP)/ext/rbu/sqlite3rbu.c
|
||||
SRC += \
|
||||
+ $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/json1.c \
|
||||
- $(TOP)/ext/misc/stmt.c
|
||||
+ $(TOP)/ext/misc/sqlar.c \
|
||||
+ $(TOP)/ext/misc/stmt.c \
|
||||
+ $(TOP)/ext/misc/zipfile.c
|
||||
|
||||
# Generated source code files
|
||||
#
|
||||
@@ -426,7 +432,6 @@
|
||||
# Statically linked extensions
|
||||
#
|
||||
TESTSRC += \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
$(TOP)/ext/expert/test_expert.c \
|
||||
$(TOP)/ext/misc/amatch.c \
|
||||
$(TOP)/ext/misc/carray.c \
|
||||
@@ -449,8 +454,7 @@
|
||||
$(TOP)/ext/misc/spellfix.c \
|
||||
$(TOP)/ext/misc/totype.c \
|
||||
$(TOP)/ext/misc/unionvtab.c \
|
||||
- $(TOP)/ext/misc/wholenumber.c \
|
||||
- $(TOP)/ext/misc/zipfile.c
|
||||
+ $(TOP)/ext/misc/wholenumber.c
|
||||
|
||||
# Source code to the library files needed by the test fixture
|
||||
#
|
||||
@@ -613,25 +617,25 @@
|
||||
|
||||
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
||||
$(LTLINK) -no-undefined -o $@ tclsqlite.lo \
|
||||
- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
|
||||
+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \
|
||||
-rpath "$(TCLLIBDIR)" \
|
||||
-version-info "8:6:8" \
|
||||
-avoid-version
|
||||
|
||||
-sqlite3$(TEXE): shell.c sqlite3.c
|
||||
- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
|
||||
- shell.c sqlite3.c \
|
||||
- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
|
||||
+sqlite3$(TEXE): shell.c libsqlite3.la
|
||||
+ $(LTLINK) $(READLINE_FLAGS) -o $@ \
|
||||
+ shell.c libsqlite3.la \
|
||||
+ $(LIBREADLINE)
|
||||
|
||||
-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
|
||||
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la
|
||||
|
||||
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
|
||||
+dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la
|
||||
|
||||
-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo
|
||||
+scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
|
||||
- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/scrub.c libsqlite3.la
|
||||
|
||||
srcck1$(BEXE): $(TOP)/tool/srcck1.c
|
||||
$(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
|
||||
@@ -710,7 +714,7 @@
|
||||
# Rule to build the amalgamation
|
||||
#
|
||||
sqlite3.lo: sqlite3.c
|
||||
- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
|
||||
+ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c
|
||||
|
||||
# Rules to build the LEMON compiler generator
|
||||
#
|
||||
@@ -1004,14 +1008,9 @@
|
||||
# Source files that go into making shell.c
|
||||
SHELL_SRC = \
|
||||
$(TOP)/src/shell.c.in \
|
||||
- $(TOP)/ext/misc/appendvfs.c \
|
||||
$(TOP)/ext/misc/shathree.c \
|
||||
$(TOP)/ext/misc/fileio.c \
|
||||
$(TOP)/ext/misc/completion.c \
|
||||
- $(TOP)/ext/misc/sqlar.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.c \
|
||||
- $(TOP)/ext/expert/sqlite3expert.h \
|
||||
- $(TOP)/ext/misc/zipfile.c \
|
||||
$(TOP)/src/test_windirent.c
|
||||
|
||||
shell.c: $(SHELL_SRC) $(TOP)/tool/mkshellc.tcl
|
||||
@@ -1170,15 +1169,15 @@
|
||||
|
||||
# Fuzz testing
|
||||
fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
|
||||
+ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA)
|
||||
./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
|
||||
- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
|
||||
+ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA)
|
||||
valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
|
||||
|
||||
# The veryquick.test TCL tests.
|
||||
@@ -1209,24 +1208,23 @@
|
||||
smoketest: $(TESTPROGS) fuzzcheck$(TEXE)
|
||||
./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
|
||||
|
||||
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
+sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c
|
||||
|
||||
-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
|
||||
- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-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
|
||||
+sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c
|
||||
|
||||
-sqltclsh$(TEXE): sqltclsh.c
|
||||
- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqltclsh$(TEXE): sqltclsh.c libsqlite3.la
|
||||
+ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
|
||||
- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS)
|
||||
+sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la
|
||||
|
||||
CHECKER_DEPS =\
|
||||
$(TOP)/tool/mkccode.tcl \
|
||||
- sqlite3.c \
|
||||
$(TOP)/src/tclsqlite.c \
|
||||
$(TOP)/ext/repair/sqlite3_checker.tcl \
|
||||
$(TOP)/ext/repair/checkindex.c \
|
||||
@@ -1237,30 +1235,30 @@
|
||||
sqlite3_checker.c: $(CHECKER_DEPS)
|
||||
$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@
|
||||
|
||||
-sqlite3_checker$(TEXE): sqlite3_checker.c
|
||||
- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)
|
||||
+sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la
|
||||
+ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL)
|
||||
|
||||
-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
|
||||
+dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
$(LTLINK) -DDBDUMP_STANDALONE -o $@ \
|
||||
- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS)
|
||||
+ $(TOP)/ext/misc/dbdump.c libsqlite3.la
|
||||
|
||||
-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
|
||||
+showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la
|
||||
|
||||
-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
|
||||
+showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la
|
||||
|
||||
-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
|
||||
+showjournal$(TEXE): $(TOP)/tool/showjournal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c
|
||||
|
||||
-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
|
||||
+showwal$(TEXE): $(TOP)/tool/showwal.c
|
||||
+ $(LTLINK) -o $@ $(TOP)/tool/showwal.c
|
||||
|
||||
showshm$(TEXE): $(TOP)/tool/showshm.c
|
||||
$(LTLINK) -o $@ $(TOP)/tool/showshm.c
|
||||
|
||||
-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo
|
||||
- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS)
|
||||
+changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
+ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la
|
||||
|
||||
rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.lo
|
||||
$(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
|
||||
@@ -1279,11 +1277,11 @@
|
||||
kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c
|
||||
$(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS)
|
||||
|
||||
-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo
|
||||
- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS)
|
||||
+rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
+ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la
|
||||
|
||||
-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS)
|
||||
+loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
|
||||
+ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@
|
||||
|
||||
# This target will fail if the SQLite amalgamation contains any exported
|
||||
# symbols that do not begin with "sqlite3_". It is run as part of the
|
||||
--- /configure.ac
|
||||
+++ /configure.ac
|
||||
@@ -590,6 +590,9 @@
|
||||
if test "${use_loadextension}" = "yes" ; then
|
||||
OPT_FEATURE_FLAGS=""
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
+ if test "${ac_cv_search_dlopen}" = "no" ; then
|
||||
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
+ fi
|
||||
else
|
||||
OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
|
||||
fi
|
||||
--- /ext/misc/sqlar.c
|
||||
+++ /ext/misc/sqlar.c
|
||||
@@ -14,6 +14,8 @@
|
||||
** for working with sqlar archives and used by the shell tool's built-in
|
||||
** sqlar support.
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <zlib.h>
|
||||
@@ -119,3 +121,5 @@
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/misc/zipfile.c
|
||||
+++ /ext/misc/zipfile.c
|
||||
@@ -24,6 +24,8 @@
|
||||
** * No support for zip64 extensions
|
||||
** * Only the "inflate/deflate" (zlib) compression method is supported
|
||||
*/
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+
|
||||
#include "sqlite3ext.h"
|
||||
SQLITE_EXTENSION_INIT1
|
||||
#include <stdio.h>
|
||||
@@ -2175,3 +2177,5 @@
|
||||
(void)pzErrMsg; /* Unused parameter */
|
||||
return zipfileRegister(db);
|
||||
}
|
||||
+
|
||||
+#endif /* SQLITE_HAVE_ZLIB */
|
||||
--- /ext/repair/sqlite3_checker.c.in
|
||||
+++ /ext/repair/sqlite3_checker.c.in
|
||||
@@ -2,6 +2,7 @@
|
||||
** Read an SQLite database file and analyze its space utilization. Generate
|
||||
** text on standard output.
|
||||
*/
|
||||
+#define SQLITE_CORE 1
|
||||
#define TCLSH_INIT_PROC sqlite3_checker_init_proc
|
||||
#define SQLITE_ENABLE_DBPAGE_VTAB 1
|
||||
#define SQLITE_ENABLE_JSON1 1
|
||||
@@ -14,7 +15,7 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
INCLUDE $ROOT/ext/misc/btreeinfo.c
|
||||
INCLUDE $ROOT/ext/repair/checkindex.c
|
||||
--- /src/shell.c.in
|
||||
+++ /src/shell.c.in
|
||||
@@ -61,6 +61,7 @@
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
#include "sqlite3.h"
|
||||
+#include "ext/expert/sqlite3expert.h"
|
||||
typedef sqlite3_int64 i64;
|
||||
typedef sqlite3_uint64 u64;
|
||||
typedef unsigned char u8;
|
||||
@@ -124,6 +125,10 @@
|
||||
# define SHELL_USE_LOCAL_GETLINE 1
|
||||
#endif
|
||||
|
||||
+#ifdef SQLITE_HAVE_ZLIB
|
||||
+#include <zlib.h>
|
||||
+#endif
|
||||
+
|
||||
|
||||
#if defined(_WIN32) || defined(WIN32)
|
||||
# include <io.h>
|
||||
@@ -966,13 +971,6 @@
|
||||
INCLUDE ../ext/misc/shathree.c
|
||||
INCLUDE ../ext/misc/fileio.c
|
||||
INCLUDE ../ext/misc/completion.c
|
||||
-INCLUDE ../ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE ../ext/misc/zipfile.c
|
||||
-INCLUDE ../ext/misc/sqlar.c
|
||||
-#endif
|
||||
-INCLUDE ../ext/expert/sqlite3expert.h
|
||||
-INCLUDE ../ext/expert/sqlite3expert.c
|
||||
|
||||
#if defined(SQLITE_ENABLE_SESSION)
|
||||
/*
|
||||
@@ -3522,7 +3520,9 @@
|
||||
sqlite3_shathree_init(p->db, 0, 0);
|
||||
sqlite3_completion_init(p->db, 0, 0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_zipfile_init(p->db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(p->db, 0, 0);
|
||||
#endif
|
||||
sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0,
|
||||
@@ -5411,6 +5411,7 @@
|
||||
goto end_ar_command;
|
||||
}
|
||||
sqlite3_fileio_init(cmd.db, 0, 0);
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_sqlar_init(cmd.db, 0, 0);
|
||||
sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p,
|
||||
shellPutsFunc, 0, 0);
|
||||
@@ -8367,6 +8368,7 @@
|
||||
#endif
|
||||
}
|
||||
data.out = stdout;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
|
||||
/* Go ahead and open the database file if it already exists. If the
|
||||
--- /tool/mksqlite3c.tcl
|
||||
+++ /tool/mksqlite3c.tcl
|
||||
@@ -116,6 +116,7 @@
|
||||
rtree.h
|
||||
sqlite3session.h
|
||||
sqlite3.h
|
||||
+ sqlite3expert.h
|
||||
sqlite3ext.h
|
||||
sqlite3rbu.h
|
||||
sqliteicu.h
|
||||
@@ -400,6 +401,10 @@
|
||||
json1.c
|
||||
fts5.c
|
||||
stmt.c
|
||||
+ appendvfs.c
|
||||
+ sqlar.c
|
||||
+ sqlite3expert.c
|
||||
+ zipfile.c
|
||||
} {
|
||||
copy_file tsrc/$file
|
||||
}
|
||||
--- /tool/sqlite3_analyzer.c.in
|
||||
+++ /tool/sqlite3_analyzer.c.in
|
||||
@@ -14,9 +14,6 @@
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
#define SQLITE_OMIT_LOAD_EXTENSION 1
|
||||
-#ifndef USE_EXTERNAL_SQLITE
|
||||
-INCLUDE sqlite3.c
|
||||
-#endif
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){
|
||||
--- /tool/sqltclsh.c.in
|
||||
+++ /tool/sqltclsh.c.in
|
||||
@@ -27,19 +27,17 @@
|
||||
#define SQLITE_OMIT_SHARED_CACHE 1
|
||||
#define SQLITE_DEFAULT_MEMSTATUS 0
|
||||
#define SQLITE_MAX_EXPR_DEPTH 0
|
||||
-INCLUDE sqlite3.c
|
||||
-INCLUDE $ROOT/ext/misc/appendvfs.c
|
||||
-#ifdef SQLITE_HAVE_ZLIB
|
||||
-INCLUDE $ROOT/ext/misc/zipfile.c
|
||||
-INCLUDE $ROOT/ext/misc/sqlar.c
|
||||
-#endif
|
||||
+#include "sqlite3.h"
|
||||
INCLUDE $ROOT/src/tclsqlite.c
|
||||
|
||||
const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){
|
||||
(void)interp;
|
||||
+ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *);
|
||||
sqlite3_appendvfs_init(0,0,0);
|
||||
#ifdef SQLITE_HAVE_ZLIB
|
||||
+ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init);
|
||||
+ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *);
|
||||
sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init);
|
||||
#endif
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
https://sqlite.org/src/info/b7178209152452e8
|
||||
|
||||
--- /src/attach.c
|
||||
+++ /src/attach.c
|
||||
@@ -502,6 +502,9 @@
|
||||
if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
|
||||
if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
|
||||
#endif
|
||||
+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
--- /test/triggerE.test
|
||||
+++ /test/triggerE.test
|
||||
@@ -57,6 +57,7 @@
|
||||
7 { BEFORE DELETE ON t1 BEGIN SELECT * FROM t2 ORDER BY ?; END; }
|
||||
8 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = ?; END; }
|
||||
9 { BEFORE UPDATE ON t1 BEGIN UPDATE t2 SET c = 1 WHERE d = ?; END; }
|
||||
+ 10 { AFTER INSERT ON t1 BEGIN SELECT * FROM pragma_stats(?); END; }
|
||||
} {
|
||||
catchsql {drop trigger tr1}
|
||||
do_catchsql_test 1.1.$tn "CREATE TRIGGER tr1 $defn" [list 1 $errmsg]
|
||||
@ -0,0 +1,224 @@
|
||||
https://sqlite.org/src/info/893e6089c875e947
|
||||
https://sqlite.org/src/info/576a8f69ae25883f
|
||||
https://sqlite.org/src/info/de508e831a43f02c
|
||||
|
||||
--- /ext/fts3/fts3.c
|
||||
+++ /ext/fts3/fts3.c
|
||||
@@ -3963,7 +3963,7 @@
|
||||
|
||||
#ifdef SQLITE_TEST
|
||||
if( rc==SQLITE_OK ){
|
||||
- rc = sqlite3Fts3ExprInitTestInterface(db);
|
||||
+ rc = sqlite3Fts3ExprInitTestInterface(db, pHash);
|
||||
}
|
||||
#endif
|
||||
|
||||
--- /ext/fts3/fts3Int.h
|
||||
+++ /ext/fts3/fts3Int.h
|
||||
@@ -584,7 +584,7 @@
|
||||
);
|
||||
void sqlite3Fts3ExprFree(Fts3Expr *);
|
||||
#ifdef SQLITE_TEST
|
||||
-int sqlite3Fts3ExprInitTestInterface(sqlite3 *db);
|
||||
+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*);
|
||||
int sqlite3Fts3InitTerm(sqlite3 *db);
|
||||
#endif
|
||||
|
||||
--- /ext/fts3/fts3_expr.c
|
||||
+++ /ext/fts3/fts3_expr.c
|
||||
@@ -1109,34 +1109,6 @@
|
||||
#include <stdio.h>
|
||||
|
||||
/*
|
||||
-** Function to query the hash-table of tokenizers (see README.tokenizers).
|
||||
-*/
|
||||
-static int queryTestTokenizer(
|
||||
- sqlite3 *db,
|
||||
- const char *zName,
|
||||
- const sqlite3_tokenizer_module **pp
|
||||
-){
|
||||
- int rc;
|
||||
- sqlite3_stmt *pStmt;
|
||||
- const char zSql[] = "SELECT fts3_tokenizer(?)";
|
||||
-
|
||||
- *pp = 0;
|
||||
- rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
|
||||
- if( rc!=SQLITE_OK ){
|
||||
- return rc;
|
||||
- }
|
||||
-
|
||||
- sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
|
||||
- if( SQLITE_ROW==sqlite3_step(pStmt) ){
|
||||
- if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
|
||||
- memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return sqlite3_finalize(pStmt);
|
||||
-}
|
||||
-
|
||||
-/*
|
||||
** Return a pointer to a buffer containing a text representation of the
|
||||
** expression passed as the first argument. The buffer is obtained from
|
||||
** sqlite3_malloc(). It is the responsibility of the caller to use
|
||||
@@ -1203,12 +1175,12 @@
|
||||
**
|
||||
** SELECT fts3_exprtest('simple', 'Bill col2:Bloggs', 'col1', 'col2');
|
||||
*/
|
||||
-static void fts3ExprTest(
|
||||
+static void fts3ExprTestCommon(
|
||||
+ int bRebalance,
|
||||
sqlite3_context *context,
|
||||
int argc,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
- sqlite3_tokenizer_module const *pModule = 0;
|
||||
sqlite3_tokenizer *pTokenizer = 0;
|
||||
int rc;
|
||||
char **azCol = 0;
|
||||
@@ -1218,7 +1190,9 @@
|
||||
int ii;
|
||||
Fts3Expr *pExpr;
|
||||
char *zBuf = 0;
|
||||
- sqlite3 *db = sqlite3_context_db_handle(context);
|
||||
+ Fts3Hash *pHash = (Fts3Hash*)sqlite3_user_data(context);
|
||||
+ const char *zTokenizer = 0;
|
||||
+ char *zErr = 0;
|
||||
|
||||
if( argc<3 ){
|
||||
sqlite3_result_error(context,
|
||||
@@ -1227,23 +1201,17 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- rc = queryTestTokenizer(db,
|
||||
- (const char *)sqlite3_value_text(argv[0]), &pModule);
|
||||
- if( rc==SQLITE_NOMEM ){
|
||||
- sqlite3_result_error_nomem(context);
|
||||
- goto exprtest_out;
|
||||
- }else if( !pModule ){
|
||||
- sqlite3_result_error(context, "No such tokenizer module", -1);
|
||||
- goto exprtest_out;
|
||||
- }
|
||||
-
|
||||
- rc = pModule->xCreate(0, 0, &pTokenizer);
|
||||
- assert( rc==SQLITE_NOMEM || rc==SQLITE_OK );
|
||||
- if( rc==SQLITE_NOMEM ){
|
||||
- sqlite3_result_error_nomem(context);
|
||||
- goto exprtest_out;
|
||||
+ zTokenizer = (const char*)sqlite3_value_text(argv[0]);
|
||||
+ rc = sqlite3Fts3InitTokenizer(pHash, zTokenizer, &pTokenizer, &zErr);
|
||||
+ if( rc!=SQLITE_OK ){
|
||||
+ if( rc==SQLITE_NOMEM ){
|
||||
+ sqlite3_result_error_nomem(context);
|
||||
+ }else{
|
||||
+ sqlite3_result_error(context, zErr, -1);
|
||||
+ }
|
||||
+ sqlite3_free(zErr);
|
||||
+ return;
|
||||
}
|
||||
- pTokenizer->pModule = pModule;
|
||||
|
||||
zExpr = (const char *)sqlite3_value_text(argv[1]);
|
||||
nExpr = sqlite3_value_bytes(argv[1]);
|
||||
@@ -1257,7 +1225,7 @@
|
||||
azCol[ii] = (char *)sqlite3_value_text(argv[ii+2]);
|
||||
}
|
||||
|
||||
- if( sqlite3_user_data(context) ){
|
||||
+ if( bRebalance ){
|
||||
char *zDummy = 0;
|
||||
rc = sqlite3Fts3ExprParse(
|
||||
pTokenizer, 0, azCol, 0, nCol, nCol, zExpr, nExpr, &pExpr, &zDummy
|
||||
@@ -1283,23 +1251,38 @@
|
||||
sqlite3Fts3ExprFree(pExpr);
|
||||
|
||||
exprtest_out:
|
||||
- if( pModule && pTokenizer ){
|
||||
- rc = pModule->xDestroy(pTokenizer);
|
||||
+ if( pTokenizer ){
|
||||
+ rc = pTokenizer->pModule->xDestroy(pTokenizer);
|
||||
}
|
||||
sqlite3_free(azCol);
|
||||
}
|
||||
|
||||
+static void fts3ExprTest(
|
||||
+ sqlite3_context *context,
|
||||
+ int argc,
|
||||
+ sqlite3_value **argv
|
||||
+){
|
||||
+ fts3ExprTestCommon(0, context, argc, argv);
|
||||
+}
|
||||
+static void fts3ExprTestRebalance(
|
||||
+ sqlite3_context *context,
|
||||
+ int argc,
|
||||
+ sqlite3_value **argv
|
||||
+){
|
||||
+ fts3ExprTestCommon(1, context, argc, argv);
|
||||
+}
|
||||
+
|
||||
/*
|
||||
** Register the query expression parser test function fts3_exprtest()
|
||||
** with database connection db.
|
||||
*/
|
||||
-int sqlite3Fts3ExprInitTestInterface(sqlite3* db){
|
||||
+int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash *pHash){
|
||||
int rc = sqlite3_create_function(
|
||||
- db, "fts3_exprtest", -1, SQLITE_UTF8, 0, fts3ExprTest, 0, 0
|
||||
+ db, "fts3_exprtest", -1, SQLITE_UTF8, (void*)pHash, fts3ExprTest, 0, 0
|
||||
);
|
||||
if( rc==SQLITE_OK ){
|
||||
rc = sqlite3_create_function(db, "fts3_exprtest_rebalance",
|
||||
- -1, SQLITE_UTF8, (void *)1, fts3ExprTest, 0, 0
|
||||
+ -1, SQLITE_UTF8, (void*)pHash, fts3ExprTestRebalance, 0, 0
|
||||
);
|
||||
}
|
||||
return rc;
|
||||
--- /test/fts3expr.test
|
||||
+++ /test/fts3expr.test
|
||||
@@ -409,7 +409,7 @@
|
||||
} {1 {Usage: fts3_exprtest(tokenizer, expr, col1, ...}}
|
||||
do_test fts3expr-5.2 {
|
||||
catchsql { SELECT fts3_exprtest('doesnotexist', 'a b', 'c') }
|
||||
-} {1 {No such tokenizer module}}
|
||||
+} {1 {unknown tokenizer: doesnotexist}}
|
||||
do_test fts3expr-5.3 {
|
||||
catchsql { SELECT fts3_exprtest('simple', 'a b OR', 'c') }
|
||||
} {1 {Error parsing expression}}
|
||||
--- /test/fts3expr4.test
|
||||
+++ /test/fts3expr4.test
|
||||
@@ -29,7 +29,8 @@
|
||||
}
|
||||
|
||||
proc do_icu_expr_test {tn expr res} {
|
||||
- uplevel [list do_test $tn [list test_fts3expr icu $expr] [list {*}$res]]
|
||||
+ set res2 [list {*}$res]
|
||||
+ uplevel [list do_test $tn [list test_fts3expr "icu en_US" $expr] $res2]
|
||||
}
|
||||
|
||||
proc do_simple_expr_test {tn expr res} {
|
||||
--- /test/zipfile2.test
|
||||
+++ /test/zipfile2.test
|
||||
@@ -52,17 +52,15 @@
|
||||
CREATE VIRTUAL TABLE fff USING zipfile('test''zip');
|
||||
}
|
||||
|
||||
-if {$::tcl_platform(platform)=="windows"} {
|
||||
- set res {1 {cannot open file: testdir}}
|
||||
-} else {
|
||||
- set res {1 {error in fread()}}
|
||||
-}
|
||||
do_test 2.0 {
|
||||
forcedelete testdir
|
||||
file mkdir testdir
|
||||
execsql { CREATE VIRTUAL TABLE hhh USING zipfile('testdir') }
|
||||
- catchsql { SELECT * FROM hhh }
|
||||
-} $res
|
||||
+ lindex [catchsql {
|
||||
+ SELECT * FROM hhh;
|
||||
+ INSERT INTO hhh(name, data) VALUES('1.txt', 'file data');
|
||||
+ }] 0
|
||||
+} 1
|
||||
|
||||
|
||||
set archive {
|
||||
@ -0,0 +1,14 @@
|
||||
https://sqlite.org/src/info/b7178209152452e8
|
||||
|
||||
--- /sqlite3.c
|
||||
+++ /sqlite3.c
|
||||
@@ -102780,6 +102780,9 @@
|
||||
if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
|
||||
if( sqlite3FixExpr(pFix, pItem->pOn) ) return 1;
|
||||
#endif
|
||||
+ if( pItem->fg.isTabFunc && sqlite3FixExprList(pFix, pItem->u1.pFuncArg) ){
|
||||
+ return 1;
|
||||
+ }
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -1,19 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>arfrever.fta@gmail.com</email>
|
||||
<name>Arfrever Frehtes Taifersar Arahesis</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
|
||||
<flag name="tools">Install additional tools</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:sqlite:sqlite</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>arfrever.fta@gmail.com</email>
|
||||
<name>Arfrever Frehtes Taifersar Arahesis</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="secure-delete">Enable overwriting of deleted content with zeros by default (http://sqlite.org/pragma.html#pragma_secure_delete), causing some performance penalty</flag>
|
||||
<flag name="tools">Install additional tools</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:sqlite:sqlite</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,239 +0,0 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
|
||||
DOC_PV="${SRC_PV}"
|
||||
# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
|
||||
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
|
||||
tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( app-arch/unzip )
|
||||
tcl? ( app-arch/unzip )
|
||||
test? (
|
||||
app-arch/unzip
|
||||
dev-lang/tcl:0[${MULTILIB_USEDEP}]
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_tarball() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_tarball; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"
|
||||
|
||||
# Fix shell1-5.0 test.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
|
||||
sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
|
||||
else
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-build.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
multilib_copy_sources
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_tarball; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
# Support detection of misuse of SQLite API.
|
||||
# https://sqlite.org/compile.html#enable_api_armor
|
||||
append-cppflags -DSQLITE_ENABLE_API_ARMOR
|
||||
|
||||
# Support column metadata functions.
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
|
||||
# Support Full-Text Search versions 3, 4 and 5.
|
||||
# https://sqlite.org/fts3.html
|
||||
# https://sqlite.org/fts5.html
|
||||
append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
|
||||
options+=(--enable-fts5)
|
||||
|
||||
# Support hidden columns.
|
||||
append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
|
||||
|
||||
# Support JSON1 extension.
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
|
||||
# Support R*Trees.
|
||||
# https://sqlite.org/rtree.html
|
||||
append-cppflags -DSQLITE_ENABLE_RTREE
|
||||
|
||||
# Support scan status functions.
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus.html
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_tarball; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
append-cppflags -DSQLITE_DEBUG
|
||||
else
|
||||
append-cppflags -DNDEBUG
|
||||
fi
|
||||
fi
|
||||
|
||||
# icu USE flag.
|
||||
if use icu; then
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_tarball; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
fi
|
||||
fi
|
||||
|
||||
# readline USE flag.
|
||||
options+=(
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_tarball && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
# secure-delete USE flag.
|
||||
if use secure-delete; then
|
||||
# Enable secure_delete pragma by default.
|
||||
# https://sqlite.org/pragma.html#pragma_secure_delete
|
||||
append-cppflags -DSQLITE_SECURE_DELETE
|
||||
fi
|
||||
|
||||
# static-libs USE flag.
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_tarball; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
if [[ "${CHOST}" == *-mint* ]]; then
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
# Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n pread(0, NULL, 0, 0);\n pwrite(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
|
||||
append-cppflags -DUSE_PREAD
|
||||
fi
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
|
||||
append-cppflags -DUSE_PREAD64
|
||||
elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
|
||||
append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_test() {
|
||||
if [[ "${EUID}" -eq 0 ]]; then
|
||||
ewarn "Skipping tests due to root permissions"
|
||||
return
|
||||
fi
|
||||
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
install_tool() {
|
||||
if [[ -f ".libs/${1}" ]]; then
|
||||
newbin ".libs/${1}" "${2}"
|
||||
else
|
||||
newbin "${1}" "${2}"
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
|
||||
unset -f install_tool
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files
|
||||
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
|
||||
fi
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
@ -12,15 +11,15 @@ DOC_PV="${SRC_PV}"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
@ -50,25 +49,43 @@ pkg_setup() {
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
epatch "${FILESDIR}/${PN}-3.13.0-full_tarball-build.patch"
|
||||
eapply -p0 "${FILESDIR}/${PN}-3.20.0-full_tarball-build.patch"
|
||||
eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-csv-unsigned_char.patch"
|
||||
eapply -p0 "${FILESDIR}/${PN}-3.20.1-full_tarball-tests-big-endian.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
else
|
||||
epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
|
||||
eapply -p0 "${FILESDIR}/${PN}-3.16.0-nonfull_tarball-build.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
|
||||
multilib_copy_sources
|
||||
|
||||
preparation() {
|
||||
pushd "${BUILD_DIR}" > /dev/null || die
|
||||
|
||||
if full_tarball && [[ "${ABI}" == "x86" ]]; then
|
||||
# Disable tests broken on x86.
|
||||
sed -e "/^for {set i 0} {\$i<1000} {incr i} {$/,/^}$/d" -i test/date.test || die "sed failed"
|
||||
fi
|
||||
|
||||
popd > /dev/null || die
|
||||
}
|
||||
multilib_foreach_abi preparation
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
@ -111,6 +128,10 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
@ -128,6 +149,10 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
@ -194,7 +219,7 @@ multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake changeset rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
fi
|
||||
}
|
||||
|
||||
@ -220,7 +245,10 @@ multilib_src_install() {
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
@ -238,6 +266,10 @@ multilib_src_install_all() {
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
@ -12,15 +11,15 @@ DOC_PV="${SRC_PV}"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2017/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2017/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
@ -36,12 +35,12 @@ DEPEND="${RDEPEND}
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_tarball() {
|
||||
full_archive() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
@ -49,21 +48,28 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
|
||||
if full_archive; then
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-full_archive-build.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
|
||||
# https://sqlite.org/src/info/bf09fa683ea42b75
|
||||
sed -e "s:cp tsrc/shell\.c tsrc/sqlite3ext\.h \.:cp tsrc/sqlite3ext.h .:" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
@ -72,13 +78,13 @@ src_prepare() {
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" options=()
|
||||
local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
|
||||
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_tarball; then
|
||||
if ! full_archive; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
@ -90,6 +96,10 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support sqlite_dbpage virtual table.
|
||||
# https://sqlite.org/compile.html#enable_dbpage_vtab
|
||||
append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
@ -111,6 +121,10 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
@ -124,16 +138,32 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support sqlite_stmt virtual table.
|
||||
# https://sqlite.org/stmt.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMTVTAB
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
|
||||
# https://sqlite.org/compile.html#enable_update_delete_limit
|
||||
append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
@ -148,7 +178,7 @@ multilib_src_configure() {
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
@ -160,7 +190,7 @@ multilib_src_configure() {
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_tarball && use readline; then
|
||||
if full_archive && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
@ -175,7 +205,7 @@ multilib_src_configure() {
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
@ -183,6 +213,14 @@ multilib_src_configure() {
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
if [[ "${ABI}" == "x86" ]]; then
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
|
||||
append-cflags -mfpmath=sse
|
||||
else
|
||||
append-cflags -ffloat-store
|
||||
fi
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
@ -190,7 +228,7 @@ multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
fi
|
||||
}
|
||||
|
||||
@ -215,7 +253,11 @@ multilib_src_install() {
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
@ -233,6 +275,10 @@ multilib_src_install_all() {
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
@ -12,18 +11,19 @@ DOC_PV="${SRC_PV}"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
|
||||
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
|
||||
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
|
||||
tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
|
||||
@ -36,12 +36,12 @@ DEPEND="${RDEPEND}
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_tarball() {
|
||||
full_archive() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
@ -49,21 +49,28 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
|
||||
if full_archive; then
|
||||
eapply "${FILESDIR}/${PN}-3.22.0-full_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.22.0-full_archive-tests.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
else
|
||||
epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
|
||||
eapply -p2 "${FILESDIR}/${PN}-3.22.0-full_archive-headers.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
@ -72,13 +79,13 @@ src_prepare() {
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" options=()
|
||||
local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
|
||||
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_tarball; then
|
||||
if ! full_archive; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
@ -90,6 +97,10 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support sqlite_dbpage virtual table.
|
||||
# https://sqlite.org/compile.html#enable_dbpage_vtab
|
||||
append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
@ -111,6 +122,18 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support sqlite_offset() function.
|
||||
# https://sqlite.org/lang_corefunc.html#sqlite_offset
|
||||
append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
|
||||
|
||||
# Support pre-update hook functions.
|
||||
# https://sqlite.org/c3ref/preupdate_count.html
|
||||
append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
@ -124,16 +147,38 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support sqlite_stmt virtual table.
|
||||
# https://sqlite.org/stmt.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMTVTAB
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
|
||||
# https://sqlite.org/compile.html#enable_update_delete_limit
|
||||
append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
|
||||
|
||||
# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
|
||||
# https://sqlite.org/pragma.html#pragma_function_list
|
||||
# https://sqlite.org/pragma.html#pragma_module_list
|
||||
# https://sqlite.org/pragma.html#pragma_pragma_list
|
||||
append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
@ -148,7 +193,7 @@ multilib_src_configure() {
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
@ -160,7 +205,7 @@ multilib_src_configure() {
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_tarball && use readline; then
|
||||
if full_archive && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
@ -175,7 +220,7 @@ multilib_src_configure() {
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
@ -183,6 +228,14 @@ multilib_src_configure() {
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
if [[ "${ABI}" == "x86" ]]; then
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
|
||||
append-cflags -mfpmath=sse
|
||||
else
|
||||
append-cflags -ffloat-store
|
||||
fi
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
@ -190,7 +243,7 @@ multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
|
||||
fi
|
||||
}
|
||||
|
||||
@ -215,13 +268,21 @@ multilib_src_install() {
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showshm sqlite3-show-shm
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
install_tool sqlite3_checker sqlite3-checker
|
||||
install_tool sqlite3_expert sqlite3-expert
|
||||
install_tool sqltclsh sqlite3-tclsh
|
||||
|
||||
unset -f install_tool
|
||||
fi
|
||||
@ -233,6 +294,10 @@ multilib_src_install_all() {
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
||||
@ -1,8 +1,7 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
|
||||
|
||||
@ -12,18 +11,19 @@ DOC_PV="${SRC_PV}"
|
||||
|
||||
DESCRIPTION="A SQL Database Engine in a C Library"
|
||||
HOMEPAGE="https://sqlite.org/"
|
||||
SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
SRC_URI="doc? ( https://sqlite.org/2018/${PN}-doc-${DOC_PV}.zip )
|
||||
tcl? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
test? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
tools? ( https://sqlite.org/2018/${PN}-src-${SRC_PV}.zip )
|
||||
!tcl? ( !test? ( !tools? ( https://sqlite.org/2018/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
|
||||
|
||||
LICENSE="public-domain"
|
||||
SLOT="3"
|
||||
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
|
||||
|
||||
RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}]
|
||||
icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
|
||||
readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
|
||||
tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
|
||||
tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
|
||||
@ -36,12 +36,12 @@ DEPEND="${RDEPEND}
|
||||
)
|
||||
tools? ( app-arch/unzip )"
|
||||
|
||||
full_tarball() {
|
||||
full_archive() {
|
||||
use tcl || use test || use tools
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
S="${WORKDIR}/${PN}-src-${SRC_PV}"
|
||||
else
|
||||
S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
|
||||
@ -49,21 +49,28 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if full_tarball; then
|
||||
epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
|
||||
if full_archive; then
|
||||
eapply "${FILESDIR}/${PN}-3.23.0-full_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-full_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-full_archive-tests.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac
|
||||
sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed"
|
||||
else
|
||||
epatch "${FILESDIR}/${PN}-3.12.0-nonfull_tarball-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.21.0-nonfull_archive-build.patch"
|
||||
eapply "${FILESDIR}/${PN}-3.23.1-nonfull_archive-prohibit_bound_parameters_in_arguments_to_table-valued_functions_within_triggers.patch"
|
||||
|
||||
eapply_user
|
||||
|
||||
# Fix AC_CHECK_FUNCS.
|
||||
# https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html
|
||||
sed \
|
||||
-e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \
|
||||
-e "/AC_CHECK_FUNCS(posix_fallocate)/d" \
|
||||
-i configure.ac
|
||||
-i configure.ac || die "sed failed"
|
||||
fi
|
||||
|
||||
eautoreconf
|
||||
@ -72,13 +79,13 @@ src_prepare() {
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local CPPFLAGS="${CPPFLAGS}" options=()
|
||||
local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=()
|
||||
|
||||
options+=(
|
||||
--enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
|
||||
--enable-$(full_archive && echo load-extension || echo dynamic-extensions)
|
||||
--enable-threadsafe
|
||||
)
|
||||
if ! full_tarball; then
|
||||
if ! full_archive; then
|
||||
options+=(--disable-static-shell)
|
||||
fi
|
||||
|
||||
@ -90,10 +97,20 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/column_database_name.html
|
||||
append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
|
||||
|
||||
# Support sqlite_dbpage virtual table.
|
||||
# https://sqlite.org/compile.html#enable_dbpage_vtab
|
||||
append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
|
||||
# Support dbstat virtual table.
|
||||
# https://sqlite.org/dbstat.html
|
||||
append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
|
||||
|
||||
# Support sqlite3_serialize() and sqlite3_deserialize() functions.
|
||||
# https://sqlite.org/compile.html#enable_deserialize
|
||||
# https://sqlite.org/c3ref/serialize.html
|
||||
# https://sqlite.org/c3ref/deserialize.html
|
||||
append-cppflags -DSQLITE_ENABLE_DESERIALIZE
|
||||
|
||||
# Support comments in output of EXPLAIN.
|
||||
# https://sqlite.org/compile.html#enable_explain_comments
|
||||
append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS
|
||||
@ -111,6 +128,18 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/json1.html
|
||||
append-cppflags -DSQLITE_ENABLE_JSON1
|
||||
|
||||
# Support memsys5 memory allocator.
|
||||
# https://sqlite.org/malloc.html#memsys5
|
||||
append-cppflags -DSQLITE_ENABLE_MEMSYS5
|
||||
|
||||
# Support sqlite_offset() function.
|
||||
# https://sqlite.org/lang_corefunc.html#sqlite_offset
|
||||
append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC
|
||||
|
||||
# Support pre-update hook functions.
|
||||
# https://sqlite.org/c3ref/preupdate_count.html
|
||||
append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK
|
||||
|
||||
# Support Resumable Bulk Update extension.
|
||||
# https://sqlite.org/rbu.html
|
||||
append-cppflags -DSQLITE_ENABLE_RBU
|
||||
@ -124,16 +153,38 @@ multilib_src_configure() {
|
||||
# https://sqlite.org/c3ref/stmt_scanstatus_reset.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
|
||||
|
||||
# Support sqlite_stmt virtual table.
|
||||
# https://sqlite.org/stmt.html
|
||||
append-cppflags -DSQLITE_ENABLE_STMTVTAB
|
||||
|
||||
# Support Session extension.
|
||||
# https://sqlite.org/sessionintro.html
|
||||
options+=(--enable-session)
|
||||
|
||||
# Support unknown() function.
|
||||
# https://sqlite.org/compile.html#enable_unknown_sql_function
|
||||
append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
|
||||
|
||||
# Support unlock notification.
|
||||
# https://sqlite.org/unlock_notify.html
|
||||
append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
|
||||
|
||||
# Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements.
|
||||
# https://sqlite.org/compile.html#enable_update_delete_limit
|
||||
append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT
|
||||
|
||||
# Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements.
|
||||
# https://sqlite.org/pragma.html#pragma_function_list
|
||||
# https://sqlite.org/pragma.html#pragma_module_list
|
||||
# https://sqlite.org/pragma.html#pragma_pragma_list
|
||||
append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS
|
||||
|
||||
# Support soundex() function.
|
||||
# https://sqlite.org/lang_corefunc.html#soundex
|
||||
append-cppflags -DSQLITE_SOUNDEX
|
||||
|
||||
# debug USE flag.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=($(use_enable debug))
|
||||
else
|
||||
if use debug; then
|
||||
@ -148,7 +199,7 @@ multilib_src_configure() {
|
||||
# Support ICU extension.
|
||||
# https://sqlite.org/compile.html#enable_icu
|
||||
append-cppflags -DSQLITE_ENABLE_ICU
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
else
|
||||
sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
|
||||
@ -160,7 +211,7 @@ multilib_src_configure() {
|
||||
--disable-editline
|
||||
$(use_enable readline)
|
||||
)
|
||||
if full_tarball && use readline; then
|
||||
if full_archive && use readline; then
|
||||
options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
|
||||
fi
|
||||
|
||||
@ -175,7 +226,7 @@ multilib_src_configure() {
|
||||
options+=($(use_enable static-libs static))
|
||||
|
||||
# tcl, test, tools USE flags.
|
||||
if full_tarball; then
|
||||
if full_archive; then
|
||||
options+=(--enable-tcl)
|
||||
fi
|
||||
|
||||
@ -183,6 +234,14 @@ multilib_src_configure() {
|
||||
append-cppflags -DSQLITE_OMIT_WAL
|
||||
fi
|
||||
|
||||
if [[ "${ABI}" == "x86" ]]; then
|
||||
if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then
|
||||
append-cflags -mfpmath=sse
|
||||
else
|
||||
append-cflags -ffloat-store
|
||||
fi
|
||||
fi
|
||||
|
||||
econf "${options[@]}"
|
||||
}
|
||||
|
||||
@ -190,7 +249,7 @@ multilib_src_compile() {
|
||||
emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
|
||||
|
||||
if use tools && multilib_is_native_abi; then
|
||||
emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
|
||||
emake changeset dbdump dbhash rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh
|
||||
fi
|
||||
}
|
||||
|
||||
@ -215,13 +274,21 @@ multilib_src_install() {
|
||||
fi
|
||||
}
|
||||
|
||||
install_tool changeset sqlite3-changeset
|
||||
install_tool dbdump sqlite3-db-dump
|
||||
install_tool dbhash sqlite3-db-hash
|
||||
install_tool rbu sqlite3-rbu
|
||||
install_tool scrub sqlite3-scrub
|
||||
install_tool showdb sqlite3-show-db
|
||||
install_tool showjournal sqlite3-show-journal
|
||||
install_tool showshm sqlite3-show-shm
|
||||
install_tool showstat4 sqlite3-show-stat4
|
||||
install_tool showwal sqlite3-show-wal
|
||||
install_tool sqldiff sqlite3-diff
|
||||
install_tool sqlite3_analyzer sqlite3-analyzer
|
||||
install_tool sqlite3_checker sqlite3-checker
|
||||
install_tool sqlite3_expert sqlite3-expert
|
||||
install_tool sqltclsh sqlite3-tclsh
|
||||
|
||||
unset -f install_tool
|
||||
fi
|
||||
@ -233,6 +300,10 @@ multilib_src_install_all() {
|
||||
doman sqlite3.1
|
||||
|
||||
if use doc; then
|
||||
dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
|
||||
rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt}
|
||||
(
|
||||
docinto html
|
||||
dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"*
|
||||
)
|
||||
fi
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=5
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120100.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120100.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=622070ac42b8266ca8faf77bd7b3e6c2
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=5
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120200.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120200.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120200.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=622070ac42b8266ca8faf77bd7b3e6c2
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=5
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3130000.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) test? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3130000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=41ed35309f583f6e3974a61df9b60312
|
||||
@ -1,13 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3110100.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) test? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3110100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3110100.tar.gz ) ) )
|
||||
SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3200100.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) test? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=3029d8964db888682cbda457c5ea8cb9
|
||||
_md5_=fc64a40954f10c4fb6c31bf272947fed
|
||||
@ -1,13 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=5
|
||||
EAPI=6
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2016/sqlite-doc-3120000.zip ) tcl? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) test? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) tools? ( https://sqlite.org/2016/sqlite-src-3120000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/sqlite-autoconf-3120000.tar.gz ) ) )
|
||||
SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3210000.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) test? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3210000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3210000.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=100e8f0dd37d660f82299477a6f960e9
|
||||
_md5_=0f46cc520adb76585ebe7b44217c2616
|
||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.22.0
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=6
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3220000.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) test? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3220000.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=0c0b861cf0fba074078445eb8914bb92
|
||||
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1
vendored
Normal file
13
sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-db/sqlite-3.23.1
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup test
|
||||
DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A SQL Database Engine in a C Library
|
||||
EAPI=6
|
||||
HOMEPAGE=https://sqlite.org/
|
||||
IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
|
||||
KEYWORDS=alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=public-domain
|
||||
RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
|
||||
SLOT=3
|
||||
SRC_URI=doc? ( https://sqlite.org/2018/sqlite-doc-3230100.zip ) tcl? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) test? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) tools? ( https://sqlite.org/2018/sqlite-src-3230100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz ) ) )
|
||||
_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 flag-o-matic 2274fcc1e7ef6affaff5bcd636275417 libtool 0081a71a261724730ec4c248494f044d ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af versionator c80ccf29e90adea7c5cae94b42eb76d0
|
||||
_md5_=de96170e771ff922af87fd5840b61eff
|
||||
Loading…
Reference in New Issue
Block a user