diff --git a/config/env.ini b/config/env.ini index 4df65520..62aeceed 100644 --- a/config/env.ini +++ b/config/env.ini @@ -94,7 +94,7 @@ SPC_MICRO_PATCHES=static_extensions_win32,cli_checks,disable_huge_page,vcruntime ; `native-native` - links against system libc dynamically ; `native-native-musl` - links against musl libc statically ; `native-native-musl -dynamic` - links against musl libc dynamically -SPC_TARGET=native-native +SPC_TARGET=${GNU_ARCH}-linux ; compiler environments (default value is defined by selected toolchain) CC=${SPC_DEFAULT_CC} @@ -143,8 +143,8 @@ AR=${SPC_DEFAULT_AR} LD=${SPC_DEFAULT_LD} ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os" -SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os" -SPC_DEFAULT_LD_FLAGS="" +SPC_DEFAULT_CXX_FLAGS="${SPC_DEFAULT_C_FLAGS}" +SPC_DEFAULT_LD_FLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections" ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches SPC_MICRO_PATCHES=cli_checks,macos_iconv @@ -152,13 +152,13 @@ SPC_MICRO_PATCHES=cli_checks,macos_iconv ; 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-phpdbg" +SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-phpdbg --enable-rtld-now --enable-re2c-cgoto --disable-rpath --with-pic" ; *** default build vars for building php *** ; embed type for php, static (libphp.a) or shared (libphp.dylib) SPC_CMD_VAR_PHP_EMBED_TYPE="static" ; EXTRA_CFLAGS for `configure` and `make` php -SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Werror=unknown-warning-option ${SPC_DEFAULT_C_FLAGS}" +SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -fvisibility=hidden -fvisibility-inlines-hidden -Werror=unknown-warning-option ${SPC_DEFAULT_C_FLAGS}" ; EXTRA_CXXFLAGS for `configure` and `make` php SPC_CMD_VAR_PHP_MAKE_EXTRA_CXXFLAGS="-g -fstack-protector-strong -fno-ident -fpie -Werror=unknown-warning-option ${SPC_DEFAULT_CXX_FLAGS}" ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.dylib diff --git a/config/pkg/ext/ext-gearman.yml b/config/pkg/ext/ext-gearman.yml index eb01dc7b..7699a344 100644 --- a/config/pkg/ext/ext-gearman.yml +++ b/config/pkg/ext/ext-gearman.yml @@ -13,4 +13,4 @@ ext-gearman: os: - Linux - Darwin - arg-type: custom + arg-type: '--with-gearman@shared_path_suffix@' diff --git a/src/Package/Extension/gearman.php b/src/Package/Extension/gearman.php deleted file mode 100644 index e7b516e7..00000000 --- a/src/Package/Extension/gearman.php +++ /dev/null @@ -1,20 +0,0 @@ -getLibraryPackage('libgearman')->getBuildRootPath(); - } -}