Merge pull request #723 from crazywhalecc/fix/xslt

fix libxslt build when trying to create a PIE executable using it

Author: henderkes

src/SPC/builder/unix/library/libxslt.php

@@ -25,12 +25,14 @@ protected function build(): void
             }
         }
         shell()->cd($this->source_dir)
-            ->exec(
-                'CFLAGS="-I' . BUILD_INCLUDE_PATH . '" ' .
+            ->setEnv([
+                'CFLAGS' => trim($this->getLibExtraCFlags() . ' -I' . BUILD_INCLUDE_PATH),
+                'LDFLAGS' => trim($this->getLibExtraLdFlags() . ' -L' . BUILD_LIB_PATH),
+                'LIBS' => trim($this->getLibExtraLibs() . "{$required_libs} -lstdc++"),
+            ])
+            ->execWithEnv(
                 "{$this->builder->getOption('library_path')} " .
                 "{$this->builder->getOption('ld_library_path')} " .
-                'LDFLAGS="-L' . BUILD_LIB_PATH . '" ' .
-                "LIBS='{$required_libs} -lstdc++' " .
                 './configure ' .
                 '--enable-static --disable-shared ' .
                 '--without-python ' .
@@ -41,9 +43,9 @@ protected function build(): void
                 '--with-libxml-prefix=' . escapeshellarg(BUILD_ROOT_PATH) . ' ' .
                 '--prefix='
             )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec('make install DESTDIR=' . escapeshellarg(BUILD_ROOT_PATH));
+            ->execWithEnv('make clean')
+            ->execWithEnv("make -j{$this->builder->concurrency}")
+            ->execWithEnv('make install DESTDIR=' . escapeshellarg(BUILD_ROOT_PATH));
         $this->patchPkgconfPrefix(['libexslt.pc']);
     }
 }

src/globals/test-extensions.php

@@ -21,15 +21,15 @@
 
 // test os (macos-13, macos-14, macos-15, ubuntu-latest, windows-latest are available)
 $test_os = [
-    // 'macos-13',
+    'macos-13',
     // 'macos-14',
-    // 'macos-15',
-    // 'ubuntu-latest',
-    // 'ubuntu-22.04',
+    'macos-15',
+    'ubuntu-latest',
+    'ubuntu-22.04',
     // 'ubuntu-24.04',
-    // 'ubuntu-22.04-arm',
-    // 'ubuntu-24.04-arm',
-    'windows-latest',
+    'ubuntu-22.04-arm',
+    'ubuntu-24.04-arm',
+    // 'windows-latest',
 ];
 
 // whether enable thread safe
@@ -45,7 +45,7 @@
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'pgsql',
+    'Linux', 'Darwin' => 'xsl,simplexml,xlswriter',
     'Windows' => 'xlswriter,openssl',
 };