mirror of
https://github.com/crazywhalecc/static-php-cli.git
synced 2026-03-17 20:34:51 +08:00
don't require libacl and attr - use --with-libs='libacl' if you build… (#635)
* don't require libacl and attr - use --with-libs='libacl' if you build fpm with acl support * don't filter out libacl and libattr * suggest attr instead of requiring it * disable nls if libiconv is not built * suggest libiconv when using attr/libacl * wrong directive... * gettext (libintl) for acl/attr * remove suggestions and build acl and attr without nls --------- Co-authored-by: Marc Henderkes <m.henderkes@pc-college.de>
This commit is contained in:
parent
e1162606f5
commit
2681a88488
@ -12,10 +12,8 @@
|
||||
"lib-base",
|
||||
"micro"
|
||||
],
|
||||
"lib-depends-linux": [
|
||||
"lib-base",
|
||||
"libacl",
|
||||
"micro"
|
||||
"lib-suggests-linux": [
|
||||
"libacl"
|
||||
]
|
||||
},
|
||||
"micro": {
|
||||
|
||||
@ -19,7 +19,7 @@ trait attr
|
||||
'LDFLAGS' => trim('-L' . BUILD_LIB_PATH . ' ' . $this->getLibExtraLdFlags()),
|
||||
'LIBS' => $this->getLibExtraLibs(),
|
||||
])->execWithEnv('./autogen.sh')
|
||||
->execWithEnv('./configure --prefix= --enable-static --disable-shared')
|
||||
->execWithEnv('./configure --prefix= --enable-static --disable-shared --disable-nls')
|
||||
->execWithEnv("make -j {$this->builder->concurrency}")
|
||||
->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
|
||||
|
||||
|
||||
@ -108,9 +108,6 @@ class BuildCliCommand extends BuildCommand
|
||||
$include_suggest_ext = $this->getOption('with-suggested-exts');
|
||||
$include_suggest_lib = $this->getOption('with-suggested-libs');
|
||||
[$extensions, $libraries, $not_included] = DependencyUtil::getExtsAndLibs($extensions, $libraries, $include_suggest_ext, $include_suggest_lib);
|
||||
if (PHP_OS_FAMILY !== 'Linux' || !($rule & BUILD_TARGET_FPM)) {
|
||||
$libraries = array_filter($libraries, fn ($lib) => !in_array($lib, ['attr', 'libacl']));
|
||||
}
|
||||
$display_libs = array_filter($libraries, fn ($lib) => in_array(Config::getLib($lib, 'type', 'lib'), ['lib', 'package']));
|
||||
|
||||
// print info
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user