Use existing pkg-config builds and pre-built contents for packages

Author: crazywhalecc

config/lib.json

@@ -19,6 +19,13 @@
             "watcher"
         ]
     },
+    "pkg-config": {
+        "type": "package",
+        "source": "pkg-config",
+        "bin-unix": [
+            "pkg-config"
+        ]
+    },
     "micro": {
         "type": "target",
         "source": "micro"

config/pkg.json

@@ -71,15 +71,35 @@
         "type": "custom"
     },
     "pkg-config-x86_64-linux": {
-        "type": "custom"
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
     },
     "pkg-config-aarch64-linux": {
-        "type": "custom"
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-linux-musl-1.2.5.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
     },
     "pkg-config-x86_64-macos": {
-        "type": "custom"
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-x86_64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
     },
     "pkg-config-aarch64-macos": {
-        "type": "custom"
+        "type": "ghrel",
+        "repo": "static-php/static-php-cli-hosted",
+        "match": "pkg-config-aarch64-darwin.txz",
+        "extract-files": {
+            "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+        }
     }
 }

config/source.json

@@ -7,6 +7,15 @@
         },
         "alt": false
     },
+    "pkg-config": {
+        "type": "url",
+        "url": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "amqp": {
         "type": "url",
         "url": "https://pecl.php.net/get/amqp",

src/SPC/builder/freebsd/BSDBuilder.php

@@ -7,7 +7,6 @@
 use SPC\builder\unix\UnixBuilderBase;
 use SPC\exception\WrongUsageException;
 use SPC\store\FileSystem;
-use SPC\store\pkg\PkgConfig;
 use SPC\store\SourcePatcher;
 
 class BSDBuilder extends UnixBuilderBase
@@ -26,10 +25,6 @@ public function __construct(array $options = [])
         f_putenv('CXX=' . $this->getOption('cxx', 'clang++'));
         // set PATH
         f_putenv('PATH=' . BUILD_ROOT_PATH . '/bin:' . getenv('PATH'));
-        // set PKG_CONFIG
-        f_putenv('PKG_CONFIG=' . PkgConfig::getEnvironment()['PATH'] . '/bin/pkg-config');
-        // set PKG_CONFIG_PATH
-        f_putenv('PKG_CONFIG_PATH=' . BUILD_LIB_PATH . '/pkgconfig/');
 
         // set arch (default: current)
         $this->setOptionIfNotExist('arch', php_uname('m'));

src/SPC/builder/freebsd/library/pkgconfig.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\freebsd\library;
+
+/**
+ * gmp is a template library class for unix
+ */
+class pkgconfig extends BSDLibraryBase
+{
+    use \SPC\builder\unix\library\pkgconfig;
+
+    public const NAME = 'pkg-config';
+}

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

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+/**
+ * gmp is a template library class for unix
+ */
+class pkgconfig extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\pkgconfig;
+
+    public const NAME = 'pkg-config';
+}

src/SPC/builder/macos/library/pkgconfig.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+/**
+ * gmp is a template library class for unix
+ */
+class pkgconfig extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\pkgconfig;
+
+    public const NAME = 'pkg-config';
+}

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

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\util\executor\UnixAutoconfExecutor;
+use SPC\util\SPCTarget;
+
+trait pkgconfig
+{
+    protected function build(): void
+    {
+        UnixAutoconfExecutor::create($this)
+            ->appendEnv([
+                'CFLAGS' => '-Wimplicit-function-declaration -Wno-int-conversion',
+                'LDFLAGS' => SPCTarget::isStatic() ? '--static' : '',
+            ])
+            ->configure(
+                '--with-internal-glib',
+                '--disable-host-tool',
+                '--without-sysroot',
+                '--without-system-include-path',
+                '--without-system-library-path',
+                '--without-pc-path',
+            )
+            ->make(with_install: 'install-exec');
+
+        shell()->exec('strip ' . BUILD_ROOT_PATH . '/bin/pkg-config');
+    }
+}

src/SPC/doctor/item/PkgConfigCheck.php

@@ -9,7 +9,7 @@
 use SPC\doctor\CheckResult;
 use SPC\doctor\OptionalCheck;
 use SPC\store\PackageManager;
-use SPC\store\pkg\PkgConfig;
+use SPC\util\PkgConfigUtil;
 
 #[OptionalCheck([self::class, 'optionalCheck'])]
 class PkgConfigCheck
@@ -20,26 +20,19 @@ public static function optionalCheck(): bool
     }
 
     /** @noinspection PhpUnused */
-    #[AsCheckItem('if pkg-config is installed', level: 800)]
+    #[AsCheckItem('if pkg-config is installed or built', level: 800)]
     public function checkPkgConfig(): CheckResult
     {
-        if (PkgConfig::isInstalled()) {
-            return CheckResult::ok();
+        if (!($pkgconf = PkgConfigUtil::findPkgConfig())) {
+            return CheckResult::fail('pkg-config is not installed', 'install-pkgconfig');
         }
-        return CheckResult::fail('pkg-config is not installed', 'install-pkgconfig');
+        return CheckResult::ok($pkgconf);
     }
 
     #[AsFixItem('install-pkgconfig')]
     public function installPkgConfig(): bool
     {
-        $arch = arch2gnu(php_uname('m'));
-        $os = match (PHP_OS_FAMILY) {
-            'Windows' => 'win',
-            'Darwin' => 'macos',
-            'BSD' => 'freebsd',
-            default => 'linux',
-        };
-        PackageManager::installPackage("pkg-config-{$arch}-{$os}");
-        return PkgConfig::isInstalled();
+        PackageManager::installPackage('pkg-config');
+        return true;
     }
 }