Merge pull request #693 from jingjingxyk/build_native_php

Build native php
swoole · Jul 11, 2024 · 4b3ad9a · 4b3ad9a
2 parents dac46cf + 3ba47bf
commit 4b3ad9a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# build static php-cli runtime
+# build static php-cli runtime  and php-fpm
 
-构建静态 原生 php-cli 运行时
+构建静态 原生 php-cli 运行时 和 fastcgi 进程管理器 php-fpm
 
 ## 说明
 

diff --git a/prepare.php b/prepare.php
@@ -10,6 +10,13 @@
 $p = Preprocessor::getInstance();
 $p->parseArguments($argc, $argv);
 
+$buildType = $p->getBuildType();
+if ($p->getInputOption('with-build-type')) {
+    $buildType = $p->getInputOption('with-build-type');
+    $p->setBuildType($buildType);
+}
+
+# clean
 # clean old make.sh
 $p->cleanFile(__DIR__ . '/make.sh');
 $p->cleanFile(__DIR__ . '/make-install-deps.sh');
@@ -78,6 +85,8 @@
 echo "CUSTOM_PHP_VERSION_ID: " . BUILD_CUSTOM_PHP_VERSION_ID . PHP_EOL;
 echo PHP_EOL;
 
+// Sync code from php-src
+$p->setPhpSrcDir($p->getWorkDir() . '/var/php-' . BUILD_PHP_VERSION);
 
 // Compile directly on the host machine, not in the docker container
 if ($p->getInputOption('without-docker') || ($p->isMacos())) {
@@ -102,6 +111,7 @@
     $p->setExtEnabled([]);
 }
 
+
 if ($p->getInputOption('with-global-prefix')) {
     $p->setGlobalPrefix($p->getInputOption('with-global-prefix'));
 }
@@ -188,9 +198,5 @@
 
 function install_libraries(Preprocessor $p): void
 {
-    if ($p->getInputOption('with-c-compiler') == 'x86_64-linux-musl-gcc') {
-        $p->loadDependentLibrary('musl_cross_make');
-    }
-
     $p->loadDependentLibrary('php');
 }
diff --git a/sapi/src/Preprocessor.php b/sapi/src/Preprocessor.php
@@ -294,6 +294,11 @@ public function getWorkDir(): string
         return $this->workDir;
     }
 
+    public function getWorkExtDir(): string
+    {
+        return $this->workDir . '/ext/';
+    }
+
     public function setExtraLdflags(string $flags)
     {
         $this->extraLdflags = $flags;
@@ -454,7 +459,7 @@ public function donotInstallLibrary(): void
     /**
      * @param string $url
      * @param string $file
-     * @param object|null $project
+     * @param object|null $project [ $lib or $ext ]
      * @param string $httpProxyConfig
      * @return void
      */
@@ -1190,7 +1195,7 @@ public function execute(): void
         $this->setExtensionDependency();
 
         if ($this->getInputOption('skip-download')) {
-            $this->generateLibraryDownloadLinks();
+            $this->generateDownloadLinks();
         }
 
         $this->generateFile(__DIR__ . '/template/make-install-deps.php', $this->rootDir . '/make-install-deps.sh');

diff --git a/sapi/src/PreprocessorTrait/DownloadBoxTrait.php b/sapi/src/PreprocessorTrait/DownloadBoxTrait.php
@@ -23,7 +23,7 @@ trait DownloadBoxTrait
 
 EOF;
 
-    protected function generateLibraryDownloadLinks(): void
+    protected function generateDownloadLinks(): void
     {
         $this->mkdirIfNotExists($this->getRootDir() . '/var/download-box/', 0755, true);
 

diff --git a/sapi/src/builder/extension/aaa_example.php b/sapi/src/builder/extension/aaa_example.php
@@ -122,9 +122,10 @@
 
     // 扩展钩子 写法
     $p->withBeforeConfigureScript('swoole', function (Preprocessor $p) {
-        $workdir = $p->getWorkDir();
+        $workDir = $p->getWorkDir();
+        $workExtDir = $p->getWorkExtDir();
         $cmd = <<<EOF
-        cd {$workdir}
+        cd {$workDir}
         # 构建之前对 swoole 源码做一些特别处理
         # 比如加载一个补丁等
         # 比如修改 swoole 源码的构建文件