From 9a5a59d8764d481ed5e527d987abdbbd7aa3eb92 Mon Sep 17 00:00:00 2001 From: crazywhalecc Date: Sun, 3 Aug 2025 01:49:15 +0800 Subject: [PATCH] Test --- src/SPC/builder/linux/LinuxBuilder.php | 4 ++-- src/SPC/store/SourcePatcher.php | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SPC/builder/linux/LinuxBuilder.php b/src/SPC/builder/linux/LinuxBuilder.php index b0f1efe7..cb3d7c6f 100644 --- a/src/SPC/builder/linux/LinuxBuilder.php +++ b/src/SPC/builder/linux/LinuxBuilder.php @@ -100,7 +100,7 @@ class LinuxBuilder extends UnixBuilderBase // $musl_flag = SPCTarget::getLibc() === 'musl' ? ' -D__MUSL__' : ' -U__MUSL__'; $php_configure_env = SystemUtil::makeEnvVarString([ 'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'), - 'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . $musl_flag, + 'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH . ' -Dsomethinghere', // . $musl_flag, 'LDFLAGS' => '-L' . BUILD_LIB_PATH, // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions! ]); @@ -359,7 +359,7 @@ class LinuxBuilder extends UnixBuilderBase $static = SPCTarget::isStatic() ? '-all-static' : ''; $lib = BUILD_LIB_PATH; return [ - // 'CPPFLAGS' => SPCTarget::getLibc() === 'musl' ? '-D__MUSL__' : '-U__MUSL__', + 'CPPFLAGS' => '-Dsomethinghere', 'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'), 'EXTRA_LIBS' => $config['libs'], 'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), diff --git a/src/SPC/store/SourcePatcher.php b/src/SPC/store/SourcePatcher.php index 1f00db68..6d15face 100644 --- a/src/SPC/store/SourcePatcher.php +++ b/src/SPC/store/SourcePatcher.php @@ -87,6 +87,7 @@ class SourcePatcher } // patch configure.ac + /* $musl = SPCTarget::getLibc() === 'musl'; FileSystem::replaceFileStr( SOURCE_PATH . '/php-src/configure.ac', @@ -96,6 +97,7 @@ class SourcePatcher if (getenv('SPC_LIBC') === false && ($libc = SPCTarget::getLibc()) !== null) { putenv("SPC_LIBC={$libc}"); } + */ // patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');