Merge pull request #622 from DubbleClick/libacl

bring back pr for libacl

Author: crazywhalecc

.github/workflows/build-unix.yml

@@ -15,7 +15,7 @@ on:
       php-version:
         required: true
         description: PHP version to compile
-        default: '8.3'
+        default: '8.4'
         type: choice
         options:
           - '8.4'

bin/spc-gnu-docker

@@ -137,4 +137,4 @@ echo 'SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm -lresolv -lutil -lrt"'
 # shellcheck disable=SC2086
 # shellcheck disable=SC2090
 
-$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH # bin/spc $@
+$DOCKER_EXECUTABLE run --rm $INTERACT -e SPC_FIX_DEPLOY_ROOT="$(pwd)" --env-file /tmp/spc-gnu-docker.env $MOUNT_LIST cwcc-spc-gnu-$SPC_USE_ARCH bin/spc $@

config/env.ini

@@ -35,7 +35,6 @@
 ;   SPC_LINUX_DEFAULT_CC:                   the default compiler for linux. (For alpine linux: `gcc`, default: `$GNU_ARCH-linux-musl-gcc`)
 ;   SPC_LINUX_DEFAULT_CXX:                  the default c++ compiler for linux. (For alpine linux: `g++`, default: `$GNU_ARCH-linux-musl-g++`)
 ;   SPC_LINUX_DEFAULT_AR:                   the default archiver for linux. (For alpine linux: `ar`, default: `$GNU_ARCH-linux-musl-ar`)
-;   SPC_PHP_DEFAULT_LD_LIBRARY_PATH_CMD:    the default LD_LIBRARY_PATH for php. (linux: `LD_LIBRARY_PATH=/usr/local/musl/$GNU_ARCH-linux-musl/lib`, default: empty)
 
 
 [global]
@@ -45,6 +44,14 @@ SPC_CONCURRENCY=${CPU_COUNT}
 SPC_SKIP_PHP_VERSION_CHECK="no"
 ; Ignore some check item for bin/spc doctor command, comma separated (e.g. SPC_SKIP_DOCTOR_CHECK_ITEMS="if homebrew has installed")
 SPC_SKIP_DOCTOR_CHECK_ITEMS=""
+; EXTENSION_DIR where the built php will look for extension when a .ini instructs to load them
+; only useful for builds targeting glibc --libc=glibc
+; default paths
+; Ubuntu/Debian: /usr/lib/php/{PHP_VERSION}/
+; RHEL: /usr/lib64/php/modules
+; Alpine: /usr/lib/php{PHP_VERSION}/modules
+; where {PHP_VERSION} is 84 for php 8.4
+EXTENSION_DIR=
 
 [windows]
 ; php-sdk-binary-tools path
@@ -63,7 +70,7 @@ CXX=${SPC_LINUX_DEFAULT_CXX}
 AR=${SPC_LINUX_DEFAULT_AR}
 LD=ld.gold
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS=
+SPC_DEFAULT_C_FLAGS="-fPIC"
 SPC_DEFAULT_CXX_FLAGS=
 ; extra libs for building php executable, used in `make` command for building php (this value may changed by extension build process, space separated)
 SPC_EXTRA_LIBS=
@@ -76,7 +83,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime
 ; buildconf command
 SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 ; configure command
-SPC_CMD_PREFIX_PHP_CONFIGURE="${SPC_PHP_DEFAULT_LD_LIBRARY_PATH_CMD} ./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg --with-pic"
+SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg --with-pic"
 ; make command
 SPC_CMD_PREFIX_PHP_MAKE="make -j${CPU_COUNT}"
 ; embed type for php, static (libphp.a) or shared (libphp.so)
@@ -117,8 +124,6 @@ SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
 SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-cgi --disable-phpdbg"
 ; make command
 SPC_CMD_PREFIX_PHP_MAKE="make -j${CPU_COUNT}"
-; embed type for php, static or shared
-SPC_CMD_VAR_PHP_EMBED_TYPE="static"
 
 ; *** default build vars for building php ***
 ; CFLAGS for configuring php
@@ -131,6 +136,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/lib.json

@@ -9,8 +9,13 @@
         "type": "root",
         "source": "php-src",
         "lib-depends": [
-            "micro",
-            "lib-base"
+            "lib-base",
+            "micro"
+        ],
+        "lib-depends-linux": [
+            "lib-base",
+            "libacl",
+            "micro"
         ]
     },
     "micro": {
@@ -24,6 +29,12 @@
             "pkg-config"
         ]
     },
+    "attr": {
+        "source": "attr",
+        "static-libs-unix": [
+            "libattr.a"
+        ]
+    },
     "brotli": {
         "source": "brotli",
         "static-libs-unix": [
@@ -234,6 +245,15 @@
             "libsodium"
         ]
     },
+    "libacl": {
+        "source": "libacl",
+        "static-libs-unix": [
+            "libacl.a"
+        ],
+        "lib-depends": [
+            "attr"
+        ]
+    },
     "libaom": {
         "source": "libaom",
         "static-libs-unix": [

config/source.json

@@ -36,6 +36,16 @@
             "path": "LICENSE"
         }
     },
+    "attr": {
+        "type": "git",
+        "rev": "v2.5.2",
+        "url": "https://git.savannah.nongnu.org/git/attr.git",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "doc/COPYING"
+        }
+    },
     "brotli": {
         "type": "ghtar",
         "repo": "google/brotli",
@@ -323,6 +333,16 @@
             "path": "LICENSE"
         }
     },
+    "libacl": {
+        "type": "git",
+        "rev": "v2.3.2",
+        "url": "https://git.savannah.nongnu.org/git/acl.git",
+        "provide-pre-built": true,
+        "license": {
+            "type": "file",
+            "path": "doc/COPYING"
+        }
+    },
     "libaom": {
         "type": "git",
         "rev": "main",

src/SPC/builder/Extension.php

@@ -139,7 +139,8 @@ public function getUnixConfigureArg(): string
 
     /**
      * 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 @@ public function patchBeforeBuildconf(): bool
 
     /**
      * 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 @@ public function patchBeforeConfigure(): bool
 
     /**
      * 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

@@ -113,7 +113,7 @@ public function calcDependency(): void
         /*
         Rules:
             If it is a Windows system, try the following dependencies in order: lib-depends-windows, lib-depends-win, lib-depends.
-            If it is a macOS system, try the following dependencies in order: lib-depends-darwin, lib-depends-unix, lib-depends.
+            If it is a macOS system, try the following dependencies in order: lib-depends-macos, lib-depends-unix, lib-depends.
             If it is a Linux system, try the following dependencies in order: lib-depends-linux, lib-depends-unix, lib-depends.
         */
         foreach (Config::getLib(static::NAME, 'lib-depends', []) as $dep_name) {
@@ -261,14 +261,6 @@ public function tryBuild(bool $force_build = false): int
         return LIB_STATUS_ALREADY;
     }
 
-    /**
-     * Patch before build, overwrite this and return true to patch libs.
-     */
-    public function patchBeforeBuild(): bool
-    {
-        return false;
-    }
-
     public function validate(): void
     {
         // do nothing, just throw wrong usage exception if not valid
@@ -294,6 +286,46 @@ public function beforePack(): void
         // do something before pack, default do nothing. overwrite this method to do something (e.g. modify pkg-config file)
     }
 
+    /**
+     * Patch code before build
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
+     */
+    public function patchBeforeBuild(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Patch code before ./buildconf
+     * If you need to patch some code, overwrite this
+     * return true if you patched something, false if not
+     */
+    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;
+    }
+
     /**
      * Build this library.
      *

src/SPC/builder/linux/LinuxBuilder.php

@@ -37,9 +37,13 @@ public function __construct(array $options = [])
         GlobalEnvManager::init($this);
 
         // set library path, some libraries need it. (We cannot use `putenv` here, because cmake will be confused)
-        if (!filter_var(getenv('SPC_NO_MUSL_PATH'), FILTER_VALIDATE_BOOLEAN)) {
+        if (!filter_var(getenv('SPC_NO_MUSL_PATH'), FILTER_VALIDATE_BOOLEAN) && $this->libc !== LIBC_GLIBC) {
             $this->setOptionIfNotExist('library_path', "LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
             $this->setOptionIfNotExist('ld_library_path', "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\"");
+            GlobalEnvManager::putenv("PATH=/usr/local/musl/bin:/usr/local/musl/{$arch}-linux-musl/bin:" . getenv('PATH'));
+            $configure = getenv('SPC_CMD_PREFIX_PHP_CONFIGURE');
+            $configure = "LD_LIBRARY_PATH=\"/usr/local/musl/{$arch}-linux-musl/lib\" " . $configure;
+            GlobalEnvManager::putenv("SPC_CMD_PREFIX_PHP_CONFIGURE={$configure}");
         }
 
         if (str_ends_with(getenv('CC'), 'linux-musl-gcc') && !file_exists("/usr/local/musl/bin/{$arch}-linux-musl-gcc") && (getenv('SPC_NO_MUSL_PATH') !== 'yes')) {
@@ -174,7 +178,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
             ->exec(
                 getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
                 ($enable_cli ? '--enable-cli ' : '--disable-cli ') .
-                ($enable_fpm ? '--enable-fpm ' : '--disable-fpm ') .
+                ($enable_fpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
                 ($enable_embed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
                 ($enable_micro ? '--enable-micro=all-static ' : '--disable-micro ') .
                 $config_file_path .

src/SPC/builder/linux/library/attr.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class attr extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\attr;
+
+    public const NAME = 'attr';
+}

src/SPC/builder/linux/library/libacl.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\linux\library;
+
+class libacl extends LinuxLibraryBase
+{
+    use \SPC\builder\unix\library\libacl;
+
+    public const NAME = 'libacl';
+}