Merge pull request #726 from crazywhalecc/fix/icurel

Fix PIC errors when building libphp.so | extensive extension building rework

Author: henderkes

.gitignore

@@ -10,6 +10,9 @@ docker/source/
 # default source extract directory
 /source/**
 
+# built by shared embed tests
+/locale/
+
 # default source download directory
 /downloads/**
 

bin/spc-gnu-docker

@@ -72,6 +72,7 @@ RUN yum update -y && \
     yum install -y devtoolset-10-gcc-*
 RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
+RUN yum install -y which
 
 RUN curl -o cmake.tgz -fsSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$BASE_ARCH.tar.gz && \
     mkdir /cmake && \

config/env.ini

@@ -68,8 +68,8 @@ 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="-fPIC"
-SPC_DEFAULT_CXX_FLAGS=
+SPC_DEFAULT_C_FLAGS="-fpic -Os"
+SPC_DEFAULT_CXX_FLAGS="-fpic -Os"
 ; 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=
 ; upx executable path
@@ -81,25 +81,27 @@ 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="./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 --disable-shared --enable-static --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)
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
 
 ; *** default build vars for building php ***
 ; CFLAGS for configuring php
-SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fPIE"
+SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS="${SPC_DEFAULT_C_FLAGS} -fpie"
 ; CPPFLAGS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
 ; LDFLAGS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 ; LIBS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LIBS="-ldl -lpthread -lm"
 ; EXTRA_CFLAGS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Os -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-ident -fPIE -fPIC"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fpie ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LIBS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-ldl -lpthread -lm"
+; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
+SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 ; EXTRA_LDFLAGS_PROGRAM for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
 
@@ -108,8 +110,8 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS_PROGRAM="-all-static -Wl,-O1 -pie"
 CC=clang
 CXX=clang++
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin"
-SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin"
+SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
+SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 ; 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=
 ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -131,7 +133,7 @@ SPC_CMD_VAR_PHP_CONFIGURE_CPPFLAGS="-I${BUILD_INCLUDE_PATH}"
 ; LDFLAGS for configuring php
 SPC_CMD_VAR_PHP_CONFIGURE_LDFLAGS="-L${BUILD_LIB_PATH}"
 ; EXTRA_CFLAGS for `make` php
-SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Os -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie ${SPC_DEFAULT_C_FLAGS}"
 ; EXTRA_LIBS for `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LIBS="-lresolv"
 ; embed type for php, static (libphp.a) or shared (libphp.dylib)

config/ext.json

@@ -24,6 +24,14 @@
     "bcmath": {
         "type": "builtin"
     },
+    "brotli": {
+        "type": "external",
+        "source": "ext-brotli",
+        "arg-type": "enable",
+        "lib-depends": [
+            "brotli"
+        ]
+    },
     "bz2": {
         "type": "builtin",
         "arg-type-unix": "with-prefix",
@@ -95,7 +103,10 @@
     "ev": {
         "type": "external",
         "source": "ev",
-        "arg-type-windows": "with"
+        "arg-type-windows": "with",
+        "ext-depends": [
+            "sockets"
+        ]
     },
     "event": {
         "support": {
@@ -124,10 +135,6 @@
             "Linux": "partial",
             "BSD": "wip"
         },
-        "target": [
-            "static",
-            "shared"
-        ],
         "notes": true,
         "arg-type": "custom",
         "type": "builtin",
@@ -323,6 +330,16 @@
             "openssl"
         ]
     },
+    "libxml": {
+        "support": {
+            "BSD": "wip"
+        },
+        "type": "builtin",
+        "arg-type": "none",
+        "target": [
+            "static"
+        ]
+    },
     "lz4": {
         "support": {
             "Windows": "wip",
@@ -335,19 +352,12 @@
             "liblz4"
         ]
     },
-    "libxml": {
-        "support": {
-            "BSD": "wip"
-        },
-        "type": "builtin",
-        "arg-type": "none",
-        "ext-depends": [
-            "xml"
-        ]
-    },
     "mbregex": {
         "type": "builtin",
         "arg-type": "custom",
+        "target": [
+            "static"
+        ],
         "ext-depends": [
             "mbstring"
         ],
@@ -380,13 +390,13 @@
         "ext-depends": [
             "zlib",
             "session"
-        ]
+        ],
+        "build-with-php": true
     },
     "memcached": {
         "support": {
             "Windows": "wip",
-            "BSD": "wip",
-            "Linux": "no"
+            "BSD": "wip"
         },
         "type": "external",
         "source": "memcached",
@@ -395,6 +405,10 @@
         "lib-depends": [
             "libmemcached"
         ],
+        "lib-depends-unix": [
+            "libmemcached",
+            "fastlz"
+        ],
         "ext-depends": [
             "session",
             "zlib"
@@ -413,6 +427,10 @@
             "openssl",
             "zstd",
             "zlib"
+        ],
+        "frameworks": [
+            "CoreFoundation",
+            "Security"
         ]
     },
     "msgpack": {
@@ -422,7 +440,10 @@
         "type": "external",
         "source": "msgpack",
         "arg-type-unix": "with",
-        "arg-type-win": "enable"
+        "arg-type-win": "enable",
+        "ext-depends": [
+            "session"
+        ]
     },
     "mysqli": {
         "type": "builtin",
@@ -461,7 +482,8 @@
     },
     "opcache": {
         "type": "builtin",
-        "arg-type-unix": "custom"
+        "arg-type-unix": "custom",
+        "zend-extension": true
     },
     "openssl": {
         "notes": true,
@@ -650,6 +672,9 @@
         "arg-type": "with-prefix",
         "lib-depends": [
             "readline"
+        ],
+        "target": [
+            "static"
         ]
     },
     "redis": {
@@ -669,10 +694,12 @@
         ]
     },
     "session": {
-        "type": "builtin"
+        "type": "builtin",
+        "build-with-php": true
     },
     "shmop": {
-        "type": "builtin"
+        "type": "builtin",
+        "build-with-php": true
     },
     "simdjson": {
         "type": "external",
@@ -690,7 +717,8 @@
         ],
         "ext-depends-windows": [
             "xml"
-        ]
+        ],
+        "build-with-php": true
     },
     "snappy": {
         "support": {
@@ -783,7 +811,7 @@
         "lib-depends": [
             "libssh2"
         ],
-        "ext-depends-windows": [
+        "ext-depends": [
             "openssl",
             "zlib"
         ]
@@ -793,9 +821,6 @@
             "Windows": "no",
             "BSD": "wip"
         },
-        "target": [
-            "static"
-        ],
         "notes": true,
         "type": "external",
         "source": "swoole",
@@ -913,7 +938,8 @@
         ]
     },
     "tokenizer": {
-        "type": "builtin"
+        "type": "builtin",
+        "build-with-php": true
     },
     "uuid": {
         "support": {
@@ -954,7 +980,8 @@
             "Darwin": "partial",
             "Linux": "partial"
         },
-        "notes": true
+        "notes": true,
+        "zend-extension": true
     },
     "xhprof": {
         "support": {
@@ -966,7 +993,8 @@
         "source": "xhprof",
         "ext-depends": [
             "ctype"
-        ]
+        ],
+        "build-with-php": true
     },
     "xlswriter": {
         "support": {
@@ -996,7 +1024,8 @@
         ],
         "ext-depends-windows": [
             "iconv"
-        ]
+        ],
+        "build-with-php": true
     },
     "xmlreader": {
         "support": {
@@ -1010,7 +1039,8 @@
         "ext-depends-windows": [
             "xml",
             "dom"
-        ]
+        ],
+        "build-with-php": true
     },
     "xmlwriter": {
         "support": {
@@ -1023,7 +1053,8 @@
         ],
         "ext-depends-windows": [
             "xml"
-        ]
+        ],
+        "build-with-php": true
     },
     "xsl": {
         "support": {
@@ -1040,13 +1071,24 @@
             "dom"
         ]
     },
+    "xz": {
+        "type": "external",
+        "source": "ext-xz",
+        "arg-type": "with",
+        "lib-depends": [
+            "xz"
+        ]
+    },
     "yac": {
         "support": {
             "BSD": "wip"
         },
         "type": "external",
         "source": "yac",
         "arg-type-unix": "custom",
+        "lib-depends-unix": [
+            "fastlz"
+        ],
         "ext-depends-unix": [
             "igbinary"
         ]
@@ -1067,9 +1109,6 @@
         "support": {
             "BSD": "wip"
         },
-        "target": [
-            "static"
-        ],
         "type": "builtin",
         "arg-type": "with-prefix",
         "arg-type-windows": "enable",
@@ -1093,6 +1132,9 @@
         "arg-type-windows": "enable",
         "lib-depends": [
             "zlib"
+        ],
+        "target": [
+            "static"
         ]
     },
     "zstd": {