fix libtool missing bug for freetype

This commit is contained in:
crazywhalecc 2023-12-10 18:27:19 +08:00 committed by Jerry Ma
parent c1758bd754
commit c7e9294908
2 changed files with 4 additions and 1 deletions

View File

@ -73,6 +73,7 @@ RUN apk update; \
git \ git \
jq \ jq \
libgcc \ libgcc \
libtool \
libstdc++ \ libstdc++ \
linux-headers \ linux-headers \
m4 \ m4 \

View File

@ -21,6 +21,7 @@ class LinuxToolCheckList
'tar', 'unzip', 'gzip', 'tar', 'unzip', 'gzip',
'bzip2', 'cmake', 'gcc', 'bzip2', 'cmake', 'gcc',
'g++', 'patch', 'binutils-gold', 'g++', 'patch', 'binutils-gold',
'libtoolize',
]; ];
public const TOOLS_DEBIAN = [ public const TOOLS_DEBIAN = [
@ -102,7 +103,8 @@ class LinuxToolCheckList
try { try {
$is_debian = in_array($distro['dist'], ['debian', 'ubuntu']); $is_debian = in_array($distro['dist'], ['debian', 'ubuntu']);
$to_install = $is_debian ? str_replace('xz', 'xz-utils', $missing) : $missing; $to_install = $is_debian ? str_replace('xz', 'xz-utils', $missing) : $missing;
$to_install = $is_debian ? str_replace('libtoolize', 'libtool', $to_install) : $to_install; // debian, alpine libtool -> libtoolize
$to_install = str_replace('libtoolize', 'libtool', $to_install);
shell(true)->exec($prefix . $install_cmd . ' ' . implode(' ', $to_install)); shell(true)->exec($prefix . $install_cmd . ' ' . implode(' ', $to_install));
} catch (RuntimeException) { } catch (RuntimeException) {
return false; return false;