Skip to content

Commit d86b7c4

Browse files
DubbleClickmhpcc
andauthored
fix freetype lib build (#654)
Co-authored-by: Marc Henderkes <[email protected]>
1 parent b193105 commit d86b7c4

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

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

+8-12
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,17 @@ trait freetype
1818
*/
1919
protected function build(): void
2020
{
21-
$suggested = $this->builder->getLib('libpng') ? '--with-png' : '--without-png';
22-
$suggested .= ' ';
23-
$suggested .= $this->builder->getLib('bzip2') ? ('--with-bzip2=' . BUILD_ROOT_PATH) : '--without-bzip2';
24-
$suggested .= ' ';
25-
$suggested .= $this->builder->getLib('brotli') ? ('--with-brotli=' . BUILD_ROOT_PATH) : '--without-brotli';
26-
$suggested .= ' ';
21+
$extra_libs = $this->builder->getLib('libpng') ? '--with-png' : '--without-png';
22+
$extra_libs .= ' ';
23+
$extra_libs .= $this->builder->getLib('bzip2') ? ('--with-bzip2=' . BUILD_ROOT_PATH) : '--without-bzip2';
24+
$extra_libs .= ' ';
25+
$extra_libs .= $this->builder->getLib('brotli') ? ('--with-brotli=' . BUILD_ROOT_PATH) : '--without-brotli';
26+
$extra_libs .= ' ';
2727

2828
shell()->cd($this->source_dir)
2929
->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()])
30-
->exec('sh autogen.sh')
31-
->execWithEnv(
32-
'./configure ' .
33-
'--enable-static --disable-shared --without-harfbuzz --prefix= ' .
34-
$suggested
35-
)
30+
->execWithEnv('./autogen.sh')
31+
->execWithEnv('./configure --without-harfbuzz --prefix= ' . $extra_libs)
3632
->execWithEnv('make clean')
3733
->execWithEnv("make -j{$this->builder->concurrency}")
3834
->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH);

0 commit comments

Comments
 (0)