merge cmake changes from master into icurel

2026-07-07 16:55:38 +08:00 · 2025-06-09 14:38:45 +07:00
parent 53eb6dcc80 bed5b9d4ef
commit fa744bb802
66 changed files with 628 additions and 798 deletions
--- a/src/SPC/builder/linux/library/libpng.php
+++ b/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 ' .