Commit 51bd39e
db.sqlite: fix thirdparty amalgamation not found on Linux (#26724)
* db.sqlite: fix thirdparty amalgamation not found on Linux
Make the thirdparty sqlite include path apply on all platforms,
not just Windows. On Linux, use pkg-config when the system library
is available, otherwise fall back to compiling the thirdparty
amalgamation. Update docs to reflect cross-platform support.
Closes #26723
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* db.sqlite: preserve -lsqlite3 fallback for systems without pkg-config
Keep the original -lsqlite3 fallback when pkg-config metadata is
missing, so environments with SQLite installed but no sqlite3.pc
file (e.g. default macOS SDK, some Linux/BSD setups) continue to
work without requiring the thirdparty amalgamation.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* db.sqlite: prefer system sqlite via pkgconfig before thirdparty fallback
Restructure the flag chain so pkgconfig is checked first, then
Windows thirdparty, then -lsqlite3 fallback. This ensures the
system install is preferred when available.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Richard Wheeler <18647491+PythonWillRule@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>1 parent e2a5e2e commit 51bd39e
3 files changed
Lines changed: 31 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5622 | 5622 | | |
5623 | 5623 | | |
5624 | 5624 | | |
5625 | | - | |
5626 | | - | |
5627 | | - | |
| 5625 | + | |
| 5626 | + | |
| 5627 | + | |
| 5628 | + | |
| 5629 | + | |
| 5630 | + | |
| 5631 | + | |
| 5632 | + | |
| 5633 | + | |
| 5634 | + | |
| 5635 | + | |
| 5636 | + | |
| 5637 | + | |
| 5638 | + | |
| 5639 | + | |
| 5640 | + | |
5628 | 5641 | | |
5629 | 5642 | | |
5630 | 5643 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | | - | |
| 9 | + | |
11 | 10 | | |
12 | | - | |
| 11 | + | |
13 | 12 | | |
14 | | - | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
15 | 16 | | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
26 | 23 | | |
27 | 24 | | |
28 | 25 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
9 | 11 | | |
10 | 12 | | |
11 | | - | |
12 | 13 | | |
13 | 14 | | |
14 | | - | |
15 | 15 | | |
| 16 | + | |
16 | 17 | | |
17 | 18 | | |
18 | 19 | | |
| |||
0 commit comments