Skip to content

Commit 9a5a59d

Browse files
committed
Test
1 parent e7fe91f commit 9a5a59d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/SPC/builder/linux/LinuxBuilder.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
100100
// $musl_flag = SPCTarget::getLibc() === 'musl' ? ' -D__MUSL__' : ' -U__MUSL__';
101101
$php_configure_env = SystemUtil::makeEnvVarString([
102102
'CFLAGS' => getenv('SPC_CMD_VAR_PHP_CONFIGURE_CFLAGS'),
103-
'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . $musl_flag,
103+
'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH . ' -Dsomethinghere', // . $musl_flag,
104104
'LDFLAGS' => '-L' . BUILD_LIB_PATH,
105105
// 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
106106
]);
@@ -359,7 +359,7 @@ private function getMakeExtraVars(): array
359359
$static = SPCTarget::isStatic() ? '-all-static' : '';
360360
$lib = BUILD_LIB_PATH;
361361
return [
362-
// 'CPPFLAGS' => SPCTarget::getLibc() === 'musl' ? '-D__MUSL__' : '-U__MUSL__',
362+
'CPPFLAGS' => '-Dsomethinghere',
363363
'EXTRA_CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
364364
'EXTRA_LIBS' => $config['libs'],
365365
'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'),

src/SPC/store/SourcePatcher.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public static function patchBeforeBuildconf(BuilderBase $builder): void
8787
}
8888

8989
// patch configure.ac
90+
/*
9091
$musl = SPCTarget::getLibc() === 'musl';
9192
FileSystem::replaceFileStr(
9293
SOURCE_PATH . '/php-src/configure.ac',
@@ -96,6 +97,7 @@ public static function patchBeforeBuildconf(BuilderBase $builder): void
9697
if (getenv('SPC_LIBC') === false && ($libc = SPCTarget::getLibc()) !== null) {
9798
putenv("SPC_LIBC={$libc}");
9899
}
100+
*/
99101

100102
// patch php-src/build/php.m4 PKG_CHECK_MODULES -> PKG_CHECK_MODULES_STATIC
101103
FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/build/php.m4', 'PKG_CHECK_MODULES(', 'PKG_CHECK_MODULES_STATIC(');

0 commit comments

Comments
 (0)