Merge pull request #830 from crazywhalecc/fix/pack-location-independent

crazywhalecc · web-flow · commit c715f20fe35d · 2025-07-23T12:38:29.000+08:00
Patch pkg-config and la files with placeholder when packing pre-built content
diff --git a/src/SPC/builder/LibraryBase.php b/src/SPC/builder/LibraryBase.php
@@ -350,7 +350,27 @@ abstract protected function build();
 
     protected function install(): void
     {
-        // do something after extracting pre-built files, default do nothing. overwrite this method to do something
+        // replace placeholders if BUILD_ROOT_PATH/.spc-extract-placeholder.json exists
+        $placeholder_file = BUILD_ROOT_PATH . '/.spc-extract-placeholder.json';
+        if (!file_exists($placeholder_file)) {
+            return;
+        }
+        $placeholder = json_decode(file_get_contents($placeholder_file), true);
+        if (!is_array($placeholder)) {
+            throw new RuntimeException('Invalid placeholder file: ' . $placeholder_file);
+        }
+        $placeholder = get_pack_placehoder();
+        // replace placeholders in BUILD_ROOT_PATH
+        foreach ($placeholder as $item) {
+            $filepath = BUILD_ROOT_PATH . "/{$item}";
+            FileSystem::replaceFileStr(
+                $filepath,
+                array_values($placeholder),
+                array_keys($placeholder),
+            );
+        }
+        // remove placeholder file
+        unlink($placeholder_file);
     }
 
     /**
diff --git a/src/SPC/builder/linux/library/openssl.php b/src/SPC/builder/linux/library/openssl.php
@@ -67,26 +67,26 @@ public function build(): void
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
                 "{$env} ./Configure no-shared {$extra} " .
-                '--prefix=/ ' .
-                '--libdir=lib ' .
+                '--prefix=' . BUILD_ROOT_PATH . ' ' .
+                '--libdir=' . BUILD_LIB_PATH . ' ' .
                 '--openssldir=/etc/ssl ' .
                 "{$zlib_extra}" .
                 'no-legacy ' .
                 "linux-{$arch}{$clang_postfix}"
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
-            ->exec("make install_sw DESTDIR={$destdir}");
+            ->exec('make install_sw');
         $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
         // patch for openssl 3.3.0+
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
diff --git a/src/SPC/builder/macos/library/openssl.php b/src/SPC/builder/macos/library/openssl.php
@@ -37,8 +37,6 @@ class openssl extends MacOSLibraryBase
      */
     protected function build(): void
     {
-        [$lib,,$destdir] = SEPARATED_PATH;
-
         // lib:zlib
         $extra = '';
         $ex_lib = '';
@@ -52,24 +50,24 @@ protected function build(): void
         shell()->cd($this->source_dir)->initializeEnv($this)
             ->exec(
                 "./Configure no-shared {$extra} " .
-                '--prefix=/ ' . // use prefix=/
-                "--libdir={$lib} " .
+                '--prefix=' . BUILD_ROOT_PATH . ' ' . // use prefix=/
+                '--libdir=lib ' .
                 '--openssldir=/etc/ssl ' .
                 "darwin64-{$arch}-cc"
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")
-            ->exec("make install_sw DESTDIR={$destdir}");
+            ->exec('make install_sw');
         $this->patchPkgconfPrefix(['libssl.pc', 'openssl.pc', 'libcrypto.pc']);
         // patch for openssl 3.3.0+
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/openssl.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         if (!str_contains($file = FileSystem::readFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc'), 'prefix=')) {
-            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=${pcfiledir}/../..' . "\n" . $file);
+            FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', 'prefix=' . BUILD_ROOT_PATH . "\n" . $file);
         }
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/pkgconfig/libcrypto.pc', '/Libs.private:.*/m', 'Libs.private: ${libdir}/libz.a');
         FileSystem::replaceFileRegex(BUILD_LIB_PATH . '/cmake/OpenSSL/OpenSSLConfig.cmake', '/set\(OPENSSL_LIBCRYPTO_DEPENDENCIES .*\)/m', 'set(OPENSSL_LIBCRYPTO_DEPENDENCIES "${OPENSSL_LIBRARY_DIR}/libz.a")');
diff --git a/src/SPC/builder/traits/UnixLibraryTrait.php b/src/SPC/builder/traits/UnixLibraryTrait.php
@@ -75,7 +75,7 @@ public function patchPkgconfPrefix(array $files, int $patch_option = PKGCONF_PAT
             logger()->debug('Patching ' . $realpath);
             // replace prefix
             $file = FileSystem::readFile($realpath);
-            $file = ($patch_option & PKGCONF_PATCH_PREFIX) === PKGCONF_PATCH_PREFIX ? preg_replace('/^prefix\s*=.*$/m', 'prefix=${pcfiledir}/../..', $file) : $file;
+            $file = ($patch_option & PKGCONF_PATCH_PREFIX) === PKGCONF_PATCH_PREFIX ? preg_replace('/^prefix\s*=.*$/m', 'prefix=' . BUILD_ROOT_PATH, $file) : $file;
             $file = ($patch_option & PKGCONF_PATCH_EXEC_PREFIX) === PKGCONF_PATCH_EXEC_PREFIX ? preg_replace('/^exec_prefix\s*=.*$/m', 'exec_prefix=${prefix}', $file) : $file;
             $file = ($patch_option & PKGCONF_PATCH_LIBDIR) === PKGCONF_PATCH_LIBDIR ? preg_replace('/^libdir\s*=.*$/m', 'libdir=${prefix}/lib', $file) : $file;
             $file = ($patch_option & PKGCONF_PATCH_INCLUDEDIR) === PKGCONF_PATCH_INCLUDEDIR ? preg_replace('/^includedir\s*=.*$/m', 'includedir=${prefix}/include', $file) : $file;
diff --git a/src/SPC/builder/unix/library/icu.php b/src/SPC/builder/unix/library/icu.php
@@ -17,6 +17,7 @@ public function beforePack(): void
 
     protected function install(): void
     {
+        parent::install();
         $icu_config = BUILD_ROOT_PATH . '/bin/icu-config';
         FileSystem::replaceFileStr($icu_config, '{BUILD_ROOT_PATH}', BUILD_ROOT_PATH);
     }
diff --git a/src/SPC/builder/unix/library/libevent.php b/src/SPC/builder/unix/library/libevent.php
@@ -68,6 +68,7 @@ protected function build(): void
 
     protected function install(): void
     {
+        parent::install();
         FileSystem::replaceFileStr(
             BUILD_LIB_PATH . '/cmake/libevent/LibeventTargets-static.cmake',
             '{BUILD_ROOT_PATH}',
diff --git a/src/SPC/command/dev/PackLibCommand.php b/src/SPC/command/dev/PackLibCommand.php
@@ -51,6 +51,10 @@ public function handle(): int
                 }
             }
 
+            $origin_files = [];
+            // get pack placehoder defines
+            $placehoder = get_pack_placehoder();
+
             foreach ($builder->getLibs() as $lib) {
                 if ($lib->getName() !== $lib_name) {
                     // other dependencies: install or build, both ok
@@ -73,6 +77,27 @@ public function handle(): int
                     // After build: load buildroot/ directory, and calculate increase files
                     $after_buildroot = FileSystem::scanDirFiles(BUILD_ROOT_PATH, relative: true);
                     $increase_files = array_diff($after_buildroot, $before_buildroot);
+
+                    // patch pkg-config and la files with absolute path
+                    foreach ($increase_files as $file) {
+                        if (str_ends_with($file, '.pc') || str_ends_with($file, '.la')) {
+                            $content = FileSystem::readFile(BUILD_ROOT_PATH . '/' . $file);
+                            $origin_files[$file] = $content;
+                            // replace relative paths with absolute paths
+                            $content = str_replace(
+                                array_keys($placehoder),
+                                array_values($placehoder),
+                                $content
+                            );
+                            FileSystem::writeFile(BUILD_ROOT_PATH . '/' . $file, $content);
+                        }
+                    }
+
+                    // add .spc-extract-placeholder.json in BUILD_ROOT_PATH
+                    $placeholder_file = BUILD_ROOT_PATH . '/.spc-extract-placeholder.json';
+                    file_put_contents($placeholder_file, json_encode(array_keys($origin_files), JSON_PRETTY_PRINT));
+                    $increase_files[] = '.spc-extract-placeholder.json';
+
                     // every file mapped with BUILD_ROOT_PATH
                     // get BUILD_ROOT_PATH last dir part
                     $buildroot_part = basename(BUILD_ROOT_PATH);
@@ -94,6 +119,16 @@ public function handle(): int
                     $filename = WORKING_DIR . '/dist/' . $filename;
                     f_passthru("tar {$tar_option} {$filename} -T " . WORKING_DIR . '/packlib_files.txt');
                     logger()->info('Pack library ' . $lib->getName() . ' to ' . $filename . ' complete.');
+
+                    // remove temp files
+                    unlink($placeholder_file);
+                }
+            }
+
+            foreach ($origin_files as $file => $content) {
+                // restore original files
+                if (file_exists(BUILD_ROOT_PATH . '/' . $file)) {
+                    FileSystem::writeFile(BUILD_ROOT_PATH . '/' . $file, $content);
                 }
             }
 
diff --git a/src/globals/functions.php b/src/globals/functions.php
@@ -232,3 +232,13 @@ function ac_with_args(string $arg_name, bool $use_value = false): array
 {
     return $use_value ? ["--with-{$arg_name}=yes", "--with-{$arg_name}=no"] : ["--with-{$arg_name}", "--without-{$arg_name}"];
 }
+
+function get_pack_placehoder(): array
+{
+    return [
+        BUILD_LIB_PATH => '@build_lib_path@',
+        BUILD_BIN_PATH => '@build_bin_path@',
+        BUILD_INCLUDE_PATH => '@build_include_path@',
+        BUILD_ROOT_PATH => '@build_root_path@',
+    ];
+}

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public function beforePack(): void`
`17`	`17`
`18`	`18`	`protected function install(): void`
`19`	`19`	`{`
	`20`	`+ parent::install();`
`20`	`21`	`$icu_config = BUILD_ROOT_PATH . '/bin/icu-config';`
`21`	`22`	`FileSystem::replaceFileStr($icu_config, '{BUILD_ROOT_PATH}', BUILD_ROOT_PATH);`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ protected function build(): void`
`68`	`68`
`69`	`69`	`protected function install(): void`
`70`	`70`	`{`
	`71`	`+ parent::install();`
`71`	`72`	`FileSystem::replaceFileStr(`
`72`	`73`	`BUILD_LIB_PATH . '/cmake/libevent/LibeventTargets-static.cmake',`
`73`	`74`	`'{BUILD_ROOT_PATH}',`
Original file line number	Diff line number	Diff line change
`@@ -232,3 +232,13 @@ function ac_with_args(string $arg_name, bool $use_value = false): array`
`232`	`232`	`{`
`233`	`233`	`return $use_value ? ["--with-{$arg_name}=yes", "--with-{$arg_name}=no"] : ["--with-{$arg_name}", "--without-{$arg_name}"];`
`234`	`234`	`}`
	`235`	`+`
	`236`	`+function get_pack_placehoder(): array`
	`237`	`+{`
	`238`	`+ return [`
	`239`	`+ BUILD_LIB_PATH => '@build_lib_path@',`
	`240`	`+ BUILD_BIN_PATH => '@build_bin_path@',`
	`241`	`+ BUILD_INCLUDE_PATH => '@build_include_path@',`
	`242`	`+ BUILD_ROOT_PATH => '@build_root_path@',`
	`243`	`+ ];`
	`244`	`+}`