Merge branch 'main' into libargon2-support

# Conflicts:
#	config/lib.json
#	config/source.json

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

@@ -8,6 +8,8 @@ use SPC\builder\BuilderBase;
 use SPC\builder\LibraryBase;
 use SPC\builder\macos\MacOSBuilder;
 use SPC\builder\traits\UnixLibraryTrait;
+use SPC\exception\FileSystemException;
+use SPC\exception\WrongUsageException;
 use SPC\store\Config;
 
 abstract class MacOSLibraryBase extends LibraryBase
@@ -27,7 +29,8 @@ abstract class MacOSLibraryBase extends LibraryBase
     }
 
     /**
-     * 获取当前 lib 库依赖的 macOS framework
+     * @throws WrongUsageException
+     * @throws FileSystemException
      */
     public function getFrameworks(): array
     {

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

@@ -20,19 +20,35 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
-use SPC\store\SourcePatcher;
+use SPC\exception\FileSystemException;
+use SPC\store\FileSystem;
 
 class curl extends MacOSLibraryBase
 {
-    use \SPC\builder\unix\library\curl {
-        build as unixBuild;
-    }
+    use \SPC\builder\unix\library\curl;
 
     public const NAME = 'curl';
 
-    protected function build()
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeBuild(): bool
     {
-        SourcePatcher::patchCurlMacOS();
-        $this->unixBuild();
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/curl/CMakeLists.txt',
+            '/NOT COREFOUNDATION_FRAMEWORK/m',
+            'FALSE'
+        );
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/curl/CMakeLists.txt',
+            '/NOT SYSTEMCONFIGURATION_FRAMEWORK/m',
+            'FALSE'
+        );
+        FileSystem::replaceFileRegex(
+            SOURCE_PATH . '/curl/CMakeLists.txt',
+            '/NOT CORESERVICES_FRAMEWORK/m',
+            'FALSE'
+        );
+        return true;
     }
 }

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

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
+class glfw extends MacOSLibraryBase
+{
+    public const NAME = 'glfw';
+
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
+    {
+        // compile！
+        shell()->cd(SOURCE_PATH . '/ext-glfw/vendor/glfw')
+            ->exec("cmake . {$this->builder->makeCmakeArgs()} -DBUILD_SHARED_LIBS=OFF -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF")
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
+        // patch pkgconf
+        $this->patchPkgconfPrefix(['glfw3.pc']);
+    }
+}

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

@@ -8,11 +8,11 @@ class icu extends MacOSLibraryBase
 {
     public const NAME = 'icu';
 
-    protected function build()
+    protected function build(): void
     {
         $root = BUILD_ROOT_PATH;
         shell()->cd($this->source_dir . '/source')
-            ->exec("{$this->builder->configure_env} ./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
+            ->exec("./runConfigureICU MacOSX --enable-static --disable-shared --prefix={$root}")
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency}")
             ->exec('make install');

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

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

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

@@ -1,39 +1,30 @@
 <?php
-/**
- * Copyright (c) 2022 Yun Dou <dixyes@gmail.com>
- *
- * lwmbs is licensed under Mulan PSL v2. You can use this
- * software according to the terms and conditions of the
- * Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at:
- *
- * http://license.coscl.org.cn/MulanPSL2
- *
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
- * WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- *
- * See the Mulan PSL v2 for more details.
- */
 
 declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
 class libffi extends MacOSLibraryBase
 {
     public const NAME = 'libffi';
 
-    protected function build()
+    /**
+     * @throws RuntimeException
+     * @throws FileSystemException
+     */
+    protected function build(): void
     {
-        [$lib, , $destdir] = SEPARATED_PATH;
+        [, , $destdir] = SEPARATED_PATH;
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
-                "--host={$this->builder->arch}-apple-darwin " .
-                "--target={$this->builder->arch}-apple-darwin " .
+                "--host={$this->builder->getOption('arch')}-apple-darwin " .
+                "--target={$this->builder->getOption('arch')}-apple-darwin " .
                 '--prefix= ' // use prefix=/
             )
             ->exec('make clean')

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

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+/**
+ * gmp is a template library class for unix
+ */
+class libmemcached extends MacOSLibraryBase
+{
+    public const NAME = 'libmemcached';
+
+    public function build(): void
+    {
+        $rootdir = BUILD_ROOT_PATH;
+
+        shell()->cd($this->source_dir)
+            ->exec('chmod +x configure')
+            ->exec(
+                './configure ' .
+                '--enable-static --disable-shared ' .
+                '--disable-sasl ' .
+                "--prefix={$rootdir}"
+            )
+            ->exec('make clean')
+            ->exec('sed -ie "s/-Werror//g" ' . $this->source_dir . '/Makefile')
+            ->exec("make -j{$this->builder->concurrency}")
+            ->exec('make install');
+    }
+}

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

@@ -22,6 +22,7 @@ namespace SPC\builder\macos\library;
 
 use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
 
 class libpng extends MacOSLibraryBase
 {
@@ -30,19 +31,21 @@ class libpng extends MacOSLibraryBase
     /**
      * @throws FileSystemException
      * @throws RuntimeException
+     * @throws WrongUsageException
      */
-    protected function build()
+    protected function build(): void
     {
-        $optimizations = match ($this->builder->arch) {
+        $optimizations = match ($this->builder->getOption('arch')) {
             'x86_64' => '--enable-intel-sse ',
             'arm64' => '--enable-arm-neon ',
             default => '',
         };
         shell()->cd($this->source_dir)
             ->exec('chmod +x ./configure')
+            ->exec('chmod +x ./install-sh')
             ->exec(
-                "{$this->builder->configure_env} ./configure " .
-                "--host={$this->builder->gnu_arch}-apple-darwin " .
+                './configure ' .
+                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
                 '--disable-shared ' .
                 '--enable-static ' .
                 '--enable-hardware-optimizations ' .

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

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\exception\FileSystemException;
 use SPC\exception\RuntimeException;
 use SPC\store\FileSystem;
 
@@ -13,21 +14,20 @@ class libxml2 extends MacOSLibraryBase
 
     /**
      * @throws RuntimeException
+     * @throws FileSystemException
      */
-    protected function build()
+    protected function build(): void
     {
         $enable_zlib = $this->builder->getLib('zlib') ? 'ON' : 'OFF';
         $enable_icu = $this->builder->getLib('icu') ? 'ON' : 'OFF';
         $enable_xz = $this->builder->getLib('xz') ? 'ON' : 'OFF';
 
-        [$lib, $include, $destdir] = SEPARATED_PATH;
-
         FileSystem::resetDir($this->source_dir . '/build');
         shell()->cd($this->source_dir . '/build')
             ->exec(
-                "{$this->builder->configure_env} " . ' cmake ' .
+                'cmake ' .
                 // '--debug-find ' .
-                '-DCMAKE_BUILD_TYPE=Release ' .
+                "{$this->builder->makeCmakeArgs()} " .
                 '-DBUILD_SHARED_LIBS=OFF ' .
                 '-DLIBXML2_WITH_ICONV=ON ' .
                 "-DLIBXML2_WITH_ZLIB={$enable_zlib} " .
@@ -36,13 +36,9 @@ class libxml2 extends MacOSLibraryBase
                 '-DLIBXML2_WITH_PYTHON=OFF ' .
                 '-DLIBXML2_WITH_PROGRAMS=OFF ' .
                 '-DLIBXML2_WITH_TESTS=OFF ' .
-                '-DCMAKE_INSTALL_PREFIX=/ ' .
-                "-DCMAKE_INSTALL_LIBDIR={$lib} " .
-                "-DCMAKE_INSTALL_INCLUDEDIR={$include} " .
-                "-DCMAKE_TOOLCHAIN_FILE={$this->builder->cmake_toolchain_file} " .
                 '..'
             )
             ->exec("cmake --build . -j {$this->builder->concurrency}")
-            ->exec("make install DESTDIR={$destdir}");
+            ->exec('make install DESTDIR=' . BUILD_ROOT_PATH);
     }
 }

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

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

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

@@ -20,11 +20,18 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+
 class nghttp2 extends MacOSLibraryBase
 {
     public const NAME = 'nghttp2';
 
-    protected function build()
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     */
+    protected function build(): void
     {
         $args = $this->builder->makeAutoconfArgs(static::NAME, [
             'zlib' => null,
@@ -46,10 +53,10 @@ class nghttp2 extends MacOSLibraryBase
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} " . ' ./configure ' .
+                './configure ' .
                 '--enable-static ' .
                 '--disable-shared ' .
-                "--host={$this->builder->gnu_arch}-apple-darwin " .
+                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
                 '--enable-lib-only ' .
                 '--with-boost=no ' .
                 $args . ' ' .

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

@@ -20,11 +20,20 @@ declare(strict_types=1);
 
 namespace SPC\builder\macos\library;
 
+use SPC\exception\FileSystemException;
+use SPC\exception\RuntimeException;
+use SPC\exception\WrongUsageException;
+
 class openssl extends MacOSLibraryBase
 {
     public const NAME = 'openssl';
 
-    protected function build()
+    /**
+     * @throws FileSystemException
+     * @throws RuntimeException
+     * @throws WrongUsageException
+     */
+    protected function build(): void
     {
         [$lib,,$destdir] = SEPARATED_PATH;
 
@@ -39,10 +48,11 @@ class openssl extends MacOSLibraryBase
 
         shell()->cd($this->source_dir)
             ->exec(
-                "{$this->builder->configure_env} ./Configure no-shared {$extra} " .
+                "./Configure no-shared {$extra} " .
                 '--prefix=/ ' . // use prefix=/
                 "--libdir={$lib} " .
-                " darwin64-{$this->builder->arch}-cc"
+                '--openssldir=/System/Library/OpenSSL ' .
+                "darwin64-{$this->builder->getOption('arch')}-cc"
             )
             ->exec('make clean')
             ->exec("make -j{$this->builder->concurrency} CNF_EX_LIBS=\"{$ex_lib}\"")

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

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

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

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