mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-17 20:34:51 +08:00
allow using some libs as system provided (work around mssql linking vs system openssl)
This commit is contained in:
parent
b690566b39
commit
f93ad27c17
@ -862,6 +862,9 @@
|
|||||||
},
|
},
|
||||||
"openssl": {
|
"openssl": {
|
||||||
"source": "openssl",
|
"source": "openssl",
|
||||||
|
"pkg-configs": [
|
||||||
|
"openssl"
|
||||||
|
],
|
||||||
"static-libs-unix": [
|
"static-libs-unix": [
|
||||||
"libssl.a",
|
"libssl.a",
|
||||||
"libcrypto.a"
|
"libcrypto.a"
|
||||||
@ -974,6 +977,11 @@
|
|||||||
},
|
},
|
||||||
"unixodbc": {
|
"unixodbc": {
|
||||||
"source": "unixodbc",
|
"source": "unixodbc",
|
||||||
|
"pkg-configs": [
|
||||||
|
"odbc",
|
||||||
|
"odbccr",
|
||||||
|
"odbcinst"
|
||||||
|
],
|
||||||
"static-libs-unix": [
|
"static-libs-unix": [
|
||||||
"libodbc.a",
|
"libodbc.a",
|
||||||
"libodbccr.a",
|
"libodbccr.a",
|
||||||
@ -1015,6 +1023,9 @@
|
|||||||
},
|
},
|
||||||
"zlib": {
|
"zlib": {
|
||||||
"source": "zlib",
|
"source": "zlib",
|
||||||
|
"pkg-configs": [
|
||||||
|
"zlib"
|
||||||
|
],
|
||||||
"static-libs-unix": [
|
"static-libs-unix": [
|
||||||
"libz.a"
|
"libz.a"
|
||||||
],
|
],
|
||||||
@ -1028,6 +1039,9 @@
|
|||||||
},
|
},
|
||||||
"zstd": {
|
"zstd": {
|
||||||
"source": "zstd",
|
"source": "zstd",
|
||||||
|
"pkg-configs": [
|
||||||
|
"libzstd"
|
||||||
|
],
|
||||||
"static-libs-unix": [
|
"static-libs-unix": [
|
||||||
"libzstd.a"
|
"libzstd.a"
|
||||||
],
|
],
|
||||||
|
|||||||
@ -96,7 +96,8 @@ class Extension
|
|||||||
fn ($x) => $x->getStaticLibFiles(),
|
fn ($x) => $x->getStaticLibFiles(),
|
||||||
$this->getLibraryDependencies(recursive: true)
|
$this->getLibraryDependencies(recursive: true)
|
||||||
);
|
);
|
||||||
return implode(' ', $ret);
|
$libs = implode(' ', $ret);
|
||||||
|
return deduplicate_flags($libs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -365,6 +365,24 @@ abstract class LibraryBase
|
|||||||
|
|
||||||
protected function isLibraryInstalled(): bool
|
protected function isLibraryInstalled(): bool
|
||||||
{
|
{
|
||||||
|
if ($pkg_configs = Config::getLib(static::NAME, 'pkg-configs', [])) {
|
||||||
|
$pkg_config_path = getenv('PKG_CONFIG_PATH') ?: '';
|
||||||
|
$search_paths = array_unique(array_filter(explode(is_unix() ? ':' : ';', $pkg_config_path)));
|
||||||
|
|
||||||
|
foreach ($pkg_configs as $name) {
|
||||||
|
$found = false;
|
||||||
|
foreach ($search_paths as $path) {
|
||||||
|
if (file_exists($path . "/{$name}.pc")) {
|
||||||
|
$found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!$found) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true; // allow using system dependencies if pkg_config_path is explicitly defined
|
||||||
|
}
|
||||||
foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
|
foreach (Config::getLib(static::NAME, 'static-libs', []) as $name) {
|
||||||
if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
|
if (!file_exists(BUILD_LIB_PATH . "/{$name}")) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user