Fix libuuid build source (#411)

* fix libuuid build source

* fix libuuid build source tests

.github/workflows/tests.yml

@@ -168,4 +168,4 @@ jobs:
             bin/spc download --for-extensions="$(php src/globals/test-extensions.php extensions)" --for-libs="$(php src/globals/test-extensions.php libs)" --with-php=${{ matrix.php }} --ignore-cache-sources=php-src --debug
 
       - name: "Run Build Tests (build)"
-        run: bin/spc build "$(php src/globals/test-extensions.php extensions)" $(php src/globals/test-extensions.php libs_cmd) --build-cli --build-micro --build-fpm --debug
+        run: bin/spc build "$(php src/globals/test-extensions.php extensions)" --with-libs="$(php src/globals/test-extensions.php libs)" --build-cli --build-micro --build-fpm --debug

config/ext.json

@@ -43,7 +43,10 @@
     },
     "dba": {
         "type": "builtin",
-        "arg-type-windows": "with"
+        "arg-type": "custom",
+        "lib-suggests": [
+            "qdbm"
+        ]
     },
     "dom": {
         "type": "builtin",

config/lib.json

@@ -353,6 +353,9 @@
         "source": "libuuid",
         "static-libs-unix": [
             "libuuid.a"
+        ],
+        "headers": [
+            "uuid/uuid.h"
         ]
     },
     "libuv": {
@@ -525,6 +528,18 @@
             "zstd"
         ]
     },
+    "qdbm": {
+        "source": "qdbm",
+        "static-libs-unix": [
+            "libqdbm.a"
+        ],
+        "static-libs-windows": [
+            "qdbm_a.lib"
+        ],
+        "headers-windows": [
+            "depot.h"
+        ]
+    },
     "readline": {
         "source": "readline",
         "static-libs-unix": [

config/source.json

@@ -385,7 +385,7 @@
     },
     "libuuid": {
         "type": "git",
-        "url": "https://github.com/cloudbase/libuuid.git",
+        "url": "https://github.com/static-php/libuuid.git",
         "rev": "master",
         "license": {
             "type": "file",
@@ -551,6 +551,15 @@
             "path": "LICENSE"
         }
     },
+    "qdbm": {
+        "type": "git",
+        "url": "https://github.com/static-php/qdbm.git",
+        "rev": "main",
+        "license": {
+            "type": "file",
+            "path": "COPYING"
+        }
+    },
     "rar": {
         "type": "git",
         "url": "https://github.com/static-php/php-rar.git",

src/SPC/builder/extension/dba.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\util\CustomExt;
+
+#[CustomExt('dba')]
+class dba extends Extension
+{
+    public function getUnixConfigureArg(): string
+    {
+        $qdbm = $this->builder->getLib('qdbm') ? (' --with-qdbm=' . BUILD_ROOT_PATH) : '';
+        return '--enable-dba' . $qdbm;
+    }
+
+    public function getWindowsConfigureArg(): string
+    {
+        $qdbm = $this->builder->getLib('qdbm') ? ' --with-qdbm' : '';
+        return '--with-dba' . $qdbm;
+    }
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class qdbm extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\qdbm;
+
+    public const NAME = 'qdbm';
+}

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

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class qdbm extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\qdbm;
+
+    public const NAME = 'qdbm';
+}

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

@@ -10,29 +10,37 @@ use SPC\store\FileSystem;
 
 trait libuuid
 {
-    public function patchBeforeBuild(): bool
-    {
-        FileSystem::replaceFileStr($this->source_dir . '/configure', '-${am__api_version}', '');
-        return true;
-    }
-
     /**
      * @throws FileSystemException
      * @throws RuntimeException
      */
     protected function build(): void
     {
-        shell()->cd($this->source_dir)
-            ->exec('chmod +x configure')
-            ->exec('chmod +x install-sh')
+        FileSystem::resetDir($this->source_dir . '/build');
+        shell()->cd($this->source_dir . '/build')
             ->exec(
-                './configure ' .
-                '--enable-static --disable-shared ' .
-                '--prefix='
+                'cmake ' .
+                "{$this->builder->makeCmakeArgs()} " .
+                '..'
             )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
-        $this->patchPkgconfPrefix(['uuid.pc']);
+            ->exec("cmake --build . -j {$this->builder->concurrency}");
+        copy($this->source_dir . '/build/libuuid.a', BUILD_LIB_PATH . '/libuuid.a');
+        FileSystem::createDir(BUILD_INCLUDE_PATH . '/uuid');
+        copy($this->source_dir . '/uuid.h', BUILD_INCLUDE_PATH . '/uuid/uuid.h');
+        $pc = FileSystem::readFile($this->source_dir . '/uuid.pc.in');
+        $pc = str_replace([
+            '@prefix@',
+            '@exec_prefix@',
+            '@libdir@',
+            '@includedir@',
+            '@LIBUUID_VERSION@',
+        ], [
+            BUILD_ROOT_PATH,
+            '${prefix}',
+            '${prefix}/lib',
+            '${prefix}/include',
+            '1.0.3',
+        ], $pc);
+        FileSystem::writeFile(BUILD_LIB_PATH . '/pkgconfig/uuid.pc', $pc);
     }
 }

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

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\unix\library;
+
+use SPC\builder\macos\library\MacOSLibraryBase;
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\store\FileSystem;
+
+trait qdbm
+{
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        shell()->cd($this->source_dir)
+            ->exec(
+                './configure ' .
+                '--enable-static --disable-shared ' .
+                '--prefix='
+            )
+            ->exec('make clean');
+        FileSystem::replaceFileRegex($this->source_dir . '/Makefile', '/MYLIBS = libqdbm.a.*/m', 'MYLIBS = libqdbm.a');
+        shell()->cd($this->source_dir)
+            ->exec("make -j{$this->builder->concurrency}" . ($this instanceof MacOSLibraryBase ? ' mac' : ''))
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        $this->patchPkgconfPrefix(['qdbm.pc']);
+    }
+}

src/SPC/builder/windows/WindowsBuilder.php

@@ -46,6 +46,9 @@ class WindowsBuilder extends BuilderBase
 
         // make cmake toolchain
         $this->cmake_toolchain_file = SystemUtil::makeCmakeToolchainFile();
+
+        f_mkdir(BUILD_INCLUDE_PATH, recursive: true);
+        f_mkdir(BUILD_LIB_PATH, recursive: true);
     }
 
     /**

src/SPC/builder/windows/library/qdbm.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\windows\library;
+
+use SPC\store\FileSystem;
+
+class qdbm extends WindowsLibraryBase
+{
+    public const NAME = 'qdbm';
+
+    protected function build(): void
+    {
+        cmd()->cd($this->source_dir)
+            ->execWithWrapper(
+                $this->builder->makeSimpleWrapper('nmake'),
+                '/f VCMakefile'
+            );
+        copy($this->source_dir . '\qdbm_a.lib', BUILD_LIB_PATH . '\qdbm_a.lib');
+        copy($this->source_dir . '\depot.h', BUILD_INCLUDE_PATH . '\depot.h');
+        // FileSystem::copyDir($this->source_dir . '\include\curl', BUILD_INCLUDE_PATH . '\curl');
+    }
+}

src/SPC/doctor/item/MacOSToolCheckList.php

@@ -37,10 +37,12 @@ class MacOSToolCheckList
     #[AsCheckItem('if homebrew has installed', limit_os: 'Darwin', level: 998)]
     public function checkBrew(): ?CheckResult
     {
-        // 检查 homebrew 是否已经安装
-        if ($this->findCommand('brew') === null) {
+        if (($path = $this->findCommand('brew')) === null) {
             return CheckResult::fail('Homebrew is not installed', 'brew');
         }
+        if ($path !== '/opt/homebrew/bin/brew' && php_uname('m') === 'arm64') {
+            return CheckResult::fail('Current homebrew (/usr/local/bin/homebrew) is not installed for M1 Mac, please re-install homebrew in /opt/homebrew/ !');
+        }
         return CheckResult::ok();
     }
 

src/globals/test-extensions.php

@@ -13,8 +13,8 @@ declare(strict_types=1);
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => 'yac',
-    'Windows' => 'mbstring,pdo_sqlite,mbregex,yac',
+    'Linux', 'Darwin' => 'uuid',
+    'Windows' => 'mbstring,pdo_sqlite,mbregex',
 };
 
 // If you want to test lib-suggests feature with extension, add them below (comma separated, example `libwebp,libavif`).
@@ -62,7 +62,6 @@ $final_libs = trim($with_libs, $trim_value);
 
 if (PHP_OS_FAMILY === 'Windows') {
     $final_extensions_cmd = '"' . $final_extensions . '"';
-    $final_libs = $final_libs === '' ? '' : ('"' . $final_libs . '"');
 } else {
     $final_extensions_cmd = $final_extensions;
 }

src/globals/tests/uuid.php

@@ -0,0 +1,6 @@
+<?php
+
+declare(strict_types=1);
+
+assert(function_exists('uuid_create'));
+assert(strlen(uuid_create(0)) === 36);