remove musl libc stuff on ubuntu

Author: henderkes

.github/workflows/tests.yml

@@ -105,7 +105,7 @@ jobs:
         run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
       - name: "Run PHPUnit Tests"
-        run: SPC_LIBC=glibc vendor/bin/phpunit tests/ --no-coverage
+        run: vendor/bin/phpunit tests/ --no-coverage
 
   define-matrix:
     name: "Define Matrix"

bin/build-static-frankenphp

@@ -108,7 +108,6 @@ ADD ./bin/spc /app/bin/spc
 RUN /app/bin/setup-runtime
 RUN /app/bin/php /app/bin/composer install --no-dev
 ENV PATH="/app/bin:/cmake/bin:$PATH"
-ENV SPC_LIBC=glibc
 
 ADD ./config/env.ini /app/config/env.ini
 RUN CC=gcc bin/spc doctor --auto-fix --debug
@@ -159,7 +158,6 @@ echo 'CXX=/opt/rh/devtoolset-10/root/usr/bin/g++' >> /tmp/spc-gnu-docker.env
 echo 'AR=/opt/rh/devtoolset-10/root/usr/bin/ar' >> /tmp/spc-gnu-docker.env
 echo 'LD=/opt/rh/devtoolset-10/root/usr/bin/ld' >> /tmp/spc-gnu-docker.env
 echo 'SPC_DEFAULT_C_FLAGS=-fPIC' >> /tmp/spc-gnu-docker.env
-echo 'SPC_LIBC=glibc' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"' >> /tmp/spc-gnu-docker.env
 echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"' >> /tmp/spc-gnu-docker.env
 

bin/spc-gnu-docker

@@ -63,13 +63,11 @@ UPX_EXEC="${PKG_ROOT_PATH}\bin\upx.exe"
 SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream,cli_static
 
 [linux]
-; include PATH for musl libc.
-SPC_LIBC=musl
 ; compiler environments
-CC=${SPC_LINUX_DEFAULT_CC}
-CXX=${SPC_LINUX_DEFAULT_CXX}
-AR=${SPC_LINUX_DEFAULT_AR}
-LD=${SPC_LINUX_DEFAULT_LD}
+CC=gcc
+CXX=g++
+AR=ar
+LD=ld
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
 SPC_DEFAULT_C_FLAGS="-fPIC -Os"
 SPC_DEFAULT_CXX_FLAGS="-fPIC -Os"
@@ -78,7 +76,7 @@ SPC_EXTRA_LIBS=
 ; upx executable path
 UPX_EXEC=${PKG_ROOT_PATH}/bin/upx
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
-SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime140,win32,zend_stream
+SPC_MICRO_PATCHES=cli_checks,disable_huge_page,zend_stream
 
 ; *** default build command for building php ***
 ; buildconf command

config/env.ini

@@ -15,7 +15,7 @@ public function patchBeforeMake(): bool
         if (PHP_OS_FAMILY !== 'Linux') {
             return false;
         }
-        if (getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) {
+        if (getenv('NO_LIBGOMP')) {
             return false;
         }
         // imagick with calls omp_pause_all, which requires openmp, on non-musl we build imagick without openmp
@@ -26,15 +26,15 @@ public function patchBeforeMake(): bool
 
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        $disable_omp = !(getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) ? '' : ' ac_cv_func_omp_pause_resource_all=no';
+        $disable_omp = !(getenv('NO_LIBGOMP')) ? '' : ' ac_cv_func_omp_pause_resource_all=no';
         return '--with-imagick=' . ($shared ? 'shared,' : '') . BUILD_ROOT_PATH . $disable_omp;
     }
 
     protected function getStaticAndSharedLibs(): array
     {
         // on centos 7, it will use the symbol _ZTINSt6thread6_StateE, which is not defined in system libstdc++.so.6
         [$static, $shared] = parent::getStaticAndSharedLibs();
-        if (getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10')) {
+        if (str_contains(getenv('CC'), 'devtoolset-10')) {
             $static .= ' -lstdc++';
             $shared = str_replace('-lstdc++', '', $shared);
         }

src/SPC/builder/extension/imagick.php

@@ -30,18 +30,6 @@ public function __construct(array $options = [])
 
         GlobalEnvManager::init($this);
 
-        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\"");
-            $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 (!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
         $this->concurrency = intval(getenv('SPC_CONCURRENCY'));
         // cflags

src/SPC/builder/linux/LinuxBuilder.php

@@ -62,6 +62,11 @@ public static function isMuslDist(): bool
         return static::getOSRelease()['dist'] === 'alpine';
     }
 
+    public static function isGlibcDist(): bool
+    {
+        return PHP_OS_FAMILY === 'Linux' && static::getOSRelease()['dist'] !== 'alpine';
+    }
+
     public static function getCpuCount(): int
     {
         $ncpu = 1;
@@ -193,7 +198,7 @@ public static function getLibcVersionIfExists(): ?string
         if (self::$libc_version !== null) {
             return self::$libc_version;
         }
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'glibc') {
+        if (PHP_OS_FAMILY === 'Linux' && !SystemUtil::isMuslDist()) {
             $result = shell()->execWithResult('ldd --version', false);
             if ($result[0] !== 0) {
                 return null;
@@ -208,12 +213,8 @@ public static function getLibcVersionIfExists(): ?string
             }
             return null;
         }
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
-            if (self::isMuslDist()) {
-                $result = shell()->execWithResult('ldd 2>&1', false);
-            } else {
-                $result = shell()->execWithResult('/usr/local/musl/lib/libc.so 2>&1', false);
-            }
+        if (PHP_OS_FAMILY === 'Linux' && SystemUtil::isMuslDist()) {
+            $result = shell()->execWithResult('ldd 2>&1', false);
             // Match Version * line
             // match ldd version: "Version 1.2.3" match 1.2.3
             $pattern = '/Version\s+(\d+\.\d+\.\d+)/';
@@ -224,4 +225,15 @@ public static function getLibcVersionIfExists(): ?string
         }
         return null;
     }
+
+    public static function getLibcName()
+    {
+        if (PHP_OS_FAMILY === 'Darwin') {
+            return 'libSystem';
+        }
+        if (PHP_OS_FAMILY === 'Windows') {
+            return 'msvcrt';
+        }
+        return self::isMuslDist() ? 'musl' : 'glibc';
+    }
 }

src/SPC/builder/linux/SystemUtil.php

@@ -4,6 +4,7 @@
 
 namespace SPC\builder\linux\library;
 
+use SPC\builder\linux\SystemUtil;
 use SPC\store\FileSystem;
 
 class icu extends LinuxLibraryBase
@@ -16,7 +17,7 @@ protected function build(): void
     {
         $cppflags = 'CPPFLAGS="-DU_CHARSET_IS_UTF8=1  -DU_USING_ICU_NAMESPACE=1 -DU_STATIC_IMPLEMENTATION=1 -DPIC -fPIC"';
         $cxxflags = 'CXXFLAGS="-std=c++17 -DPIC -fPIC -fno-ident"';
-        $ldflags = getenv('SPC_LIBC') !== 'glibc' ? 'LDFLAGS="-static"' : '';
+        $ldflags = SystemUtil::isMuslDist() ? 'LDFLAGS="-static"' : '';
         shell()->cd($this->source_dir . '/source')->initializeEnv($this)
             ->exec(
                 "{$cppflags} {$cxxflags} {$ldflags} " .

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

@@ -7,6 +7,7 @@
 use SPC\builder\BuilderBase;
 use SPC\builder\freebsd\library\BSDLibraryBase;
 use SPC\builder\linux\library\LinuxLibraryBase;
+use SPC\builder\linux\SystemUtil;
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -200,7 +201,7 @@ protected function sanityCheck(int $build_target): void
             $util = new SPCConfigUtil($this);
             $config = $util->config($this->ext_list, $this->lib_list, $this->getOption('with-suggested-exts'), $this->getOption('with-suggested-libs'));
             $lens = "{$config['cflags']} {$config['ldflags']} {$config['libs']}";
-            if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
+            if (SystemUtil::isMuslDist()) {
                 $lens .= ' -static';
             }
             [$ret, $out] = shell()->cd($sample_file_path)->execWithResult(getenv('CC') . ' -o embed embed.c ' . $lens);
@@ -334,7 +335,7 @@ protected function buildFrankenphp(): void
         $debugFlags = $this->getOption('no-strip') ? "'-w -s' " : '';
         $extLdFlags = "-extldflags '-pie'";
         $muslTags = '';
-        if (PHP_OS_FAMILY === 'Linux' && getenv('SPC_LIBC') === 'musl') {
+        if (SystemUtil::isMuslDist()) {
             $extLdFlags = "-extldflags '-static-pie -Wl,-z,stack-size=0x80000'";
             $muslTags = 'static_build,';
         }

src/SPC/builder/unix/UnixBuilderBase.php

@@ -5,6 +5,7 @@
 namespace SPC\builder\unix\library;
 
 use SPC\builder\linux\library\LinuxLibraryBase;
+use SPC\builder\linux\SystemUtil;
 use SPC\builder\macos\library\MacOSLibraryBase;
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
@@ -33,13 +34,13 @@ protected function build(): void
             ->optionalLib('bzip2', ...ac_with_args('bzlib'))
             ->addConfigureArgs(
                 // TODO: glibc rh 10 toolset's libgomp.a was built without -fPIC so we can't use openmp without depending on libgomp.so
-                getenv('SPC_LIBC') === 'glibc' && str_contains(getenv('CC'), 'devtoolset-10') ? '--disable-openmp' : '--enable-openmp',
+                getenv('NO_LIBGOMP') ? '--disable-openmp' : '--enable-openmp',
                 '--without-jxl',
                 '--without-x',
             );
 
         // special: linux musl needs `-static`
-        $ldflags = ($this instanceof LinuxLibraryBase) && getenv('SPC_LIBC') !== 'glibc' ? ('-static -ldl') : '-ldl';
+        $ldflags = SystemUtil::isMuslDist() ? '-static -ldl' : '-ldl';
 
         // special: macOS needs -iconv
         $libs = $this instanceof MacOSLibraryBase ? '-liconv' : '';