Skip to content

Commit 2681a88

Browse files
DubbleClickmhpcc
andauthored
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 <[email protected]>
1 parent e116260 commit 2681a88

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

config/lib.json

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,8 @@
1212
"lib-base",
1313
"micro"
1414
],
15-
"lib-depends-linux": [
16-
"lib-base",
17-
"libacl",
18-
"micro"
15+
"lib-suggests-linux": [
16+
"libacl"
1917
]
2018
},
2119
"micro": {

src/SPC/builder/unix/library/attr.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ protected function build(): void
1919
'LDFLAGS' => trim('-L' . BUILD_LIB_PATH . ' ' . $this->getLibExtraLdFlags()),
2020
'LIBS' => $this->getLibExtraLibs(),
2121
])->execWithEnv('./autogen.sh')
22-
->execWithEnv('./configure --prefix= --enable-static --disable-shared')
22+
->execWithEnv('./configure --prefix= --enable-static --disable-shared --disable-nls')
2323
->execWithEnv("make -j {$this->builder->concurrency}")
2424
->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
2525

src/SPC/command/BuildCliCommand.php

-3
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@ public function handle(): int
108108
$include_suggest_ext = $this->getOption('with-suggested-exts');
109109
$include_suggest_lib = $this->getOption('with-suggested-libs');
110110
[$extensions, $libraries, $not_included] = DependencyUtil::getExtsAndLibs($extensions, $libraries, $include_suggest_ext, $include_suggest_lib);
111-
if (PHP_OS_FAMILY !== 'Linux' || !($rule & BUILD_TARGET_FPM)) {
112-
$libraries = array_filter($libraries, fn ($lib) => !in_array($lib, ['attr', 'libacl']));
113-
}
114111
$display_libs = array_filter($libraries, fn ($lib) => in_array(Config::getLib($lib, 'type', 'lib'), ['lib', 'package']));
115112

116113
// print info

0 commit comments

Comments
 (0)