Make mongodb standalone

Register two iliaal/fastchart and iliaal/fastjson PHP extensions
sourced from ghtar, extracted into php-src/ext/{fastchart,fastjson}.
Both target Linux and Darwin. fastchart depends on freetype and
suggests libpng, libjpeg, libwebp.

config/pkg/ext/ext-fastchart.yml

@@ -0,0 +1,20 @@
+ext-fastchart:
+  type: php-extension
+  artifact:
+    source:
+      type: ghtar
+      repo: iliaal/fastchart
+      extract: php-src/ext/fastchart
+      prefer-stable: true
+    metadata:
+      license-files: [LICENSE]
+  depends:
+    - freetype
+  suggests:
+    - libpng
+    - libjpeg
+    - libwebp
+  php-extension:
+    os:
+      - Linux
+      - Darwin

config/pkg/ext/ext-fastjson.yml

@@ -0,0 +1,14 @@
+ext-fastjson:
+  type: php-extension
+  artifact:
+    source:
+      type: ghtar
+      repo: iliaal/fastjson
+      extract: php-src/ext/fastjson
+      prefer-stable: true
+    metadata:
+      license-files: [LICENSE]
+  php-extension:
+    os:
+      - Linux
+      - Darwin

src/Package/Artifact/go_win.php

@@ -15,28 +15,13 @@ use StaticPHP\Util\GlobalEnvManager;
 
 class go_win
 {
-    /** GOROOT for the Windows Go toolchain. */
-    public static function path(): string
-    {
-        return PKG_ROOT_PATH . '/go-win';
-    }
-
-    /** Path to a binary inside go-win's bin/ (go.exe, gofmt.exe, …). */
-    public static function binary(string $name = 'go.exe'): string
-    {
-        return self::path() . '/bin/' . $name;
-    }
-
-    public static function isInstalled(): bool
-    {
-        return is_file(self::binary());
-    }
-
     #[CustomBinary('go-win', [
         'windows-x86_64',
     ])]
     public function downBinary(ArtifactDownloader $downloader): DownloadResult
     {
+        $pkgroot = PKG_ROOT_PATH;
+
         // get version
         [$version] = explode("\n", default_shell()->executeCurl('https://go.dev/VERSION?m=text', retries: $downloader->getRetry()) ?: '');
         if ($version === '') {
@@ -67,7 +52,7 @@ class go_win
             throw new DownloaderException("Hash mismatch for downloaded go-win binary. Expected {$hash}, got {$file_hash}");
         }
 
-        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: '{pkg_root_path}/go-win', verified: true, version: $version);
+        return DownloadResult::archive(basename($path), ['url' => $url, 'version' => $version], extract: "{$pkgroot}/go-win", verified: true, version: $version);
     }
 
     #[CustomBinaryCheckUpdate('go-win', ['windows-x86_64'])]

src/Package/Artifact/go_xcaddy.php

@@ -17,23 +17,6 @@ use StaticPHP\Util\System\LinuxUtil;
 
 class go_xcaddy
 {
-    /** GOROOT for the bundled Go toolchain used to build xcaddy. */
-    public static function path(): string
-    {
-        return PKG_ROOT_PATH . '/go-xcaddy';
-    }
-
-    /** Path to a binary inside go-xcaddy's bin/ (xcaddy, go, …). */
-    public static function binary(string $name = 'xcaddy'): string
-    {
-        return self::path() . '/bin/' . $name;
-    }
-
-    public static function isInstalled(): bool
-    {
-        return is_file(self::binary());
-    }
-
     #[CustomBinary('go-xcaddy', [
         'linux-x86_64',
         'linux-aarch64',

src/Package/Artifact/rust.php

@@ -16,23 +16,6 @@ use StaticPHP\Util\System\LinuxUtil;
 
 class rust
 {
-    /** Install prefix the rust tarball's install.sh writes into. */
-    public static function path(): string
-    {
-        return PKG_ROOT_PATH . '/rust';
-    }
-
-    /** Path to a binary inside the rust install dir (cargo, rustc, rustup, …). */
-    public static function binary(string $name = 'cargo'): string
-    {
-        return self::path() . '/bin/' . $name;
-    }
-
-    public static function isInstalled(): bool
-    {
-        return is_file(self::binary());
-    }
-
     #[CustomBinary('rust', [
         'linux-x86_64',
         'linux-aarch64',
@@ -63,7 +46,7 @@ class rust
         $download_url = "https://static.rust-lang.org/dist/rust-{$latest_version}-{$arch}-unknown-linux-{$distro}.tar.xz";
         $path = DOWNLOAD_PATH . DIRECTORY_SEPARATOR . basename($download_url);
         default_shell()->executeCurlDownload($download_url, $path, retries: $downloader->getRetry());
-        return DownloadResult::archive(basename($path), ['url' => $download_url, 'version' => $latest_version], extract: '{pkg_root_path}/rust-install', verified: false, version: $latest_version);
+        return DownloadResult::archive(basename($path), ['url' => $download_url, 'version' => $latest_version], extract: PKG_ROOT_PATH . '/rust-install', verified: false, version: $latest_version);
     }
 
     #[CustomBinaryCheckUpdate('rust', [

src/Package/Artifact/zig.php

@@ -15,23 +15,6 @@ use StaticPHP\Runtime\SystemTarget;
 
 class zig
 {
-    /** Directory zig extracts into. */
-    public static function path(): string
-    {
-        return PKG_ROOT_PATH . '/zig';
-    }
-
-    /** Path to a binary inside the zig install dir (zig, zig-cc, zig-c++, zig-ar, …). */
-    public static function binary(string $name = 'zig'): string
-    {
-        return self::path() . '/' . $name;
-    }
-
-    public static function isInstalled(): bool
-    {
-        return is_file(self::binary());
-    }
-
     #[CustomBinary('zig', [
         'linux-x86_64',
         'linux-aarch64',

src/Package/Extension/xlswriter.php

@@ -11,6 +11,7 @@ use StaticPHP\Attribute\Package\Extension;
 use StaticPHP\Attribute\PatchDescription;
 use StaticPHP\Package\PackageInstaller;
 use StaticPHP\Package\PhpExtensionPackage;
+use StaticPHP\Util\GlobalEnvManager;
 use StaticPHP\Util\SourcePatcher;
 
 #[Extension('xlswriter')]
@@ -20,14 +21,20 @@ class xlswriter extends PhpExtensionPackage
     #[CustomPhpConfigureArg('Linux')]
     public function getUnixConfigureArg(bool $shared, PackageInstaller $installer): string
     {
-        $shared = $shared ? '=shared' : '';
-        $arg = "--with-xlswriter{$shared} --enable-reader";
+        $arg = '--with-xlswriter --enable-reader';
         if ($installer->getLibraryPackage('openssl')) {
             $arg .= ' --with-openssl=' . $installer->getLibraryPackage('openssl')->getBuildRootPath();
         }
         return $arg;
     }
 
+    #[BeforeStage('php', [php::class, 'makeForUnix'], 'ext-xlswriter')]
+    #[PatchDescription('Fix Unix build: add -std=gnu17 to CFLAGS to fix build errors on older GCC versions')]
+    public function patchBeforeUnixMake(): void
+    {
+        GlobalEnvManager::putenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS=' . getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS') . ' -std=gnu17');
+    }
+
     #[BeforeStage('php', [php::class, 'makeForWindows'], 'ext-xlswriter')]
     #[PatchDescription('Fix Windows build: apply win32 patch and add UTF-8 BOM to theme.c')]
     public function patchBeforeMakeForWindows(): void
@@ -40,4 +47,11 @@ class xlswriter extends PhpExtensionPackage
             file_put_contents($this->getSourceDir() . '/library/libxlsxwriter/src/theme.c', $bom . $content);
         }
     }
+
+    public function getSharedExtensionEnv(): array
+    {
+        $parent = parent::getSharedExtensionEnv();
+        $parent['CFLAGS'] .= ' -std=gnu17';
+        return $parent;
+    }
 }

src/Package/Library/imagemagick.php

@@ -42,9 +42,6 @@ class imagemagick
             ->addConfigureArgs(
                 '--disable-openmp',
                 '--without-x',
-                // implicit --with-gcc-arch
-                // bleeds host cpu features into built binaries
-                '--without-gcc-arch',
             );
 
         // special: linux-static target needs `-static`

src/Package/Library/watcher.php

@@ -20,8 +20,9 @@ class watcher extends LibraryPackage
         if (stripos($cflags, '-fpic') === false) {
             $cflags .= ' -fPIC';
         }
+        $ldflags = $this->getLibExtraLdFlags() ? ' ' . $this->getLibExtraLdFlags() : '';
         shell()->cd("{$this->getSourceDir()}/watcher-c")
-            ->exec(getenv('CXX') . " -c -o libwatcher-c.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra {$cflags}")
+            ->exec(getenv('CXX') . " -c -o libwatcher-c.o ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -Wall -Wextra {$cflags}{$ldflags}")
             ->exec(getenv('AR') . ' rcs libwatcher-c.a libwatcher-c.o');
 
         copy("{$this->getSourceDir()}/watcher-c/libwatcher-c.a", "{$this->getLibDir()}/libwatcher-c.a");

src/StaticPHP/Command/Dev/GenExtTestMatrixCommand.php

@@ -60,6 +60,7 @@ class GenExtTestMatrixCommand extends BaseCommand
         'glfw',
         'imagick',
         'intl',
+        'mongodb',
     ];
 
     /**

src/StaticPHP/Doctor/Item/LinuxMuslCheck.php

@@ -73,20 +73,13 @@ class LinuxMuslCheck
             $prefix = 'sudo ';
             logger()->warning('Current user is not root, using sudo for running command');
         }
-        $sysEnv = ['CC' => 'gcc', 'CXX' => 'g++', 'AR' => 'ar', 'LD' => 'ld', 'RANLIB' => 'ranlib'];
-        $envFlags = '';
-        foreach ($sysEnv as $k => $v) {
-            $envFlags .= "{$k}={$v} ";
-        }
-        $envFlags = rtrim($envFlags);
         $shell = shell()->cd(SOURCE_PATH . '/musl-wrapper')
-            ->setEnv($sysEnv)
-            ->exec('./configure --disable-gcc-wrapper')
-            ->exec('make -j');
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld ./configure --disable-gcc-wrapper')
+            ->exec('CC=gcc CXX=g++ AR=ar LD=ld make -j');
         if ($prefix !== '') {
-            f_passthru('cd ' . SOURCE_PATH . "/musl-wrapper && {$envFlags} {$prefix}make install");
+            f_passthru('cd ' . SOURCE_PATH . "/musl-wrapper && CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
         } else {
-            $shell->exec("{$prefix}make install");
+            $shell->exec("CC=gcc CXX=g++ AR=ar LD=ld {$prefix}make install");
         }
         return true;
     }

src/globals/functions.php

@@ -256,30 +256,10 @@ function clean_spaces(string $string): string
  */
 function deduplicate_flags(string $flags): string
 {
-    // Flags that take their value as a separate token.
-    static $paired = [
-        '-Xclang', '-Xpreprocessor', '-Xlinker', '-Xassembler',
-        '-framework', '-arch', '-target',
-        '-include', '-imacros', '-isystem', '-isysroot', '-iquote', '-idirafter',
-        '-MT', '-MF', '-MQ',
-    ];
-
-    $tokens = preg_split('/\s+/', trim($flags)) ?: [];
-
-    // Group paired flag+value into a single atom before dedup.
-    $atoms = [];
-    $n = count($tokens);
-    for ($i = 0; $i < $n; ++$i) {
-        if (in_array($tokens[$i], $paired, true) && $i + 1 < $n) {
-            $atoms[] = $tokens[$i] . ' ' . $tokens[$i + 1];
-            ++$i;
-        } else {
-            $atoms[] = $tokens[$i];
-        }
-    }
+    $tokens = preg_split('/\s+/', trim($flags));
 
     // Reverse, unique, reverse back - keeps last occurrence of duplicates
-    $deduplicated = array_reverse(array_unique(array_reverse($atoms)));
+    $deduplicated = array_reverse(array_unique(array_reverse($tokens)));
 
     return implode(' ', $deduplicated);
 }