merge code

jingjingxyk · jingjingxyk · commit eb65643ed3d1 · 2025-03-25T11:37:12.000+08:00
diff --git a/docs/extensions.md b/docs/extensions.md
@@ -50,8 +50,10 @@
 | protobuf       | ❌     | ❌     | ❌               | ❌               |
 | uuid           | ✅     | ✅     | ❌               | ✅               |
 | mailparse      | ✅     | ✅     | ❌               | ❌               |
-| gettext        | ✅     | ❌     | ❌               | ❌               |
+| gettext        | ✅     | ✅     | ❌               | ❌               |
 | xslwriter      | ✅     | ✅     | ❌               | ✅               |
+| odbc           | ✅     | ✅     | ❌               | ❌               |
+| pdo_odbc       | ✅     | ✅     | ❌               | ❌               |
 
 ## 查看 新增的扩展 和 移除的扩展
 
diff --git a/sapi/quickstart/clean-folder.sh b/sapi/quickstart/clean-folder.sh
@@ -11,9 +11,9 @@ __PROJECT__=$(
 )
 cd ${__PROJECT__}
 
-if [ ! "$BASH_VERSION" ] ; then
-    echo "Please use bash to run this script (bash $0)" 1>&2
-    exit 1
+if [ ! "$BASH_VERSION" ]; then
+  echo "Please use bash to run this script (bash $0)" 1>&2
+  exit 1
 fi
 
 if [[ -f /.dockerenv ]]; then
@@ -24,17 +24,17 @@ GIT_BRANCH=$(git branch | grep '* ' | awk '{print $2}')
 echo $GIT_BRANCH
 ACTION="none"
 case $GIT_BRANCH in
-'build_native_php' | 'build_native_php_t' )
+'build_native_php' | 'build_native_php_t')
   ACTION="delete"
   ;;
-'build_php_8.2' | 'build_php_8.1' | 'build_php_8.0' | 'build_php_7.4' | 'build_php_7.3' )
+'build_php_8.2' | 'build_php_8.1' | 'build_php_8.0' | 'build_php_7.4' | 'build_php_7.3')
   ACTION="delete"
   ;;
 'build_native_php_sfx_micro')
   ACTION="delete"
   ;;
 *)
-  if git ls-files --error-unmatch "sapi/quickstart/clean-folder.sh" > /dev/null 2>&1 ; then
+  if git ls-files --error-unmatch "sapi/quickstart/clean-folder.sh" >/dev/null 2>&1; then
     ACTION="delete"
   else
     echo 'no need delete ext '
@@ -43,8 +43,6 @@ case $GIT_BRANCH in
 
 esac
 
-
-
 if [[ $ACTION = "delete" ]]; then
   cd ${__PROJECT__}
   test -d ext/ && rm -rf ext/*
@@ -74,5 +72,16 @@ if [[ $ACTION = "delete" ]]; then
   test -f conftest.c && rm -rf conftest.c
   test -d scripts && rm -rf scripts
   test -d sapi/cli && rm -rf sapi/cli/
+  test -f APP_VERSION && rm -f APP_VERSION
+  test -f composer.lock && rm -f composer.lock
+  test -f .gitmodules && rm -f .gitmodules
+  test -f cppflags.log && rm -f cppflags.log
+  test -f ldflags.log && rm -f ldflags.log
+  test -f libs.log && rm -f libs.log
+  test -f make.sh && rm -f make.sh
+  test -f make-env.sh && rm -f make-env.sh
+  test -f make-export-variables.sh && rm -f make-export-variables.sh
+  test -f make-install-deps.sh && rm -f make-install-deps.sh
+  test -f libs.log && rm -f libs.log
   echo $?
 fi
diff --git a/sapi/quickstart/linux/alpine-init.sh b/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
diff --git a/sapi/src/Preprocessor.php b/sapi/src/Preprocessor.php
@@ -785,6 +785,19 @@ public function withPreInstallCommand(string $os, string $preInstallCommand): st
         return $this;
     }
 
+    protected array $frameworks = [];
+
+    public function withFramework(string $framework): static
+    {
+        if (!$this->isMacos()) {
+            throw new RuntimeException('frameworks only support macOS');
+        }
+        if (!in_array($framework, $this->frameworks)) {
+            $this->frameworks[] = $framework;
+        }
+        return $this;
+    }
+
     public function getExtension(string $name): ?Extension
     {
         if (!isset($this->extensionMap[$name])) {
diff --git a/sapi/src/builder/enabled_extensions.php b/sapi/src/builder/enabled_extensions.php
@@ -46,4 +46,6 @@
     'pgsql',
     'pdo_pgsql',
     'xlswriter',
+    'gettext',
+    'phpy'
 ];
diff --git a/sapi/src/builder/extension/odbc.php b/sapi/src/builder/extension/odbc.php
@@ -0,0 +1,15 @@
+<?php
+
+use SwooleCli\Preprocessor;
+use SwooleCli\Extension;
+
+return function (Preprocessor $p) {
+    $unixODBC_prefix = UNIX_ODBC_PREFIX;
+    $p->addExtension(
+        (new Extension('odbc'))
+            ->withHomePage('https://www.php.net/manual/zh/ref.pdo-odbc.php')
+            ->withLicense('https://github.com/php/php-src/blob/master/LICENSE', Extension::LICENSE_PHP)
+            ->withOptions('--with-unixODBC=' . $unixODBC_prefix)
+            ->withDependentLibraries('unix_odbc')
+    );
+};
diff --git a/sapi/src/builder/extension/opentelemetry.php b/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);
 };
diff --git a/sapi/src/builder/extension/phpy.php b/sapi/src/builder/extension/phpy.php
@@ -8,30 +8,26 @@
     // anaconda 安装包
     // https://repo.anaconda.com/archive/
 
-    # $options .= ' --with-python-version=3.12';
-    # $options .= ' --with-python-dir=/opt/anaconda3';
+    // $options .= ' --with-python-version=3.12';
+    // $options .= ' --with-python-dir=/opt/anaconda3';
 
     $tag = 'v1.0.11';
 
-
     $python3_prefix = PYTHON3_PREFIX;
     $options = [];
     $options[] = '--enable-phpy';
     $options[] = ' --with-python-version=3.12.2';
     $options[] = ' --with-python-dir=' . $python3_prefix;
     $options[] = ' --with-python-config=' . $python3_prefix . '/bin/python3-config';
 
-
     $dependentLibraries = ['python3'];
     $dependentExtensions = [];
 
-
     $ext = (new Extension('phpy'))
         ->withOptions(implode(' ', $options))
         ->withLicense('https://github.com/swoole/phpy/blob/main/LICENSE', Extension::LICENSE_APACHE2)
         ->withHomePage('https://github.com/swoole/phpy/')
         ->withManual('https://github.com/swoole/phpy/')
-        ->withBuildCached(false)
         ->withFile('phpy-latest.tar.gz')
         ->withDownloadScript(
             'phpy', # 待打包目录名称
@@ -44,21 +40,7 @@
         ->withDependentLibraries(...$dependentLibraries);
     $p->addExtension($ext);
 
-    $p->withBeforeConfigureScript('phpy', function (Preprocessor $p) {
-        $workDir = $p->getPhpSrcDir();
-        $cmd = <<<EOF
-
-        cd {$workDir}/
-        sed -i.backup "s/ -z now/  /g" ext/phpy/config.m4
-        rm -f ext/phpy/config.m4.backup
-EOF;
-
-        return $cmd;
-    });
-
-
     $libs = $p->isMacos() ? '-lc++' : ' -lstdc++ ';
     $p->withVariable('LIBS', '$LIBS ' . $libs);
-    //$p->withVariable('CPPFLAGS', '$CPPFLAGS -I' . $p->getWorkDir() . '/ext/phpy/include');
     $p->withVariable('CPPFLAGS', '$CPPFLAGS -I' . $p->getPhpSrcDir() . '/ext/phpy/include');
 };
diff --git a/sapi/src/builder/extension/swoole.php b/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)');
diff --git a/sapi/src/builder/library/gettext.php b/sapi/src/builder/library/gettext.php
@@ -6,9 +6,9 @@
 return function (Preprocessor $p) {
 
     // gettext 包含 libintl 库
-    //在常见的 Linux 发行版里，libintl 是由 libc 提供的，此时 gettext 编译的时候就不会附带 libintl；
-    //而如果在 macOS 上，由于 macOS 的 libc 没有 libintl 的 API，所以 gettext 编译的时候就要附带 libintl
-    //详情： https://jia.je/devops/2023/07/08/gentoo-prefix-m1/#libintl
+    // 在常见的 Linux 发行版里，libintl 是由 libc 提供的，此时 gettext 编译的时候就不会附带 libintl；
+    // 而如果在 macOS 上，由于 macOS 的 libc 没有 libintl 的 API，所以 gettext 编译的时候就要附带 libintl
+    // 详情： https://jia.je/devops/2023/07/08/gentoo-prefix-m1/#libintl
     $gettext_prefix = GETTEXT_PREFIX;
     $libunistring_prefix = LIBUNISTRING_PREFIX;
     $iconv_prefix = ICONV_PREFIX;
@@ -24,11 +24,9 @@
             ->withHomePage('https://www.gnu.org/software/gettext/')
             ->withLicense('https://www.gnu.org/licenses/licenses.html', Library::LICENSE_GPL)
             ->withManual('https://www.gnu.org/software/gettext/')
-            //->withUrl('https://ftp.gnu.org/gnu/gettext/gettext-0.22.5.tar.gz')
             ->withUrl('https://ftpmirror.gnu.org/gettext/gettext-0.22.5.tar.gz')
             ->withFileHash('sha256', "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0")
             ->withPrefix($gettext_prefix)
-            //->withInstallCached(false)
             ->withConfigure(
                 <<<EOF
 
@@ -75,6 +73,6 @@
     $p->withVariable('LDFLAGS', '$LDFLAGS -L' . $gettext_prefix . '/lib');
     $p->withVariable('LIBS', '$LIBS -lintl ');
     if ($p->isMacos()) {
-        $p->withVariable('LDFLAGS', '$LDFLAGS -framework CoreFoundation ');
+        $p->withFramework('CoreFoundation');
     }
 };
diff --git a/sapi/src/builder/library/python3.php b/sapi/src/builder/library/python3.php
@@ -5,7 +5,7 @@
 
 return function (Preprocessor $p) {
     $python3_prefix = PYTHON3_PREFIX;
-    $openssl_prefix = OPENSSL_PREFIX;;
+    $openssl_prefix = OPENSSL_PREFIX;
     $libintl_prefix = GETTEXT_PREFIX;
     $libiconv_prefix = ICONV_PREFIX;
     $bzip2_prefix = BZIP2_PREFIX;
@@ -19,11 +19,9 @@
         ->withManual('https://www.python.org')
         ->withManual('https://github.com/python/cpython.git')
         ->withUrl('https://www.python.org/ftp/python/3.12.2/Python-3.12.2.tgz')
-        //->withUrl('https://www.python.org/ftp/python/3.13.0/Python-3.13.0.tgz')
-        //->withUrl('https://github.com/python/cpython/archive/refs/tags/v3.13.0.tar.gz')
+        ->withMirrorUrl('https://github.com/python/cpython/archive/refs/tags/v3.13.0.tar.gz')
         ->withPrefix($python3_prefix)
         ->withBuildCached(false)
-        ->withInstallCached(true)
         ->withBuildScript(
             <<<EOF
 
@@ -32,7 +30,7 @@
         sed -i.backup 's/py_cv_module__ctypes=yes/py_cv_module__ctypes=disabled/' ./configure
         sed -i.backup 's/py_cv_module_xxlimited=yes/py_cv_module_xxlimited=disabled/' ./configure
         sed -i.backup 's/py_cv_module_xxlimited_35=yes/py_cv_module_xxlimited_35=disabled/' ./configure
-        sed -i.backup 's/py_cv_module__scproxy=yes/py_cv_module__scproxy=disabled/' ./configure
+        # sed -i.backup 's/py_cv_module__scproxy=yes/py_cv_module__scproxy=disabled/' ./configure
         sed -i.backup 's/py_cv_module__tkinter=yes/py_cv_module__tkinter=disabled/' ./configure
 
         PACKAGES='  '
@@ -134,10 +132,11 @@
         )
         ->withScriptAfterInstall(
             <<<EOF
-            sed -i.backup "s/-ldl/  /g" {$python3_prefix}/lib/pkgconfig/python3.pc
-            sed -i.backup "s/-ldl/  /g" {$python3_prefix}/lib/pkgconfig/python3-embed.pc
-            rm -f {$python3_prefix}/lib/pkgconfig/python3.pc.backup
-            rm -f {$python3_prefix}/lib/pkgconfig/python3-embed.pc.backup
+        # 直接使用 sed 替换文件内容报错信息：  in-place editing only works for regular files
+        cp -f {$python3_prefix}/lib/pkgconfig/python3.pc {$python3_prefix}/lib/pkgconfig/python3.backup.pc
+        cp -f {$python3_prefix}/lib/pkgconfig/python3-embed.pc {$python3_prefix}/lib/pkgconfig/python3-embed.backup.pc
+        cat {$python3_prefix}/lib/pkgconfig/python3.backup.pc       | sed 's/-ldl/  /g' > {$python3_prefix}/lib/pkgconfig/python3.pc
+        cat {$python3_prefix}/lib/pkgconfig/python3-embed.backup.pc | sed 's/-ldl/  /g' > {$python3_prefix}/lib/pkgconfig/python3-embed.pc
 EOF
         )
         ->withPkgName('python3-embed')
@@ -160,12 +159,10 @@
     $p->addLibrary($lib);
 
     if ($p->isMacos()) {
-        $p->withVariable('LDFLAGS', '$LDFLAGS -framework CoreFoundation ');
-
-        //module  _scproxy needs SystemConfiguration and CoreFoundation framework
-        //$p->withVariable('LDFLAGS', '$LDFLAGS -framework SystemConfiguration -framework CoreFoundation ');
+        $p->withFramework('CoreFoundation');
+        $p->withFramework('SystemConfiguration');
+        // module  _scproxy needs SystemConfiguration and CoreFoundation framework
     }
-    //libHacl_Hash_SHA2.a
     $p->withVariable('LIBS', '$LIBS -lHacl_Hash_SHA2');
     $p->withVariable('CPPFLAGS', "\$CPPFLAGS  -I{$python3_prefix}/_hacl/include/");
 };
@@ -174,7 +171,6 @@
 # 参考文档： https://wiki.python.org/moin/BuildStatically
 # https://knazarov.com/posts/statically_linked_python_interpreter/
 
-
 # 配置参考 https://docs.python.org/zh-cn/3.12/using/configure.html
 
 # https://github.com/python/cpython
diff --git a/sapi/src/builder/library/unix_odbc.php b/sapi/src/builder/library/unix_odbc.php
@@ -51,7 +51,7 @@
             rm -rf {$unix_odbc_prefix}/lib/*.dylib
 EOF
             )
-            ->withDependentLibraries('readline', 'libiconv') //'libedit'
+            ->withDependentLibraries('readline', 'libiconv')
             ->withBinPath($unix_odbc_prefix . '/bin/')
             ->withPkgName('odbc')
             ->withPkgName('odbccr')
diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php
