requested changes

config/env.custom.ini

@@ -1,14 +0,0 @@
-; Modify this file name to `env.custom.ini`, and run `bin/spc-gnu-docker`,
-; you can compile a GNU libc based static binary !
-[global]
-SPC_SKIP_DOCTOR_CHECK_ITEMS="if musl-wrapper is installed,if musl-cross-make is installed"
-
-[linux]
-CC=gcc
-CXX=g++
-AR=ar
-LD=ld
-SPC_DEFAULT_C_FLAGS=-fPIC
-SPC_NO_MUSL_PATH=yes
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-Wl,-O1 -pie"
-SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil"

config/env.ini

@@ -129,6 +129,8 @@ SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="${SPC_PHP_DEFAULT_OPTIMIZE_CFLAGS}"
 ; EXTRA_LIBS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-lresolv"
+; embed type for php, static (libphp.a) or shared (libphp.dylib)
+SPC_CMD_VAR_PHP_EMBED_TYPE="static"
 
 [freebsd]
 ; compiler environments

config/source.json

@@ -40,7 +40,7 @@
         "type": "git",
         "rev": "v2.5.2",
         "url": "https://git.savannah.nongnu.org/git/attr.git",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "doc/COPYING"
@@ -337,7 +337,7 @@
         "type": "git",
         "rev": "v2.3.2",
         "url": "https://git.savannah.nongnu.org/git/acl.git",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "doc/COPYING"

src/SPC/builder/Extension.php

@@ -139,7 +139,8 @@ class Extension
 
     /**
      * Patch code before ./buildconf
-     * If you need to patch some code, overwrite this and return true
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
      */
     public function patchBeforeBuildconf(): bool
     {
@@ -148,7 +149,8 @@ class Extension
 
     /**
      * Patch code before ./configure
-     * If you need to patch some code, overwrite this and return true
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
      */
     public function patchBeforeConfigure(): bool
     {
@@ -157,7 +159,8 @@ class Extension
 
     /**
      * Patch code before make
-     * If you need to patch some code, overwrite this and return true
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
      */
     public function patchBeforeMake(): bool
     {

src/SPC/builder/LibraryBase.php

@@ -294,11 +294,31 @@ abstract class LibraryBase
         // do something before pack, default do nothing. overwrite this method to do something (e.g. modify pkg-config file)
     }
 
+    /**
+     * Patch code before ./buildconf
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if notand return true
+     */
+    public function patchBeforeBuildconf(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Patch code before ./configure
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
+     */
     public function patchBeforeConfigure(): bool
     {
         return false;
     }
 
+    /**
+     * Patch code before make
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
+     */
     public function patchBeforeMake(): bool
     {
         return false;

src/SPC/store/SourcePatcher.php

@@ -47,6 +47,11 @@ class SourcePatcher
                 logger()->info('Extension [' . $ext->getName() . '] patched before buildconf');
             }
         }
+        foreach ($builder->getLibs() as $lib) {
+            if ($lib->patchBeforeBuildconf() === true) {
+                logger()->info('Library [' . $lib->getName() . '] patched before buildconf');
+            }
+        }
         // patch windows php 8.1 bug
         if (PHP_OS_FAMILY === 'Windows' && $builder->getPHPVersionID() >= 80100 && $builder->getPHPVersionID() < 80200) {
             logger()->info('Patching PHP 8.1 windows Fiber bug');