merge cmake changes from master into icurel

src/SPC/builder/linux/LinuxBuilder.php

@@ -48,14 +48,6 @@ class LinuxBuilder extends UnixBuilderBase
         // cflags
         $this->arch_c_flags = getenv('SPC_DEFAULT_C_FLAGS');
         $this->arch_cxx_flags = getenv('SPC_DEFAULT_CXX_FLAGS');
-        // cmake toolchain
-        $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile(
-            'Linux',
-            $arch,
-            $this->arch_c_flags,
-            getenv('CC'),
-            getenv('CXX'),
-        );
 
         // cross-compiling is not supported yet
         /*if (php_uname('m') !== $this->arch) {

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

@@ -21,12 +21,8 @@ class libffi extends LinuxLibraryBase
         $arch = getenv('SPC_ARCH');
 
         shell()->cd($this->source_dir)
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags(),
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
+            ->initializeEnv($this)
+            ->exec(
                 './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
@@ -36,9 +32,9 @@ class libffi extends LinuxLibraryBase
                 '--prefix= ' .
                 "--libdir={$lib}"
             )
-            ->execWithEnv('make clean')
-            ->execWithEnv("make -j{$this->builder->concurrency}")
-            ->execWithEnv("make install DESTDIR={$destdir}");
+            ->exec('make clean')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec("make install DESTDIR={$destdir}");
 
         if (is_file(BUILD_ROOT_PATH . '/lib64/libffi.a')) {
             copy(BUILD_ROOT_PATH . '/lib64/libffi.a', BUILD_ROOT_PATH . '/lib/libffi.a');

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

@@ -41,15 +41,11 @@ class libpng extends LinuxLibraryBase
             'aarch64' => '--enable-arm-neon ',
             default => '',
         };
-        shell()->cd($this->source_dir)
+        shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec('chmod +x ./configure')
             ->exec('chmod +x ./install-sh')
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags() . ' -L' . BUILD_LIB_PATH,
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
+            ->exec(
+                'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
                 './configure ' .
                 '--disable-shared ' .
                 '--enable-static ' .

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

@@ -4,50 +4,9 @@ declare(strict_types=1);
 
 namespace SPC\builder\linux\library;
 
-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-use SPC\store\FileSystem;
-
 class libxml2 extends LinuxLibraryBase
 {
+    use \SPC\builder\unix\library\libxml2;
+
     public const NAME = 'libxml2';
-
-    /**
-     * @throws RuntimeException
-     * @throws FileSystemException
-     */
-    public function build(): void
-    {
-        $enable_zlib = $this->builder->getLib('zlib') ? ('ON -DZLIB_LIBRARY=' . BUILD_LIB_PATH . '/libz.a -DZLIB_INCLUDE_DIR=' . BUILD_INCLUDE_PATH) : 'OFF';
-        $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
-        $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
-
-        FileSystem::resetDir($this->source_dir . '/build');
-        shell()->cd($this->source_dir . '/build')
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags(),
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
-                "cmake {$this->builder->makeCmakeArgs()} " .
-                '-DIconv_IS_BUILT_IN=OFF ' .
-                '-DLIBXML2_WITH_ICONV=ON ' .
-                "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
-                "-DLIBXML2_WITH_ICU={$enable_icu} " .
-                "-DLIBXML2_WITH_LZMA={$enable_xz} " .
-                '-DLIBXML2_WITH_PYTHON=OFF ' .
-                '-DLIBXML2_WITH_PROGRAMS=OFF ' .
-                '-DLIBXML2_WITH_TESTS=OFF ' .
-                '..'
-            )
-            ->execWithEnv("cmake --build . -j {$this->builder->concurrency}")
-            ->execWithEnv('make install');
-
-        FileSystem::replaceFileStr(
-            BUILD_LIB_PATH . '/pkgconfig/libxml-2.0.pc',
-            '-licudata -licui18n -licuuc',
-            '-licui18n -licuuc -licudata'
-        );
-    }
 }

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

@@ -64,13 +64,8 @@ class openssl extends LinuxLibraryBase
 
         $clang_postfix = SystemUtil::getCCType(getenv('CC')) === 'clang' ? '-clang' : '';
 
-        shell()->cd($this->source_dir)
-            ->setEnv([
-                'CFLAGS' => $this->getLibExtraCFlags(),
-                'LDFLAGS' => $this->getLibExtraLdFlags(),
-                'LIBS' => $this->getLibExtraLibs(),
-            ])
-            ->execWithEnv(
+        shell()->cd($this->source_dir)->initializeEnv($this)
+            ->exec(
                 "{$env} ./Configure no-shared {$extra} " .
                 '--prefix=/ ' .
                 '--libdir=lib ' .
@@ -80,7 +75,7 @@ class openssl extends LinuxLibraryBase
                 "linux-{$arch}{$clang_postfix}"
             )
             ->exec('make clean')
-            ->execWithEnv("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
+            ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
             ->exec("make install_sw DESTDIR={$destdir}");
         $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
         // patch for openssl 3.3.0+