Merge pull request #945 from jingjingxyk/build_native_php

Build native php

Author: jingjingxyk

sapi/quickstart/linux/alpine-init.sh

@@ -43,17 +43,14 @@ apk update
 apk add vim alpine-sdk xz autoconf automake linux-headers clang-dev clang lld libtool cmake bison re2c coreutils gcc g++
 apk add bash zip unzip flex pkgconf ca-certificates
 apk add tar gzip zip unzip bzip2
+apk add 7zip
 apk add gettext gettext-dev
-
-apk add bash 7zip
-# apk add bash p7zip
-
 apk add wget git curl
 apk add libc++-static libltdl-static
 apk add yasm nasm
 apk add ninja python3 py3-pip
 apk add diffutils
-apk add netcat-openbsd socat
+apk add socat
 apk add python3-dev
 apk add mercurial
 apk add pigz parallel

sapi/src/builder/extension/opentelemetry.php

@@ -5,10 +5,7 @@
 use SwooleCli\Extension;
 
 return function (Preprocessor $p) {
-    return null;//待改进
-    //PHP 构建选项
     $options = ' --enable-opentelemetry ';
-
     $ext = (new Extension('opentelemetry'))
         ->withOptions($options)
         ->withHomePage('https://opentelemetry.io/')
@@ -24,5 +21,15 @@
 
 EOF
         );
+    $p->withBeforeConfigureScript('opentelemetry', function (Preprocessor $p) {
+        $workDir = $p->getPhpSrcDir();
+        $cmd=<<<EOF
+        cd {$workDir}/ext/opentelemetry/
+
+         sed -i '' 's/static void check_conflicts()/static void check_conflicts(void)/' opentelemetry.c
+         sed -i '' 's/static otel_observer \*create_observer()/static otel_observer \*create_observer(void)/' otel_observer.c
+EOF;
+        return $cmd;
+    });
     $p->addExtension($ext);
 };

sapi/src/builder/extension/swoole.php

@@ -14,7 +14,7 @@
     // v5.1.x 不支持 PHP 8.4
     // swoole 支持计划 https://wiki.swoole.com/zh-cn/#/version/supported?id=%e6%94%af%e6%8c%81%e8%ae%a1%e5%88%92
 
-    $swoole_tag = 'v6.0.1';
+    $swoole_tag = 'v6.0.2';
     $file = "swoole-{$swoole_tag}.tar.gz";
 
     $url = "https://github.com/swoole/swoole-src/archive/refs/tags/{$swoole_tag}.tar.gz";
@@ -67,6 +67,35 @@
         ->withDependentLibraries(...$dependentLibraries)
         ->withDependentExtensions(...$dependentExtensions));
 
+    $p->withBeforeConfigureScript('swoole', function (Preprocessor $p) {
+        $cmd = '';
+        if ($p->isMacos()) {
+            $workDir = $p->getPhpSrcDir() ;
+            $cmd = <<<EOF
+        cd {$workDir}/
+        sed -i '' 's/pthread_barrier_init/pthread_barrier_init_x_fake/' ext/swoole/config.m4
+EOF;
+        }
+        return $cmd;
+
+    });
+    if ($p->isMacos()) {
+        # 测试 macos 专有特性
+        # 定义 _GNU_SOURCE 会隐式启用 _POSIX_C_SOURCE=200112L 和 _XOPEN_SOURCE=600
+        # export CFLAGS="$CFLAGS  " # -D_DARWIN_C_SOURCE=1 -D_XOPEN_SOURCE=700  -D_GNU_SOURCE  -D_POSIX_C_SOURCE=200809L
+        # export LIBS="-Wl,--start-group -pthread  -Wl,--end-group"
+        # export LIBS="-Wl,--whole-archive -pthread -Wl,--no-whole-archive "
+
+        # 新版macos getdtablesize 函数缺失
+        # sed -i '' 's/getdtablesize();/sysconf(_SC_OPEN_MAX);/' ext/standard/php_fopen_wrapper.c
+        $libc = $p->isMacos() ? '-lc++' : '-lstdc++';
+
+        # cd /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/sys/_pthread
+        # 或者
+        # cd /Library/Developer/CommandLineTools/SDKs/MacOSX13.sdk/usr/include/sys/_pthread
+        # grep -r 'pthread_barrier_init' .
+        # grep -r 'pthread_barrier_t' .
+    }
     $p->withVariable('LIBS', '$LIBS ' . ($p->isMacos() ? '-lc++' : '-lstdc++'));
     $p->withExportVariable('CARES_CFLAGS', '$(pkg-config  --cflags --static  libcares)');
     $p->withExportVariable('CARES_LIBS', '$(pkg-config    --libs   --static  libcares)');

sapi/src/template/make.php

@@ -247,11 +247,6 @@
         export LIBS="$LIBS -lcrypto -lssl -lmpdec -lmpdec++ -lbz2 -llzma -lHacl_Hash_SHA2 -lb2 -lexpat -lxml2 -lform -lmenu  -ltic -lpanel -lncurses++ -lncurses "
     <?php endif; ?>
 <?php endif; ?>
-<?php if ($this->isMacos()) : ?>
-    <?php if ($this->hasExtension('swoole')) : ?>
-        export LIBS="$LIBS -lpthread"
-    <?php endif; ?>
-<?php endif; ?>
 <?php if ($this->isLinux() && ($this->get_C_COMPILER() == 'musl-gcc')) : ?>
     ln -sf /usr/include/linux/ /usr/include/x86_64-linux-musl/linux
     ln -sf /usr/include/x86_64-linux-gnu/asm/ /usr/include/x86_64-linux-musl/asm