0
0
mirror of https://github.com/sqlite/sqlite.git synced 2024-11-21 11:19:14 +01:00
Commit Graph

170 Commits

Author SHA1 Message Date
stephan
457d9384a2 Rename --link-tools-dynamically to --dynlink-tools, per discussion.
FossilOrigin-Name: 50b9f6fde44f9afda27e47badde6115ab6d9ccd5e22b446a8d8127499848815f
2024-11-19 20:21:40 +00:00
stephan
b81e11b25b Move the in-comment-code commentary about --with-debug, from [7b14309be4], into the --help text for that flag, where it's readily visible.
FossilOrigin-Name: c938e5d783b3f015b2a1b9f3711664b13497c4b71e4a890c65d6665539522ff8
2024-11-19 20:14:31 +00:00
stephan
3cd93a0b67 Revert linking the shell to the dll for reasons explained in new makefile comments. Move the --with-debug configure flag into the developer options set and add commentary about why it should never be used for production builds.
FossilOrigin-Name: 7b14309be42be4204c4d30e9741d56d75ab8ec34686791d032612337fe1c4dcf
2024-11-19 17:41:13 +00:00
stephan
5ef61df185 Reformulate sqldiff deps and rules so that the target matches the resulting file name, to avoid rebuilding it on every make invocation. Apply the same treatment to the sqlite3 CLI shell.
FossilOrigin-Name: 9a17b83f859ef14629cb78d8c9af1b3f2493b0c8756bc2ebcf92f0872fb507c3
2024-11-19 16:40:49 +00:00
stephan
fbd9de1830 Initial configure support for linking certain binaries to libsqlite3.so instead of embedding it dynamically (which they typically do). This currently applies only to sqldiff, but support for adding the same for other tools is planned. This requires disabling the soname because setting it causes the build to link to whatever libsqlite3.so.0 is installed system-wide, so the soname now defaults to off.
FossilOrigin-Name: 9192c146e2898456a6b8ea43a6f02c0227ddce5b584374fbeb2d63bd2ecd5d8c
2024-11-19 15:20:47 +00:00
stephan
4b24cb2a3a Rename tool/tclConfigShToTcl.sh to tool/tclConfigShToAutoDef.sh in the name of pedantic correctness.
FossilOrigin-Name: a7dd196d99ee7c75b92a03915f2b370e3f4c598eb8521b90af1cb5dd7f9ee49c
2024-11-16 10:42:33 +00:00
stephan
1adf87592f In the interest of minimizing downstream disruption, set the soname of libsqlite3.so to (by default) its legacy value of libsqlite3.so.0 and unconditionally create (or replace) a symlink with that name at install-time, in addition to the newer-named symlinks.
FossilOrigin-Name: 0773677b553e032e992266c6c75e10565729238df3ef52b56602a92cf651bea7
2024-11-15 19:42:49 +00:00
stephan
e69b4d757e Generic auto.def cleanups. No functional differences.
FossilOrigin-Name: 02aceb8c138b5b8f38c75aa0792efa12f14b002083df6141cf56ea0602d3174b
2024-11-15 16:35:24 +00:00
stephan
2eb9605e81 configure: add optional pkg-config support for detecting ICU.
FossilOrigin-Name: 3e5b8077c6c6ce72ecab3110eb45943b9765372df789088982dbd6046a7c2523
2024-11-15 10:53:57 +00:00
stephan
ece4bf60ff When checking pkg-config for ICU support use icu-io instead of icu-uc, as that contains all requires libs on Linux and BSD.
FossilOrigin-Name: 6ca457542e1dceac2d68fe3d29ff1f0beb31a77ca3073bd7d8a6c62faabcdc1d
2024-11-15 10:47:11 +00:00
stephan
aa85c8c854 configure script doc additions for the ICU feature check.
FossilOrigin-Name: 1925a68fc2323f0788aac9c3c2bb3005182eb3286037bc383181b6aa150d4270
2024-11-15 10:12:03 +00:00
stephan
75ed9f819f An experiment in optionally using pkg-config to determine the libs to link in for ICU support, but its ldflags is missing one required lib on both Linux and OpenBSD. Keeping this for later reference, as it demonstrates how to use pkg-config from autosetup.
FossilOrigin-Name: 09caa94c9e846f9b3669b3f1acbb26b24b8bfcc9e512f17ea074dd92745c2597
2024-11-15 10:07:57 +00:00
stephan
f121ffbde3 Fix typo in the handling of the new --dev flag which caused it to set the --debug flag instead of the --with-debug flag (the former is for autosetup's internal use).
FossilOrigin-Name: 81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
2024-11-14 19:34:28 +00:00
stephan
009601d534 Remove $prefix/include from the default -I path because it can cause the build to pick up an unintended copy of sqlite3.h. Extend the ICU configure support (the origin of -I$prefix/include) to enable fetching the -I path from icu-config and apply it only to those objects which need it.
FossilOrigin-Name: f778dfdd6d6a4975c903d8ca0ebfb4fa917d543289136ea0ab740cb47d2510c1
2024-11-14 19:25:23 +00:00
stephan
c096d6add6 Add --enable-dev configure flag which sets various other flags.
FossilOrigin-Name: ea79c363a42484357ac4ac3422f3466e5bc5cb56e5b2a06a3dc4ec90fea1c190
2024-11-14 17:52:59 +00:00
stephan
f154cef8f2 Document the if block at the end of sqlite-check-tcl.
FossilOrigin-Name: 6bfd09408b9a51c0cbdb28f901a79c9774da755294d7eb67d88e4c42c5652830
2024-11-14 12:23:05 +00:00
stephan
3b56698541 configure: avoid performing multiple checks for -lm on behalf of --enable-fts4 and --enable-fts5.
FossilOrigin-Name: 6940caa192fa0cc84dbd24191a940aec96c304c68e60ead8f239e85d093e01e0
2024-11-14 12:09:09 +00:00
stephan
45c2b1804f Rename proj-define-if-opt-truthy to the more accurate, and less verbose, proj-define-for-opt.
FossilOrigin-Name: 05073350087b368312515134bdf9a266eb8289a065f208421fe08aa38b562d4b
2024-11-11 09:37:19 +00:00
stephan
e9b04e524b Simplify usage of proj-assert by making the expr prefix implicit. Add an optional description arg to proj-assert, defaulting to the body of the assertion script.
FossilOrigin-Name: ada7b36c37c59ea02e54462b0eb8b93ff6ab45863edfd67b19f1e1a7bb2f97de
2024-11-09 10:23:04 +00:00
stephan
497f84885b Remove an unused lib import from auto.def.
FossilOrigin-Name: 53a71981abf5aaca01e86ff87c3779d7dcc6661c80e1f2bf74515f49993b6a0d
2024-11-09 06:35:09 +00:00
stephan
a700db9387 Add 'tcl' makefile target which builds all but tclextension (which does not have a well-defined name and dependencies). Improve the deps for .tclenv.sh to avoid getting a stale tclsh when re-configuring with a different --with-tcl(sh).
FossilOrigin-Name: 1bd9de719b0944fdceec32103da3131a7d387820850ab03f652f813d840355b8
2024-11-08 13:37:00 +00:00
stephan
6f95d95015 Disable setting of the SONAME (enabled by [2a2419ef742]), as it's not clear whether blindly setting the SONAME, which now differs from its historical value, will cause more grief than it solves. Add a (disabled) experiment which permits setting (or not) the SONAME to the legacy or current values. This change is up for further change as experimentation proves whether we truly need/want the SONAME. See discussion in/around [forum:0c6fc6f46b2cb3|forum post 0c6fc6f46b2cb3].
FossilOrigin-Name: d931456805e7d5c3379ca68b97a0a1d4ab1eb80c5e90c169cf43fc8239247d25
2024-11-08 05:26:26 +00:00
stephan
ee9950d09b Extend the set of --flags which get cleared/unset when using --with-wasi-sdk.
FossilOrigin-Name: 2a2419ef742c9f37c32be04d417337c1fa22503305d2df154fa38b2b69eae943
2024-11-07 16:59:15 +00:00
stephan
6e6820148a Doc touchups in the line-editing feature check code.
FossilOrigin-Name: bb5656bdc905947df205432e108ca6724393061a27028e23bf35b4bf48505d4f
2024-11-07 15:23:54 +00:00
stephan
c7882b975e tcl configuration: --with-tcl=prefix is equivalent to passing the --prefix dir to it. If --with-tcl or --enable-tcl are explicitly passed in and tclConfig.sh is not found, fail fatally. When TCL is either explicitly disabled or default search for it fails non-fatally, be more explicit about which components are not available.
FossilOrigin-Name: c5389d39a90047683e80ae9081d5d10aaa95da00dfc8a133b4a1a6949a11620d
2024-11-07 15:04:15 +00:00
stephan
4c3139d7ee Add some internal docs to auto.def explaining certain passages.
FossilOrigin-Name: 4749967e1b85675580eda2e92f4463c022e3ff929390a8f5b59f614f3975e158
2024-11-07 08:57:38 +00:00
stephan
00e863c48e Document the purpose of a global auto.def var added in [0d558318172d].
FossilOrigin-Name: f5b6604716826b2057e969a8c0d099325b22eac42f1da65ec367671fc6625639
2024-11-07 08:29:58 +00:00
stephan
d9345f3312 When --with-linenoise refers to the msteveb flavor and jimsh is the TCL used for code generation, enable linenoise in jimsh. Remove some dead auto.def code.
FossilOrigin-Name: 0d558318172dddc8d5c5842625ddf09866ae09cac9cf28731be44db86b5e0fb1
2024-11-07 07:31:25 +00:00
stephan
968dc2489a Change several 'file exists' checks for tclsh to file-isexec because that checks for .exe extensions on Windows.
FossilOrigin-Name: 052a1b4d7cb43b7f65028c41e9a7a17b533c834d8f620fbc7bc0adddb1fdb843
2024-11-07 06:00:14 +00:00
stephan
347e4833f9 For platforms where tclsh is found but tclConfig.sh is not, set HAVE_TCL to 0. We can't build the TCL components on those. Problem reported in [forum:5106aee3a8|forum post 5106aee3a8].
FossilOrigin-Name: 04d2576b2e516fc5f5ba719d6bb01d25fd3b06b1c2d26acbec32bcdd65e9a01c
2024-11-07 05:26:09 +00:00
stephan
6da414ef41 When constructing the auto-reconfigure commands, only quote args which look like they need it. Minor doc updates.
FossilOrigin-Name: d4fbd34f7a4b0e6179cb06114d148fbc5d30b8dc8db0b764f4347dd50ff591ba
2024-11-06 07:20:20 +00:00
stephan
4c2f7e57a2 Add autosetup/README.md - maintenance-related docs for SQLite developers (e.g. how to update autosetup). Start marking up the proj.tcl APIs with autosetup's doc markup so that they appear in the ./configure --reference output.
FossilOrigin-Name: aa6213767f0d7e63c753e33aadb95cbeb8e522c22f2fe1bbfa4df66bea6e3380
2024-11-06 04:38:05 +00:00
stephan
e957bd1ce7 Enhance the --with-emsdk flag to use a default value of 'auto', meaning to search the environment for it, and to fail fatally if --with-emsdk is explicitly provided but the SDK is not found.
FossilOrigin-Name: 9724b747caa926bca09653ea6ac3c0f7869824c9a476eb81f03e1a6763552da1
2024-11-06 02:59:59 +00:00
stephan
d2ac1c5b7c Remove the --enable-rbu flag from the configure script, per /chat discussion, because it's a highly niche feature not in active use.
FossilOrigin-Name: 77db0cd736746873d4ed3dbf0e9a43a3e15ab49961fccee20417e01f88de8664
2024-11-05 13:03:58 +00:00
stephan
6d443b0d74 auto.def: remove an extraneous global var, some dead tcl/makefile code/comments, and some extraneous output. Rename an internal-use proc. Disable the ext/wasm cleanup in the top-level (dist)clean because the noise from gmake is irritating.
FossilOrigin-Name: ee9eb8b157c93b33a8ac201c31169cdd1d2cf2f21da92f7a6a418a41e5a50b7b
2024-11-05 09:49:53 +00:00
stephan
e69d98df22 Enhance the rpath configure check to honor --exec-prefix=... Remove some debugging code and move other debugging code around.
FossilOrigin-Name: a8c1a82b56412a4277a3c9bf2b256d3bd22bd8aca9096b8d08fcc0bf7d9364cb
2024-11-05 08:21:47 +00:00
stephan
63346a4bca Add the --enable-rbu configure flag and building of the commented-out rbu binary.
FossilOrigin-Name: 6c6fa3adfee6ec2c57dc76461e7c97416b4fad45772ce367d223cc67e66049f6
2024-11-05 07:55:33 +00:00
stephan
2fd38836dc Fix typo of --libexec ==> --libexecdir, discovered via audit of a downstream build script. Unrelated doc touchups.
FossilOrigin-Name: a60e5d76d06ae0568fbc6e068a7012c77778607cd60da92a1b84ff8f33049a93
2024-11-04 12:11:20 +00:00
stephan
f3d279595e When installing the shared lib, re-activate the accommodation of legacy-style .so links (removed in [80584e165e4]) based on two reports that not having those will cause all clients linked against the legacy naming convention to fail to dynamically link (which would preclude an update of a system-level libsqlite3 package). Set up the infrastructure needed for adding an SONAME to the library but do not yet activate it. See discussion in/around [forum:046133a7da|forum post 046133a7da].
FossilOrigin-Name: 1586eaceb1716fbeafc4af691d0f80206cd5390388b099d4939e6be5d3eb975b
2024-11-04 08:29:02 +00:00
stephan
88349483ef Move the .default-CFLAGS handling into a utility function, rename the corresponding file to .env-VAR, and apply that lookup to a couple more places.
FossilOrigin-Name: f01b61f21d105706e78eb1e3e7971e9ccb7a68250f8cda96ce285f0fd6b2f7f2
2024-11-03 21:32:24 +00:00
stephan
a9b00b0fb7 Fix a CFLAGS.jimsh typo in Makefile.in. Change default jimsh flags to include -O1, which slows down its build but speeds up its runtime considerably.
FossilOrigin-Name: a912c169152623f261fb5469a49f00aca1d8a273d8f7187744de12a26aede7cf
2024-11-03 20:15:38 +00:00
stephan
97c709b5be If any autotools-conventional dir names are explicitly overridden via ./configure --dirname=X then export those names as-is to the makefile, otherwise derive them from $prefix. This is, at least in part, a compromise to provide package maintainers a way to specify a libdir which will be incorporated into the -rpath link flag (which we can only determine at configure-time).
FossilOrigin-Name: 832abe8a8a347718e47f73a1f9be1fb084a1c28cac6b1c70f6c9a9cabeb0fb53
2024-11-03 19:42:41 +00:00
stephan
f0e7f4c1f2 An experiment in hybridizing overriding of autotools-conventional XYZdir vars, the goal being to be able to provide both overrriding of them at configure-time and make-time with sensible semantics. Based on notes from [forum:00d12a41f7|forum post 00d12a41f7].
FossilOrigin-Name: cc259bf5f176bf89b6effedfc716d19d2437fc761c20870d1c69205d4bcee12b
2024-11-02 05:50:22 +00:00
stephan
afb8798580 When configuring with --with-wasi-sdk, ensure that we use that SDK's 'ar' tool instead of whatever is in the PATH. When pushing/popping the define var scope for the jimsh compatility check, include more defines per consultation with autosetup's creator.
FossilOrigin-Name: 2dcc465a7090811ddbc210673f37b4c3a4439c501874abefd403efe1e98f5b17
2024-11-01 01:56:27 +00:00
drh
583770af28 Omit unnecessary bold text in ./configure output.
FossilOrigin-Name: d1368dc12b05e9828cb86a608771b666914c0e027ac4c42dea0042b0345d8b22
2024-10-31 11:21:35 +00:00
stephan
98eb4ad6ee Add -trim flag to proj-file-content.
FossilOrigin-Name: babf66f5c7074c24ca8ae898cd850964e99cef41fd1395a0d6c582cab75ae3bf
2024-10-31 08:12:48 +00:00
stephan
ec04c41be6 Remove some proj-assert checks which are not valid on OpenBSD. Ensure that queued up notices about TCL warnings are displayed before leaving sqlite-check-tcl.
FossilOrigin-Name: 3447308f3f66046ffedd502161757211bef0384d7a735ff675c06c04fbc22655
2024-10-31 08:03:35 +00:00
stephan
7be78606ff When reading in .default-CFLAGS, trim it.
FossilOrigin-Name: a62a5171ace53b79feda93701f90d6d6f88eb5542bd35ac76f962745c58588b0
2024-10-31 07:30:53 +00:00
stephan
343fe033c0 If a file named .default-CFLAGS exists in the build dir, use its contents as the default value of the CFLAGS unless it's overridden by being passed in or in the environment.
FossilOrigin-Name: 731d333c224e70190dadd214de1970ea541a3d716d1d7ff2c0ef6c63b8be9b13
2024-10-31 06:52:09 +00:00
stephan
0e07bc36d9 When --with-wasi-sdk is active, temporarily swap CC and CC_FOR_BUILD for purposes of looking for APIs required by B.cc.
FossilOrigin-Name: 435f2ee818d7181551c6860b6bc4db97f82d76b58fd82765a6cf49e2d02ff18c
2024-10-31 06:38:30 +00:00