crazywhalecc/static-php-cli
1
0
Fork 0
mirror of https://github.com/crazywhalecc/static-php-cli.git synced 2026-07-09 01:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

SPC_DEFAULT_LD_FLAGS renamed to SPC_DEFAULT_LDFLAGS

Browse Source
This commit is contained in:
crazywhalecc
2026-05-07 14:56:07 +08:00
parent 9e4a622f42
commit e93d103e99
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/env.ini
View File

@@ -104,7 +104,7 @@ LD=${SPC_DEFAULT_LD}
; default compiler flags, used in CMake toolchain file, openssl and pkg-config build ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections" SPC_DEFAULT_CFLAGS="-fPIC -O3 -pipe -fno-plt -fno-semantic-interposition -fstack-clash-protection -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}" SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
SPC_DEFAULT_LD_FLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections" SPC_DEFAULT_LDFLAGS="-Wl,-z,relro -Wl,--as-needed -Wl,-z,now -Wl,-z,noexecstack -Wl,--gc-sections"
; upx executable path ; upx executable path
UPX_EXEC=${PKG_ROOT_PATH}/bin/upx UPX_EXEC=${PKG_ROOT_PATH}/bin/upx
; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
@@ -144,7 +144,7 @@ LD=${SPC_DEFAULT_LD}
; default compiler flags, used in CMake toolchain file, openssl and pkg-config build ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-plt -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections" SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-plt -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}" SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
SPC_DEFAULT_LD_FLAGS="-Wl,-dead_strip" SPC_DEFAULT_LDFLAGS="-Wl,-dead_strip"
; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches ; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches
SPC_MICRO_PATCHES=cli_checks,macos_iconv SPC_MICRO_PATCHES=cli_checks,macos_iconv

6
src/Package/Library/imagemagick.php
View File

@@ -19,10 +19,10 @@ class imagemagick
#[BuildFor('Linux')] #[BuildFor('Linux')]
public function buildUnix(LibraryPackage $lib, ToolchainInterface $toolchain): void public function buildUnix(LibraryPackage $lib, ToolchainInterface $toolchain): void
{ {
$ldflags = $original_ldflags = getenv('SPC_DEFAULT_LD_FLAGS'); $ldflags = $original_ldflags = getenv('SPC_DEFAULT_LDFLAGS');
if (str_contains($ldflags, '-Wl,--as-needed')) { if (str_contains($ldflags, '-Wl,--as-needed')) {
$ldflags = str_replace('-Wl,--as-needed', '', $ldflags); $ldflags = str_replace('-Wl,--as-needed', '', $ldflags);
f_putenv("SPC_DEFAULT_LD_FLAGS={$ldflags}"); f_putenv("SPC_DEFAULT_LDFLAGS={$ldflags}");
} }
$ac = UnixAutoconfExecutor::create($lib) $ac = UnixAutoconfExecutor::create($lib)
@@ -58,7 +58,7 @@ class imagemagick
$ac->configure()->make(); $ac->configure()->make();
f_putenv("SPC_DEFAULT_LD_FLAGS={$original_ldflags}"); f_putenv("SPC_DEFAULT_LDFLAGS={$original_ldflags}");
$filelist = [ $filelist = [
'ImageMagick.pc', 'ImageMagick.pc',

4
src/StaticPHP/Package/LibraryPackage.php
View File

@@ -160,8 +160,8 @@ class LibraryPackage extends Package
// get environment variable // get environment variable
$env = getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: ''; $env = getenv($this->getSnakeCaseName() . '_LDFLAGS') ?: '';
// get default ld flags // get default ld flags
$arch_ld_flags = getenv('SPC_DEFAULT_LD_FLAGS') ?: ''; $arch_ld_flags = getenv('SPC_DEFAULT_LDFLAGS') ?: '';
if (!empty(getenv('SPC_DEFAULT_LD_FLAGS')) && !str_contains($env, $arch_ld_flags)) { if (!empty(getenv('SPC_DEFAULT_LDFLAGS')) && !str_contains($env, $arch_ld_flags)) {
$env .= ' ' . $arch_ld_flags; $env .= ' ' . $arch_ld_flags;
} }
return trim($env); return trim($env);