diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-06 12:36:55 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-06 12:36:55 +0200 |
| commit | 6083a387a81dbbd66d6316a3a12a63f06d5f7109 (patch) | |
| tree | 4576666b095bba91d6a78afe7f3d8cc67d442b20 /win32/build | |
| parent | 61330b0faf5dfbed79cba012744dabce9d20cc8f (diff) | |
| download | php-git-6083a387a81dbbd66d6316a3a12a63f06d5f7109.tar.gz | |
Unbundle libsqlite3
Since there is no need to patch libsqlite3 for our purposes, and since
libsqlite3 ≥ 3.3.9 (which is our current requirement) is widely
available on distros, there is no reason anymore to bundle the library.
Besides removing the bundled libsqlite, and adapting the configuration
respectively, we also fix the use of the SQLITE_ENABLE_COLUMN_METADATA
compile time constant to detect whether sqlite3_column_table_name() is
available by a working feature detection (otherwise bug_42589.phpt
would fail). We also skip bug73068.phpt for libsqlite 3.11.0 to
3.14.1 which have a bug (<https://sqlite.org/src/info/ef360601>).
We also completely drop support for the obscure pdo_sqlite_external
extension (which could have been enabled on Windows only by passing
`--pdo-sqlite-external` to configure), since it is not needed anymore.
Furthermore, we remove references to the bundled libsqlite from
Makefile.gcov, CONTRIBUTING.md and README.REDIST.BINS.
Diffstat (limited to 'win32/build')
| -rw-r--r-- | win32/build/confutils.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 560824f549..ef457ba42b 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -3586,6 +3586,15 @@ function SETUP_OPENSSL(target, path_to_check, common_name, use_env, add_dir_part return ret; } +function SETUP_SQLITE3(target, path_to_check, shared) { + var cflags_var = "CFLAGS_" + target.toUpperCase(); + var libs = (shared ? "libsqlite3.lib;libsqlite3_a.lib" : "libsqlite3_a.lib;libsqlite3.lib"); + + return CHECK_LIB(libs, target, path_to_check) && + CHECK_HEADER_ADD_INCLUDE("sqlite3.h", cflags_var) && + CHECK_HEADER_ADD_INCLUDE("sqlite3ext.h", cflags_var); +} + function check_binary_tools_sdk() { var BIN_TOOLS_SDK_VER_MAJOR = 0; |