From b6be20727d95b23ee2d4efb566893b876eac3fe4 Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Wed, 23 Jul 2025 09:46:32 +0700
Subject: [PATCH] fix a few accidental array_reverse calls, pkg-config --static
 instead of pkg-config --libs

---
 src/SPC/util/PkgConfigUtil.php | 17 +++++++++++------
 src/SPC/util/SPCConfigUtil.php | 13 +++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/SPC/util/PkgConfigUtil.php b/src/SPC/util/PkgConfigUtil.php
index 3f61582d..db2f4431 100644
--- a/src/SPC/util/PkgConfigUtil.php
+++ b/src/SPC/util/PkgConfigUtil.php
@@ -39,18 +39,23 @@ class PkgConfigUtil
         $libs = explode(' ', trim($result));
 
         // get other things
-        $result = self::execWithResult("pkg-config --static --libs --libs-only-other {$pkg_config_str}");
+        $result = self::execWithResult("pkg-config --static --libs-only-other {$pkg_config_str}");
         // convert libxxx.a to -L{path} -lxxx
         $exp = explode(' ', trim($result));
         foreach ($exp as $item) {
+            if (str_starts_with($item, '-L')) {
+                $libs[] = $item;
+                continue;
+            }
             // if item ends with .a, convert it to -lxxx
-            if (str_ends_with($item, '.a') && str_starts_with($item, 'lib') && $force_short_name) {
+            if (str_ends_with($item, '.a') && (str_starts_with($item, 'lib') || str_starts_with($item, BUILD_LIB_PATH))) {
                 $name = pathinfo($item, PATHINFO_BASENAME);
                 $name = substr($name, 3, -2); // remove 'lib' prefix and '.a' suffix
-                $libs[] = "-l{$name}";
-            } else {
-                // if item starts with -L, keep it as is
-                // if item starts with -l, keep it as is
+                $shortlib = "-l{$name}";
+                if (!in_array($shortlib, $libs)) {
+                    $libs[] = $shortlib;
+                }
+            } elseif (!in_array($item, $libs)) {
                 $libs[] = $item;
             }
         }
diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php
index bcac8287..4ce5253c 100644
--- a/src/SPC/util/SPCConfigUtil.php
+++ b/src/SPC/util/SPCConfigUtil.php
@@ -87,9 +87,10 @@ class SPCConfigUtil
             $libs .= " {$this->getFrameworksString($extensions)}";
         }
         if ($this->builder->hasCpp()) {
-            $libs .= $this->builder instanceof MacOSBuilder ? ' -lc++' : ' -lstdc++';
+            $libs .= SPCTarget::getTargetOS() === 'Darwin' ? ' -lc++' : ' -lstdc++';
         }
         if ($this->libs_only_deps) {
+            $libs = '-L' . BUILD_LIB_PATH . ' ' . $libs;
             return [
                 'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags),
                 'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags),
@@ -105,6 +106,7 @@ class SPCConfigUtil
         if (str_contains($libs, BUILD_LIB_PATH . '/mimalloc.o')) {
             $libs = BUILD_LIB_PATH . '/mimalloc.o ' . str_replace(BUILD_LIB_PATH . '/mimalloc.o', '', $libs);
         }
+        $libs = '-L' . BUILD_LIB_PATH . ' ' . $libs;
         return [
             'cflags' => trim(getenv('CFLAGS') . ' ' . $cflags),
             'ldflags' => trim(getenv('LDFLAGS') . ' ' . $ldflags),
@@ -138,8 +140,7 @@ class SPCConfigUtil
                 }
             }
             $pc_cflags = implode(' ', $pc);
-            if ($pc_cflags !== '') {
-                $pc_cflags = PkgConfigUtil::getCflags($pc_cflags);
+            if ($pc_cflags !== '' && ($pc_cflags = PkgConfigUtil::getCflags($pc_cflags)) !== '') {
                 $includes[] = $pc_cflags;
             }
         }
@@ -165,7 +166,7 @@ class SPCConfigUtil
                 if (!file_exists(BUILD_LIB_PATH . "/{$lib}")) {
                     throw new WrongUsageException("Library file '{$lib}' for lib [{$library}] does not exist in '" . BUILD_LIB_PATH . "'. Please build it first.");
                 }
-                $lib_names[] = $use_short_libs ? $this->getShortLibName($lib) : (BUILD_LIB_PATH . "/{$lib}");
+                $lib_names[] = $this->getShortLibName($lib);
             }
             // add frameworks for macOS
             if (SPCTarget::getTargetOS() === 'Darwin') {
@@ -180,13 +181,13 @@ class SPCConfigUtil
             }
             $pkg_configs = implode(' ', $pkg_configs);
             if ($pkg_configs !== '') {
-                $pc_libs = array_reverse(PkgConfigUtil::getLibsArray($pkg_configs, $use_short_libs));
+                $pc_libs = PkgConfigUtil::getLibsArray($pkg_configs);
                 $lib_names = [...$lib_names, ...$pc_libs];
             }
         }
 
         // post-process
-        $lib_names = array_reverse(array_unique($lib_names));
+        $lib_names = array_reverse(array_unique(array_reverse($lib_names)));
         $frameworks = array_unique($frameworks);
 
         // process frameworks to short_name