From d86b7c4cec073e3d403197d7c9838c7993940108 Mon Sep 17 00:00:00 2001 From: Marc Date: Wed, 19 Mar 2025 02:21:23 +0100 Subject: [PATCH] fix freetype lib build (#654) Co-authored-by: Marc Henderkes --- src/SPC/builder/unix/library/freetype.php | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/SPC/builder/unix/library/freetype.php b/src/SPC/builder/unix/library/freetype.php index 6f91a3ec..0f25ff6e 100644 --- a/src/SPC/builder/unix/library/freetype.php +++ b/src/SPC/builder/unix/library/freetype.php @@ -18,21 +18,17 @@ trait freetype */ protected function build(): void { - $suggested = $this->builder->getLib('libpng') ? '--with-png' : '--without-png'; - $suggested .= ' '; - $suggested .= $this->builder->getLib('bzip2') ? ('--with-bzip2=' . BUILD_ROOT_PATH) : '--without-bzip2'; - $suggested .= ' '; - $suggested .= $this->builder->getLib('brotli') ? ('--with-brotli=' . BUILD_ROOT_PATH) : '--without-brotli'; - $suggested .= ' '; + $extra_libs = $this->builder->getLib('libpng') ? '--with-png' : '--without-png'; + $extra_libs .= ' '; + $extra_libs .= $this->builder->getLib('bzip2') ? ('--with-bzip2=' . BUILD_ROOT_PATH) : '--without-bzip2'; + $extra_libs .= ' '; + $extra_libs .= $this->builder->getLib('brotli') ? ('--with-brotli=' . BUILD_ROOT_PATH) : '--without-brotli'; + $extra_libs .= ' '; shell()->cd($this->source_dir) ->setEnv(['CFLAGS' => $this->getLibExtraCFlags(), 'LDFLAGS' => $this->getLibExtraLdFlags(), 'LIBS' => $this->getLibExtraLibs()]) - ->exec('sh autogen.sh') - ->execWithEnv( - './configure ' . - '--enable-static --disable-shared --without-harfbuzz --prefix= ' . - $suggested - ) + ->execWithEnv('./autogen.sh') + ->execWithEnv('./configure --without-harfbuzz --prefix= ' . $extra_libs) ->execWithEnv('make clean') ->execWithEnv("make -j{$this->builder->concurrency}") ->execWithEnv('make install DESTDIR=' . BUILD_ROOT_PATH);