Merge remote-tracking branch 'origin/build_native_php' into build_native_php

jingjingxyk · jingjingxyk · commit eafbebdd3018 · 2025-03-18T23:33:40.000+08:00
diff --git a/.github/workflows/auto-cache-pool-tarball.yml b/.github/workflows/auto-cache-pool-tarball.yml
@@ -5,10 +5,11 @@ on:
   pull_request:
   schedule:
     - cron: '0 0 */6 * *'
+  workflow_dispatch:
 
 jobs:
   auto-cache-pool:
-    if: 1
+    if: ${{ (github.repository_owner == 'swoole') }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -70,7 +71,9 @@ jobs:
           set -x
           mkdir -p pool/lib
           mkdir -p pool/ext
+          mkdir -p pool/php-tar
           mkdir -p bin/runtime
+          mkdir -p bin/var
           if [ ! -f bin/runtime/php ] ; then
               bash  setup-php-runtime.sh
           fi
@@ -84,11 +87,16 @@ jobs:
           composer install  --no-interaction --no-autoloader --no-scripts --profile  --no-dev
           composer dump-autoload --optimize --profile --no-dev
 
-          php prepare.php  +inotify         --show-tarball-hash=1
-          php prepare.php            @macos --show-tarball-hash=1
+          php prepare.php  +inotify +apcu +ds +ssh2  +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1
+          php prepare.php           +apcu +ds +ssh2  +uuid +protobuf +gettext --with-libavif=1 --show-tarball-hash=1 @macos
+          # php sapi/scripts/download-php-src-archive.php
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.1.32
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.2.28
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.3.19
+          php prepare.php  --show-tarball-hash=1 --with-php-version=8.4.5
 
           cd ${{ github.workspace }}/pool/
-          zip -9 -r ${WORK_DIR}/all-deps.zip ext lib
+          zip -9 -r ${WORK_DIR}/all-deps.zip ext lib php-tar
           HASH=$(sha256sum ${WORK_DIR}/all-deps.zip | awk '{print $1}')
           echo " all-deps.zip sha265: ${HASH} "
           echo -n ${HASH} > ${WORK_DIR}/all-deps.zip.sha256sum
@@ -98,6 +106,7 @@ jobs:
         run: |
           ls -A pool/lib/
           ls -A pool/ext/
+          ls -A pool/php-tar/
 
       - name: production artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -3,7 +3,7 @@ name: build-php-cli-linux-aarch64
 on: [ push, pull_request ]
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   linux-aarch64:
@@ -12,10 +12,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -18,12 +18,13 @@ on:
       php_version:
         required: true
         description: "定制构建选项: 指定 PHP 版本(版本号大于等于8.1)"
-        default: '--with-php-version=8.2.27'
+        default: '--with-php-version=8.2.28'
         type: choice
         options:
-          - '--with-php-version=8.1.31'
-          - '--with-php-version=8.2.27'
-          - '--with-php-version=8.3.15'
+          - '--with-php-version=8.1.32'
+          - '--with-php-version=8.2.28'
+          - '--with-php-version=8.3.19'
+          - '--with-php-version=8.4.5'
       build_type:
         required: true
         description: "定制构建选项: 指定构建类型"
@@ -39,7 +40,7 @@ on:
         type: string
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   linux-x86_64:
@@ -48,10 +49,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -3,7 +3,7 @@ name: build-php-cli-macos-aarch64
 on: [ push, pull_request ]
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   macos-aarch64:
@@ -17,10 +17,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   macos-x86_64:
@@ -19,10 +19,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - uses: actions/checkout@v4
       - name: Show Environment Info
diff --git a/.github/workflows/windows-cygwin.yml b/.github/workflows/windows-cygwin.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 
 env:
-  BUILD_PHP_VERSION: 8.2.27
+  BUILD_PHP_VERSION: 8.2.28
 
 jobs:
   windows-cygwin:
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "8.2.27"
-          - "8.1.31"
-          - "8.3.15"
-          - "8.4.2"
+          - "8.2.28"
+          - "8.1.32"
+          - "8.3.19"
+          - "8.4.5"
     steps:
       - name: Show Environment Info
         shell: cmd
diff --git a/bin/.gitkeep b/bin/.gitkeep
diff --git a/pool/.gitkeep b/pool/.gitkeep
diff --git a/prepare.php b/prepare.php
@@ -32,9 +32,9 @@
 
 
 # PHP 默认版本 （此文件配置 /sapi/PHP-VERSION.conf 在 build_native_php分支 和 衍生分支 无效）
-$php_version = '8.2.27';
-$php_version_id = '802027';
-$php_version_tag = 'php-8.2.27';
+$php_version = '8.2.28';
+$php_version_id = '802028';
+$php_version_tag = 'php-8.2.28';
 
 if ($p->getInputOption('with-php-version')) {
     $subject = $p->getInputOption('with-php-version');
diff --git a/sapi/quickstart/linux/alpine-init.sh b/sapi/quickstart/linux/alpine-init.sh
@@ -42,7 +42,8 @@ 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 gettext gettext-dev
+apk add tar gzip zip unzip bzip2
+apk add gettext gettext-dev
 
 apk add bash 7zip
 # apk add bash p7zip
@@ -70,4 +71,3 @@ esac
 
 # pip3 install meson
 apk add meson
-
diff --git a/sapi/scripts/download-php-src-archive.php b/sapi/scripts/download-php-src-archive.php
@@ -3,10 +3,10 @@
 $poject_dir = realpath(__DIR__ . '/../../');
 
 # $php_version_tag = trim(file_get_contents($poject_dir . '/sapi/PHP-VERSION.conf'));
-$php_version_tag = '8.2.23';
+$php_version_tag = '8.2.28';
 $php_source_folder = $poject_dir . "/var/php-{$php_version_tag}";
 $php_archive_file = $poject_dir . "/pool/php-tar/php-{$php_version_tag}.tar.gz";
-$php_archive_file_sha256sum = '9c81202e6397d973c89d162e30ab6fe6689dea9cbbb235be5a5366707a38b649';
+$php_archive_file_sha256sum = 'c1fbad2787ec3e27bf334cb94b2590f47c10f49b5ea1192165a3e91afe838832';
 $download_dir = dirname($php_archive_file);
 $download_php_counter = 0;
 
diff --git a/sapi/src/builder/extension/pdo_pgsql.php b/sapi/src/builder/extension/pdo_pgsql.php
@@ -14,8 +14,4 @@
             ->withDependentExtensions('pdo')
             ->withDependentLibraries('pgsql')
     );
-    if (BUILD_CUSTOM_PHP_VERSION_ID >= 8040) {
-        $p->withExportVariable('PGSQL_CFLAGS', '$(pkg-config  --cflags --static  libpq)');
-        $p->withExportVariable('PGSQL_LIBS', '$(pkg-config    --libs   --static  libpq)');
-    }
 };
diff --git a/sapi/src/builder/library/gettext.php b/sapi/src/builder/library/gettext.php
@@ -66,7 +66,6 @@
             --without-xz \
             {$options} \
 
-
 EOF
             )
             ->withDependentLibraries('libunistring', 'libiconv', 'ncurses', 'libxml2', 'zlib')
diff --git a/sapi/src/builder/library/openssl.php b/sapi/src/builder/library/openssl.php
@@ -52,8 +52,8 @@
             sed -i.backup "s/-ldl/  /g" {$openssl_prefix}/lib/pkgconfig/libcrypto.pc
 EOF
             )
-            ->withPkgName('libcrypto')
             ->withPkgName('libssl')
+            ->withPkgName('libcrypto')
             ->withPkgName('openssl')
             ->withBinPath($openssl_prefix . '/bin/')
     );
diff --git a/sapi/src/builder/library/pgsql.php b/sapi/src/builder/library/pgsql.php
@@ -29,22 +29,22 @@
             sed -i.backup "278 s/^/# /"  ../src/Makefile.shlib
             sed -i.backup "402 s/^/# /"  ../src/Makefile.shlib
 
-            PACKAGES="openssl zlib icu-uc icu-io icu-i18n readline libxml-2.0  libxslt libzstd liblz4"
+            PACKAGES="libssl libcrypto openssl zlib icu-uc icu-io icu-i18n readline libxml-2.0  libxslt libzstd liblz4"
             CPPFLAGS="$(pkg-config  --cflags-only-I --static \$PACKAGES )" \
             LDFLAGS="$(pkg-config   --libs-only-L   --static \$PACKAGES ) {$ldflags} " \
             LIBS="$(pkg-config      --libs-only-l   --static \$PACKAGES ) {$libs}  " \
             ../configure  \
             --prefix={$pgsql_prefix} \
             --enable-coverage=no \
-            --disable-thread-safety \
+            --with-openssl \
             --with-ssl=openssl  \
             --with-readline \
             --with-icu \
-            --without-ldap \
             --with-libxml  \
             --with-libxslt \
             --with-lz4 \
             --with-zstd \
+            --without-ldap \
             --without-perl \
             --without-python \
             --without-pam \
@@ -69,6 +69,8 @@
             rm -rf {$pgsql_prefix}/lib/*.so.*
             rm -rf {$pgsql_prefix}/lib/*.so
             rm -rf {$pgsql_prefix}/lib/*.dylib
+            rm -rf {$pgsql_prefix}/lib/libpgcommon_shlib.a
+            rm -rf {$pgsql_prefix}/lib/libpgport_shlib.a
 EOF
             )
             ->withPkgName('libpq')
@@ -86,4 +88,6 @@
     );
     $p->withExportVariable('LIBPQ_CFLAGS', '$(pkg-config  --cflags --static libpq)');
     $p->withExportVariable('LIBPQ_LIBS', '$(pkg-config    --libs   --static libpq)');
+    $p->withExportVariable('PGSQL_CFLAGS', '$(pkg-config  --cflags --static  libpq)');
+    $p->withExportVariable('PGSQL_LIBS', '$(pkg-config    --libs   --static  libpq)');
 };
diff --git a/sapi/src/builder/library/python3.php b/sapi/src/builder/library/python3.php
@@ -136,7 +136,8 @@
             <<<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
 EOF
         )
         ->withPkgName('python3-embed')
diff --git a/sapi/src/constants.php b/sapi/src/constants.php
@@ -58,7 +58,6 @@
 define("GETTEXT_PREFIX", $p->getGlobalPrefix() . '/gettext');
 define("LIBUNISTRING_PREFIX", $p->getGlobalPrefix() . '/libunistring');
 define("LIBURING_PREFIX", $p->getGlobalPrefix() . '/liburing');
-
 define("LIBAVIF_PREFIX", $p->getGlobalPrefix() . '/libavif');
 define("DAV1D_PREFIX", $p->getGlobalPrefix() . '/dav1d');
 define("LIBGAV1_PREFIX", $p->getGlobalPrefix() . '/libgav1');
@@ -71,19 +70,14 @@
 define("LIBB2_PREFIX", $p->getGlobalPrefix() . '/libb2');
 define("LIBEXPAT_PREFIX", $p->getGlobalPrefix() . '/libexpat');
 
-define("ZOOKEEPER_PREFIX", $p->getGlobalPrefix() . '/zookeeper');
+
 define("LIBEVENT_PREFIX", $p->getGlobalPrefix() . '/libevent');
 define("SNAPPY_PREFIX", $p->getGlobalPrefix() . '/snappy');
 define("LIBSASL_PREFIX", $p->getGlobalPrefix() . '/sasl');
-
 define("LIBTIFF_PREFIX", $p->getGlobalPrefix() . '/libtiff');
-define("LIBRAW_PREFIX", $p->getGlobalPrefix() . '/libraw');
-define("LCMS2_PREFIX", $p->getGlobalPrefix() . '/lcms2');
-
-define("ABSL_PREFIX", $p->getGlobalPrefix() . '/absl');
-define("RAV1E_PREFIX", $p->getGlobalPrefix() . '/rav1e');
 define("SDL2_PREFIX", $p->getGlobalPrefix() . '/sdl2');
 define("LIBARGON2_PREFIX", $p->getGlobalPrefix() . '/libargon2');
+define("ABSL_PREFIX", $p->getGlobalPrefix() . '/absl');
 
 define("MUSL_CROSS_MAKE_PREFIX", $p->getGlobalPrefix() . '/musl_cross_make');
 
diff --git a/sapi/src/template/make.php b/sapi/src/template/make.php
@@ -235,13 +235,21 @@
     export CFLAGS=$(echo $CFLAGS | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
     export LDFLAGS=$(echo $LDFLAGS | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
     export LIBS=$(echo $LIBS | tr ' ' '\n' | sort | uniq | tr '\n' ' ')
+<?php if ($this->isLinux()) : ?>
+    # 手动指定依赖库链接顺序
+    <?php if ($this->hasLibrary('pgsql')) : ?>
+        export LIBS="$LIBS -lcrypto -lssl -lpgcommon -lpgport -lpq"
+    <?php endif; ?>
+    <?php if ($this->hasExtension('phpy')) : ?>
+        export LIBS="$LIBS -lmpdec -lmpdec++ -lbz2 -llzma -lHacl_Hash_SHA2 -lb2 -lexpat -lxml2 -lform -lmenu -lncurses++ -lncurses -lpanel -ltic "
+    <?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
     ln -sf /usr/include/asm-generic/ /usr/include/x86_64-linux-musl/asm-generic
-
     export LDFLAGS="${LDFLAGS} -static -L/usr/lib/x86_64-linux-musl "
-
 <?php endif ;?>
     result_code=$?
     [[ $result_code -ne 0 ]] &&  echo " [ export_variables  FAILURE ]" && exit  $result_code;
diff --git a/sapi/tools/build-libpq.sh b/sapi/tools/build-libpq.sh
@@ -5,3 +5,8 @@ make -C src/common install
 make -C src/port install
 make -C doc install
 
+# 参考文档
+# https://www.postgresql.org/docs/current/install-make.html#INSTALL-PROCEDURE-MAKE
+# https://www.postgresql.org/docs/16/install-make.html
+# https://www.postgresql.org/docs/15/install-procedure.html#CONFIGURE-OPTIONS
+# https://www.postgresql.org/docs/
diff --git a/var/.gitkeep b/var/.gitkeep
