Feature perfect swoole extension config (#297)

* improve swoole static build config * improve swoole static build config * improve swoole static build config * improve swoole static build config * improve swoole static build config * add cares config * update swoole depend config * update swoole depend config * update cares build config * update workflow tests.yaml config * fix setup-runtime * test with clang build * test with clang build * update cares build config * test * test * test * test * test * test * test * test * test * test * test * test * test * test * update cares license * test build * test build * test build * test build * test add enable libpq * test add enable libpq * test add enable libpq * test add enable libpq * test add enable libpq * test add enable libpq * test add enable libpq * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * test * update * update * update * update * update * update * update * update * update * compatible old * fix code format * fix code format * add swoole test case * add swoole test case * add phpstan ignore error * add phpstan ignore error * add phpstan ignore error * add phpstan ignore error * add phpstan ignore error * update phpstan.neon * update swoole extension test case * update swoole test case * adjust config order and depends * revert LinuxBuilder * remove swoole.phpt * re-adjust swoole args * update test-extensions and some PHPDoc * revert: debian and alpine clang doctor install * revert: MacOSBuilder * fix: extract hook for archive not working * revert: build tests * use addon mode to swoole database hook * add hook tests * test minimal * test minimal * sort config --------- Co-authored-by: crazywhalecc <jesse2061@outlook.com>
2026-07-07 08:45:40 +08:00 · 2024-01-03 10:31:21 +08:00
parent 5c7552f826
commit 31c71f180b
25 changed files with 421 additions and 164 deletions
--- a/src/SPC/builder/macos/MacOSBuilder.php
+++ b/src/SPC/builder/macos/MacOSBuilder.php
@@ -155,6 +155,21 @@ class MacOSBuilder extends BuilderBase
        $enableMicro = ($build_target & BUILD_TARGET_MICRO) === BUILD_TARGET_MICRO;
        $enableEmbed = ($build_target & BUILD_TARGET_EMBED) === BUILD_TARGET_EMBED;

+        // prepare build php envs
+        $envs_build_php = SystemUtil::makeEnvVarString([
+            'CFLAGS' => " {$this->arch_c_flags} -Werror=unknown-warning-option ",
+            'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH,
+            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
+        ]);
+
+        if ($this->getLib('postgresql')) {
+            shell()
+                ->cd(SOURCE_PATH . '/php-src')
+                ->exec(
+                    'sed -i.backup "s/ac_cv_func_explicit_bzero\" = xyes/ac_cv_func_explicit_bzero\" = x_fake_yes/" ./configure'
+                );
+        }
+
        shell()->cd(SOURCE_PATH . '/php-src')
            ->exec(
                './configure ' .
@@ -162,8 +177,6 @@ class MacOSBuilder extends BuilderBase
                '--with-valgrind=no ' .     // Not detect memory leak
                '--enable-shared=no ' .
                '--enable-static=yes ' .
-                "CFLAGS='{$this->arch_c_flags} -Werror=unknown-warning-option' " .
-                "CPPFLAGS='-I" . BUILD_INCLUDE_PATH . "' " .
                '--disable-all ' .
                '--disable-cgi ' .
                '--disable-phpdbg ' .
@@ -173,7 +186,8 @@ class MacOSBuilder extends BuilderBase
                ($enableMicro ? '--enable-micro ' : '--disable-micro ') .
                $json_74 .
                $zts .
-                $this->makeExtensionArgs()
+                $this->makeExtensionArgs() . ' ' .
+                $envs_build_php
            );

        SourcePatcher::patchBeforeMake($this);
@@ -213,10 +227,7 @@ class MacOSBuilder extends BuilderBase
     */
    public function buildCli(): void
    {
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
-        ]);
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());

        $shell = shell()->cd(SOURCE_PATH . '/php-src');
        $shell->exec("make -j{$this->concurrency} {$vars} cli");
@@ -247,9 +258,8 @@ class MacOSBuilder extends BuilderBase
        $vars = [
            // with debug information, optimize for size, remove identifiers, patch fake cli for micro
            'EXTRA_CFLAGS' => '-g -Os -fno-ident' . $enable_fake_cli,
-            // link resolv library (macOS needs it)
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv",
        ];
+        $vars = $this->getBuildVars($vars);
        if (!$this->getOption('no-strip', false)) {
            $vars['STRIP'] = 'dsymutil -f ';
        }
@@ -272,10 +282,7 @@ class MacOSBuilder extends BuilderBase
     */
    public function buildFpm(): void
    {
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
-        ]);
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());

        $shell = shell()->cd(SOURCE_PATH . '/php-src');
        $shell->exec("make -j{$this->concurrency} {$vars} fpm");
@@ -292,10 +299,7 @@ class MacOSBuilder extends BuilderBase
     */
    public function buildEmbed(): void
    {
-        $vars = SystemUtil::makeEnvVarString([
-            'EXTRA_CFLAGS' => '-g -Os', // with debug information, but optimize for size
-            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv", // link resolv library (macOS needs it)
-        ]);
+        $vars = SystemUtil::makeEnvVarString($this->getBuildVars());

        shell()
            ->cd(SOURCE_PATH . '/php-src')
@@ -309,4 +313,15 @@ class MacOSBuilder extends BuilderBase
            ->exec('ar rcs ' . BUILD_ROOT_PATH . '/lib/libphp.a *.o')
            ->exec('rm -Rf ' . BUILD_ROOT_PATH . '/lib/php-o');
    }
+
+    private function getBuildVars($input = []): array
+    {
+        $optimization = $this->getOption('no-strip', false) ? '-g -O0' : '-g0 -Os';
+        $cflags = isset($input['EXTRA_CFLAGS']) && $input['EXTRA_CFLAGS'] ? " {$input['EXTRA_CFLAGS']}" : '';
+        $libs = isset($input['EXTRA_LIBS']) && $input['EXTRA_LIBS'] ? " {$input['EXTRA_LIBS']}" : '';
+        return [
+            'EXTRA_CFLAGS' => "{$optimization} {$cflags} " . $this->getOption('x-extra-cflags'),
+            'EXTRA_LIBS' => "{$this->getOption('extra-libs')} -lresolv {$libs} " . $this->getOption('x-extra-libs'),
+        ];
+    }
 }
--- a/src/SPC/builder/macos/library/libcares.php
+++ b/src/SPC/builder/macos/library/libcares.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class libcares extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\libcares;
+
+    public const NAME = 'libcares';
+}
--- a/src/SPC/builder/macos/library/nghttp2.php
+++ b/src/SPC/builder/macos/library/nghttp2.php
@@ -20,51 +20,9 @@ declare(strict_types=1);

 namespace SPC\builder\macos\library;

-use SPC\exception\FileSystemException;
-use SPC\exception\RuntimeException;
-
 class nghttp2 extends MacOSLibraryBase
 {
+    use \SPC\builder\unix\library\nghttp2;
+
    public const NAME = 'nghttp2';
-
-    /**
-     * @throws FileSystemException
-     * @throws RuntimeException
-     */
-    protected function build(): void
-    {
-        $args = $this->builder->makeAutoconfArgs(static::NAME, [
-            'zlib' => null,
-            'openssl' => null,
-            'libxml2' => null,
-            'libev' => null,
-            'libcares' => null,
-            'libngtcp2' => null,
-            'libnghttp3' => null,
-            'libbpf' => null,
-            'libevent-openssl' => null,
-            'jansson' => null,
-            'jemalloc' => null,
-            'systemd' => null,
-            'cunit' => null,
-        ]);
-
-        [,,$destdir] = SEPARATED_PATH;
-
-        shell()->cd($this->source_dir)
-            ->exec(
-                './configure ' .
-                '--enable-static ' .
-                '--disable-shared ' .
-                "--host={$this->builder->getOption('gnu-arch')}-apple-darwin " .
-                '--enable-lib-only ' .
-                '--with-boost=no ' .
-                $args . ' ' .
-                '--prefix='
-            )
-            ->exec('make clean')
-            ->exec("make -j{$this->builder->concurrency}")
-            ->exec("make install DESTDIR={$destdir}");
-        $this->patchPkgconfPrefix(['libnghttp2.pc']);
-    }
 }