Merge branch 'build_native_php' into php-fpm

Author: jingjingxyk

.gitignore

@@ -343,4 +343,5 @@ LICENSE
 swoole-cli-*
 php-cli-*
 php-fpm-*
+!sapi/patches
 

docs/upgrade.md

@@ -12,6 +12,9 @@ php sync-source-code.php
 php sync-source-code.php --action run
 
 
+./bin/runtime/php -c ./bin/runtime/php.ini  sync-source-code.php
+./bin/runtime/php -c ./bin/runtime/php.ini  sync-source-code.php --action run
+
 ```
 
 ## 目录说明

sapi/patches/0001-fix-readline-not-work.patch

@@ -0,0 +1,43 @@
+From 2a15bd4c55d8d2f46d2e17d4f7e642a2387d6e01 Mon Sep 17 00:00:00 2001
+From: jingjingxyk <[email protected]>
+Date: Sun, 6 Oct 2024 18:59:27 +0800
+Subject: [PATCH] fix readline not work
+
+---
+ ext/readline/readline_cli.c | 19 ++-----------------
+ 1 file changed, 2 insertions(+), 17 deletions(-)
+
+diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
+index 8bf5d23df..0adecf42a 100644
+--- a/ext/readline/readline_cli.c
++++ b/ext/readline/readline_cli.c
+@@ -744,24 +744,9 @@ typedef cli_shell_callbacks_t *(__cdecl *get_cli_shell_callbacks)(void);
+ 	} while(0)
+ 
+ #else
+-/*
+-#ifdef COMPILE_DL_READLINE
+-This dlsym() is always used as even the CGI SAPI is linked against "CLI"-only
+-extensions. If that is being changed dlsym() should only be used when building
+-this extension sharedto offer compatibility.
+-*/
+-#define GET_SHELL_CB(cb) \
+-	do { \
+-		(cb) = NULL; \
+-		cli_shell_callbacks_t *(*get_callbacks)(void); \
+-		get_callbacks = dlsym(RTLD_DEFAULT, "php_cli_get_shell_callbacks"); \
+-		if (get_callbacks) { \
+-			(cb) = get_callbacks(); \
+-		} \
+-	} while(0)
+-/*#else
++
+ #define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()
+-#endif*/
++
+ #endif
+ 
+ PHP_MINIT_FUNCTION(cli_readline)
+-- 
+2.46.2
+

sapi/src/builder/extension/opcache.php

@@ -10,11 +10,14 @@
             ->withOptions('--enable-opcache')
     );
 
-
     // 扩展钩子 写法
     $p->withBeforeConfigureScript('opcache', function (Preprocessor $p) {
         $php_src_dir = $p->getPhpSrcDir();
-        $cmd = "cd {$php_src_dir}/" . PHP_EOL;
+        $cmd = <<<EOF
+        cd {$php_src_dir}/ ;
+
+EOF;
+
         $cmd .= <<<'EOF'
 
         cat > ext/opcache/php_opcache.h <<PHP_OPCACHE_H_EOF

sapi/src/builder/extension/readline.php

@@ -11,4 +11,39 @@
             ->withOptions('--with-readline=' . READLINE_PREFIX)
             ->withDependentLibraries('ncurses', 'readline')
     );
+
+
+    // 扩展钩子
+    $p->withBeforeConfigureScript('readline', function (Preprocessor $p) {
+        $workDir = $p->getWorkDir();
+        $php_src = $p->getPhpSrcDir();
+        $delim = "   ";
+        $cmd = <<<EOF
+        cd {$php_src}/
+
+        # 获得行号
+        # awk '/#ifdef COMPILE_DL_READLINE/ { print NR }' ext/readline/readline_cli.c
+        # grep -n '#ifdef COMPILE_DL_READLINE' ext/readline/readline_cli.c | cut -d ':' -f 1
+        # sed  -n "/#ifdef COMPILE_DL_READLINE/=" ext/readline/readline_cli.c
+
+        grep -n '#ifdef COMPILE_DL_READLINE' ext/readline/readline_cli.c
+        if [ $? = 0 ] ; then
+            # 获得待删除 区间
+            START_LINE_NUM=$(sed  -n "/#ifdef COMPILE_DL_READLINE/=" ext/readline/readline_cli.c)
+            START_LINE_NUM=$((\$START_LINE_NUM - 1))
+            END_LINE_NUM=$(sed  -n "/PHP_MINIT_FUNCTION(cli_readline)/=" ext/readline/readline_cli.c)
+            END_LINE_NUM=$((\$END_LINE_NUM - 5))
+
+            sed -i.backup "\${START_LINE_NUM},\${END_LINE_NUM}d" ext/readline/readline_cli.c
+
+            REPLACE_LINE_NUM=$(sed  -n "/#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()/=" ext/readline/readline_cli.c)
+            REPLACE_LINE_NUM=$((\$REPLACE_LINE_NUM + 1))
+
+            sed -i.backup "\${REPLACE_LINE_NUM} s/.*/  /" ext/readline/readline_cli.c
+
+        fi
+EOF;
+
+        return $cmd;
+    });
 };

sapi/src/builder/library/php.php

@@ -23,6 +23,8 @@
             test -d {$php_src} && rm -rf {$php_src}
 
             cp -rf php {$php_src}
+            echo "{$php_tag}" > {$php_src}/X-PHP-VERSION
+
             rm -rf php
             cd {$build_dir}/
 EOF

sapi/src/template/make.php

@@ -265,6 +265,12 @@
 }
 
 make_config() {
+    PHP_VERSION=<?= BUILD_PHP_VERSION; ?> ;
+    if [ ! -f "<?= $this->phpSrcDir ?>/X-PHP-VERSION" ] ; then
+        bash make.sh php ;
+    fi
+    test "${PHP_VERSION}" = "$(cat '<?= $this->phpSrcDir ?>/X-PHP-VERSION')" || bash make.sh php ;
+
     cd <?= $this->phpSrcDir ?>/
 <?php if (in_array($this->buildType, ['dev'])) : ?>
     # dev 环境 过滤扩展，便于调试单个扩展编译
@@ -285,21 +291,21 @@
 <?php if ($this->getInputOption('with-swoole-cli-sfx')) : ?>
     PHP_VERSION=$(cat main/php_version.h | grep 'PHP_VERSION_ID' | grep -E -o "[0-9]+")
     if [[ $PHP_VERSION -lt 80000 ]] ; then
-        echo "only support PHP >= 8.0 "
+    echo "only support PHP >= 8.0 "
     else
-        # 请把这个做成 patch  https://github.com/swoole/swoole-cli/pull/55/files
-
+    # 请把这个做成 patch  https://github.com/swoole/swoole-cli/pull/55/files
     fi
-<?php endif ;?>
+<?php endif; ?>
 
     cd <?= $this->getPhpSrcDir() ?>/
     test -f ./configure &&  rm ./configure
     ./buildconf --force
 
 <?php if ($this->isMacos()) : ?>
     <?php if ($this->hasLibrary('pgsql')) : ?>
-    sed -i.backup "s/ac_cv_func_explicit_bzero\" = xyes/ac_cv_func_explicit_bzero\" = x_fake_yes/" ./configure
-    <?php endif;?>
+        sed -i.backup "s/ac_cv_func_explicit_bzero\" = xyes/ac_cv_func_explicit_bzero\" = x_fake_yes/" ./configure
+        test -f ./configure.backup && rm -f ./configure.backup
+    <?php endif; ?>
 <?php endif; ?>
 
     export_variables
@@ -317,7 +323,8 @@
 
 <?php if ($this->isLinux()) : ?>
     sed -i.backup 's/-export-dynamic/-all-static/g' Makefile
-<?php endif ; ?>
+    test -f Makefile.backup && rm -f Makefile.backup
+<?php endif; ?>
 
 }
 

sync-source-code.php

@@ -95,6 +95,7 @@
 
     sed -i.backup 's/ext_shared=yes/ext_shared=no/g' ext/opcache/config.m4
     sed -i.backup 's/shared,,/$ext_shared,,/g' ext/opcache/config.m4
+    # sed -i 's/-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1/-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DPHP_ENABLE_OPCACHE/g' ext/opcache/config.m4
     # echo '#include "php.h"\n\nextern zend_module_entry opcache_module_entry;\n#define phpext_opcache_ptr  &opcache_module_entry\n' > ext/opcache/php_opcache.h
     cat > ext/opcache/php_opcache.h <<PHP_OPCACHE_H_EOF
 #include "php.h"
@@ -140,8 +141,8 @@
     # build
     cp -rf $SRC/build/ ./build
 
-    # TSRM
-    cp -rf $SRC/TSRM/ ./TSRM
+    # TSRM (more info: https://github.com/swoole/swoole-cli/commit/172c76445a631abb1b32fc2a721a2dd9d5a5fc0d)
+    # cp -rf $SRC/TSRM/ ./TSRM
 
     cp -f $SRC/configure.ac ./configure.ac
     cp -f $SRC/buildconf ./buildconf
@@ -153,22 +154,29 @@
     # 在sed命令中，常见的需要转义的字符有：\、/、$、&、.、*、[、]等
     #                                反斜杠、正斜杠、美元符号、引用符号、点号、星号、方括号等
 
-    test -f main/main.c.backup && rm -f main/main.c.backup
-    test -f ext/opcache/config.m4.backup && rm -f ext/opcache/config.m4.backup
 
 
-    # fpm
-    cp -rf $SRC/sapi/fpm/fpm ./sapi/cli/
+    # fpm  [Need to manually compare fpm_main.c]
+    # cp -rf $SRC/sapi/fpm/fpm ./sapi/cli/
     sed -i.backup 's/int main(int argc, char \*argv\[\])/int fpm_main(int argc, char \*argv\[\])/g' ./sapi/cli/fpm/fpm_main.c
-    sed -i.backup 's/{'-', 0, NULL}/{'P', 0, "fpm"},\n	{'-', 0, NULL}/g' ./sapi/cli/fpm/fpm_main.c
-
-
+    # sed -i.backup "s/{'-', 0, NULL}/{'P', 0, \"fpm\"},\n	{'-', 0, NULL}/g" ./sapi/cli/fpm/fpm_main.c
 
     # cli
     cp -rf $SRC/sapi/cli/ps_title.c ./sapi/cli
     cp -rf $SRC/sapi/cli/generate_mime_type_map.php ./sapi/cli
     cp -rf $SRC/sapi/cli/php.1.in ./sapi/cli
 
+
+    # clean file
+    test -f main/main.c.backup && rm -f main/main.c.backup
+    test -f ext/opcache/config.m4.backup && rm -f ext/opcache/config.m4.backup
+    test -f sapi/cli/fpm/fpm_main.c.backup && rm -f sapi/cli/fpm/fpm_main.c.backup
+
+    # ext readline_cli patch
+    cp -f sapi/patches/0001-fix-readline-not-work.patch 0001-fix-readline-not-work.patch
+    { git apply --check 0001-fix-readline-not-work.patch ; } && { git apply 0001-fix-readline-not-work.patch ; }
+
+
 EOF;
 
 echo PHP_EOL;