Remove SPC_NO_MUSL_PATH, remove --libc, use SPC_LIBC instead (#642)

* Remove SPC_NO_MUSL_PATH, remove --libc, use SPC_LIBC instead

* Fix tests

* Internally use GNU_ARCH for unified

* Update EXTENSION_DIR comments for env.ini

* Remove redundant -fPIC cflags in curl

src/SPC/builder/linux/LinuxBuilder.php

@@ -15,8 +15,6 @@ use SPC\util\GlobalEnvManager;
 
 class LinuxBuilder extends UnixBuilderBase
 {
-    public string $libc;
-
     /** @var bool Micro patch phar flag */
     private bool $phar_patched = false;
 
@@ -27,27 +25,23 @@ class LinuxBuilder extends UnixBuilderBase
     public function __construct(array $options = [])
     {
         $this->options = $options;
-        SystemUtil::initLibcVar($this->options['libc'] ?? null);
-
-        $this->libc = getenv('SPC_LIBC') ?: LIBC_MUSL_WRAPPER;
 
         // check musl-cross make installed if we use musl-cross-make
         $arch = arch2gnu(php_uname('m'));
 
         GlobalEnvManager::init($this);
 
-        // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused)
-        if (!filter_var(getenv('SPC_NO_MUSL_PATH'), FILTER_VALIDATE_BOOLEAN) && $this->libc !== LIBC_GLIBC) {
+        if (getenv('SPC_LIBC') === 'musl' && !SystemUtil::isMuslDist()) {
             $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
             $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
             GlobalEnvManager::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
             $configure = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
             $configure = "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\" " . $configure;
             GlobalEnvManager::putenv("SPC_CMD_PREFIX_PHP_CONFIGURE={$configure}");
-        }
 
-        if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc") && (getenv('SPC_NO_MUSL_PATH') !== 'yes')) {
-            throw new WrongUsageException('musl-cross-make not installed, please install it first. (You can use `doctor` command to install it)');
+            if (!file_exists("/usr/local/musl/{$arch}-linux-musl/lib/libc.a")) {
+                throw new WrongUsageException('You are building with musl-libc target in glibc distro, but musl-toolchain is not installed, please install musl-toolchain first. (You can use `doctor` command to install it)');
+            }
         }
 
         // concurrency
@@ -216,10 +210,8 @@ class LinuxBuilder extends UnixBuilderBase
             $this->buildEmbed();
         }
 
-        if (php_uname('m') === $this->getOption('arch')) {
-            $this->emitPatchPoint('before-sanity-check');
-            $this->sanityCheck($build_target);
-        }
+        $this->emitPatchPoint('before-sanity-check');
+        $this->sanityCheck($build_target);
     }
 
     /**

src/SPC/builder/linux/SystemUtil.php

@@ -182,12 +182,4 @@ class SystemUtil
             'arch', 'manjaro',
         ];
     }
-
-    public static function initLibcVar(?string $libc = null): void
-    {
-        if ($libc === null) {
-            $libc = self::isMuslDist() ? 'musl' : 'musl-wrapper';
-        }
-        f_putenv('SPC_LIBC=' . $libc);
-    }
 }

src/SPC/builder/linux/library/icu.php

@@ -16,7 +16,7 @@ class icu extends LinuxLibraryBase
     {
         $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -fPIC -fPIE -fno-ident"';
         $cxxflags = 'CXXFLAGS="-std=c++17"';
-        $ldflags = $this->builder->libc !== 'glibc' ? 'LDFLAGS="-static"' : '';
+        $ldflags = getenv('SPC_LIBC') !== 'glibc' ? 'LDFLAGS="-static"' : '';
         shell()->cd($this->source_dir . '/source')
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

src/SPC/builder/linux/library/libffi.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
+use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 
 class libffi extends LinuxLibraryBase
@@ -12,28 +13,21 @@ class libffi extends LinuxLibraryBase
 
     /**
      * @throws RuntimeException
+     * @throws FileSystemException
      */
     public function build(): void
     {
         [$lib, , $destdir] = SEPARATED_PATH;
 
-        /*$env = $this->builder->pkgconf_env . ' CFLAGS="' . $this->builder->arch_c_flags . '"';
-
-        $env .= match ($this->builder->libc) {
-            'musl_wrapper' => " CC='{$this->builder->getOption('cc')} --static -idirafter " . BUILD_INCLUDE_PATH .
-                ($this->builder->getOption('arch') === php_uname('m') ? '-idirafter /usr/include/ ' : '') .
-                "-idirafter /usr/include/{$this->builder->getOption('arch')}-linux-gnu/'",
-            'musl', 'glibc' => " CC='{$this->builder->getOption('cc')}'",
-            default => throw new RuntimeException('unsupported libc: ' . $this->builder->libc),
-        };*/
+        $arch = getenv('SPC_ARCH');
 
         shell()->cd($this->source_dir)
             ->exec(
                 './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
-                "--host={$this->builder->getOption('arch')}-unknown-linux " .
-                "--target={$this->builder->getOption('arch')}-unknown-linux " .
+                "--host={$arch}-unknown-linux " .
+                "--target={$arch}-unknown-linux " .
                 '--prefix= ' . // use prefix=/
                 "--libdir={$lib}"
             )

src/SPC/builder/linux/library/libpng.php

@@ -36,9 +36,9 @@ class libpng extends LinuxLibraryBase
      */
     public function build(): void
     {
-        $optimizations = match ($this->builder->getOption('arch')) {
+        $optimizations = match (getenv('SPC_ARCH')) {
             'x86_64' => '--enable-intel-sse ',
-            'arm64' => '--enable-arm-neon ',
+            'aarch64' => '--enable-arm-neon ',
             default => '',
         };
         shell()->cd($this->source_dir)

src/SPC/builder/linux/library/openssl.php

@@ -42,10 +42,11 @@ class openssl extends LinuxLibraryBase
 
         $extra = '';
         $ex_lib = '-ldl -pthread';
+        $arch = getenv('SPC_ARCH');
 
         $env = "CC='" . getenv('CC') . ' -idirafter ' . BUILD_INCLUDE_PATH .
             ' -idirafter /usr/include/ ' .
-            ' -idirafter /usr/include/' . $this->builder->getOption('arch') . '-linux-gnu/ ' .
+            ' -idirafter /usr/include/' . getenv('SPC_ARCH') . '-linux-gnu/ ' .
             "' ";
         // lib:zlib
         $zlib = $this->builder->getLib('zlib');
@@ -72,7 +73,7 @@ class openssl extends LinuxLibraryBase
                 '--openssldir=/etc/ssl ' .
                 "{$zlib_extra}" .
                 'no-legacy ' .
-                "linux-{$this->builder->getOption('arch')}{$clang_postfix}"
+                "linux-{$arch}{$clang_postfix}"
             )
             ->exec('make clean')
             ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")