From 654c5cba0ccf9259165dcc4b58280cd210b99536 Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Sat, 30 Sep 2023 17:50:37 +0200 Subject: [PATCH] fix musl install on rhel --- src/SPC/doctor/item/LinuxMuslCheck.php | 9 ++++----- src/SPC/doctor/item/LinuxToolCheckList.php | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/SPC/doctor/item/LinuxMuslCheck.php b/src/SPC/doctor/item/LinuxMuslCheck.php index 0fc94a34..3e5cb75a 100644 --- a/src/SPC/doctor/item/LinuxMuslCheck.php +++ b/src/SPC/doctor/item/LinuxMuslCheck.php @@ -36,13 +36,12 @@ class LinuxMuslCheck #[AsFixItem('fix-musl')] public function fixMusl(array $distro): bool { - $rhel_install = 'dnf install tar wget git zip bison flex bzip2 cmake patch && \ - wget https://musl.libc.org/releases/musl-1.2.4.tar.gz && tar -zxvf musl-1.2.4.tar.gz && \ + $rhel_install = 'wget https://musl.libc.org/releases/musl-1.2.4.tar.gz && tar -zxvf musl-1.2.4.tar.gz && \ rm -f musl-1.2.4.tar.gz && cd musl-1.2.4 && - if [[ ! "$PATH" =~ (^|:)"/usr/local/musl/bin"(:|$) ]]; then export PATH="/usr/local/musl/bin:$PATH" + if [[ ! "$PATH" =~ (^|:)"/usr/local/musl/bin"(:|$) ]]; then echo "export PATH=/usr/local/musl/bin:$PATH" >> ~/.bash_profile fi && \ - ./configure --disable-shared --enable-wrapper=gcc && \ - make -j && make install && cd ..'; + ./configure --enable-wrapper=gcc && \ + make -j && make install && cd .. && rm -rf musl-1.2.4'; $install_cmd = match ($distro['dist']) { 'ubuntu', 'debian' => 'apt-get install musl musl-tools -y', 'alpine' => 'apk add musl musl-utils musl-dev', diff --git a/src/SPC/doctor/item/LinuxToolCheckList.php b/src/SPC/doctor/item/LinuxToolCheckList.php index 6516731e..897d4ef4 100644 --- a/src/SPC/doctor/item/LinuxToolCheckList.php +++ b/src/SPC/doctor/item/LinuxToolCheckList.php @@ -36,7 +36,7 @@ class LinuxToolCheckList 'git', 'autoconf', 'automake', 'tar', 'unzip', 'gzip', 'gcc', 'bzip2', 'cmake', 'patch', - 'xz', + 'xz', 'wget', // to get musl ]; /** @noinspection PhpUnused */