Skip to content

Commit 6594811

Browse files
henderkeshenderkes
committed
remove pointless SPC_CMD_PREFIX_PHP_MAKE
1 parent cc7eb7c commit 6594811

File tree

4 files changed

+35
-57
lines changed

4 files changed

+35
-57
lines changed

‎config/env.ini‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ SPC_MICRO_PATCHES=cli_checks,disable_huge_page
104104
SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
105105
; configure command
106106
SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --disable-shared --enable-static --disable-all --disable-phpdbg --with-pic"
107-
; make command
108-
SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"
109107

110108
; *** default build vars for building php ***
111109
; embed type for php, static (libphp.a) or shared (libphp.so)
@@ -138,8 +136,6 @@ SPC_MICRO_PATCHES=cli_checks,macos_iconv
138136
SPC_CMD_PREFIX_PHP_BUILDCONF="./buildconf --force"
139137
; configure command
140138
SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-shared=no --enable-static=yes --disable-all --disable-phpdbg"
141-
; make command
142-
SPC_CMD_PREFIX_PHP_MAKE="make -j${SPC_CONCURRENCY}"
143139

144140
; *** default build vars for building php ***
145141
; embed type for php, static (libphp.a) or shared (libphp.dylib)

‎src/SPC/builder/extension/readline.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use SPC\exception\ValidationException;
99
use SPC\store\FileSystem;
1010
use SPC\util\CustomExt;
11-
use SPC\util\SPCTarget;
1211

1312
#[CustomExt('readline')]
1413
class readline extends Extension
@@ -45,21 +44,4 @@ public function runCliCheckUnix(): void
4544
throw new ValidationException("readline extension failed sanity check. Code: {$ret}, output: " . implode("\n", $out));
4645
}
4746
}
48-
49-
public static function patchCliLinux(bool $patch): void
50-
{
51-
if (SPCTarget::getTargetOS() === 'Linux' && SPCTarget::isStatic() && $patch) {
52-
FileSystem::replaceFileStr(
53-
SOURCE_PATH . '/php-src/ext/readline/readline_cli.c',
54-
"/*#else\n#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()",
55-
"#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()\n/*#else",
56-
);
57-
} else {
58-
FileSystem::replaceFileStr(
59-
SOURCE_PATH . '/php-src/ext/readline/readline_cli.c',
60-
"#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()\n/*#else",
61-
"/*#else\n#define GET_SHELL_CB(cb) (cb) = php_cli_get_shell_callbacks()",
62-
);
63-
}
64-
}
6547
}

‎src/SPC/builder/linux/LinuxBuilder.php‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
namespace SPC\builder\linux;
66

7-
use SPC\builder\extension\readline;
87
use SPC\builder\unix\UnixBuilderBase;
98
use SPC\exception\PatchException;
109
use SPC\exception\WrongUsageException;
@@ -106,18 +105,18 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
106105

107106
$this->seekPhpSrcLogFileOnException(fn () => shell()->cd(SOURCE_PATH . '/php-src')->exec(
108107
$php_configure_env . ' ' .
109-
getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
110-
($enableCli ? '--enable-cli ' : '--disable-cli ') .
111-
($enableFpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
112-
($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
113-
($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
114-
($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
115-
$config_file_path .
116-
$config_file_scan_dir .
117-
$json_74 .
118-
$zts .
119-
$maxExecutionTimers .
120-
$this->makeStaticExtensionArgs() . ' '
108+
getenv('SPC_CMD_PREFIX_PHP_CONFIGURE') . ' ' .
109+
($enableCli ? '--enable-cli ' : '--disable-cli ') .
110+
($enableFpm ? '--enable-fpm ' . ($this->getLib('libacl') !== null ? '--with-fpm-acl ' : '') : '--disable-fpm ') .
111+
($enableEmbed ? "--enable-embed={$embed_type} " : '--disable-embed ') .
112+
($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
113+
($enableCgi ? '--enable-cgi ' : '--disable-cgi ') .
114+
$config_file_path .
115+
$config_file_scan_dir .
116+
$json_74 .
117+
$zts .
118+
$maxExecutionTimers .
119+
$this->makeStaticExtensionArgs() . ' '
121120
));
122121

123122
$this->emitPatchPoint('before-php-make');
@@ -170,18 +169,17 @@ public function testPHP(int $build_target = BUILD_TARGET_NONE)
170169
*/
171170
protected function buildCli(): void
172171
{
173-
if ($this->getExt('readline')) {
172+
if ($this->getExt('readline') && SPCTarget::isStatic()) {
174173
SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src');
175174
}
175+
176176
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
177-
readline::patchCliLinux(true);
178-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
177+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
179178
shell()->cd(SOURCE_PATH . '/php-src')
180179
->exec('sed -i "s|//lib|/lib|g" Makefile')
181-
->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");
182-
readline::patchCliLinux(false);
180+
->exec("make {$concurrency} {$vars} cli");
183181

184-
if ($this->getExt('readline')) {
182+
if ($this->getExt('readline') && SPCTarget::isStatic()) {
185183
SourcePatcher::patchFile('musl_static_readline.patch', SOURCE_PATH . '/php-src', true);
186184
}
187185

@@ -199,10 +197,10 @@ protected function buildCli(): void
199197
protected function buildCgi(): void
200198
{
201199
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
202-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
200+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
203201
shell()->cd(SOURCE_PATH . '/php-src')
204202
->exec('sed -i "s|//lib|/lib|g" Makefile')
205-
->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
203+
->exec("make {$concurrency} {$vars} cgi");
206204

207205
if (!$this->getOption('no-strip', false)) {
208206
shell()->cd(SOURCE_PATH . '/php-src/sapi/cgi')->exec('strip --strip-unneeded php-cgi');
@@ -234,11 +232,11 @@ protected function buildMicro(): void
234232
// patch fake cli for micro
235233
$vars['EXTRA_CFLAGS'] .= $enable_fake_cli;
236234
$vars = SystemUtil::makeEnvVarString($vars);
237-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
235+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
238236

239237
shell()->cd(SOURCE_PATH . '/php-src')
240238
->exec('sed -i "s|//lib|/lib|g" Makefile')
241-
->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} micro");
239+
->exec("make {$concurrency} {$vars} micro");
242240

243241
$this->processMicroUPX();
244242

@@ -255,10 +253,10 @@ protected function buildMicro(): void
255253
protected function buildFpm(): void
256254
{
257255
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
258-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
256+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
259257
shell()->cd(SOURCE_PATH . '/php-src')
260258
->exec('sed -i "s|//lib|/lib|g" Makefile')
261-
->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} fpm");
259+
->exec("make {$concurrency} {$vars} fpm");
262260

263261
if (!$this->getOption('no-strip', false)) {
264262
shell()->cd(SOURCE_PATH . '/php-src/sapi/fpm')->exec('strip --strip-unneeded php-fpm');
@@ -276,11 +274,11 @@ protected function buildFpm(): void
276274
protected function buildEmbed(): void
277275
{
278276
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
279-
277+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
280278
shell()->cd(SOURCE_PATH . '/php-src')
281279
->exec('sed -i "s|//lib|/lib|g" Makefile')
282280
->exec('sed -i "s|^EXTENSION_DIR = .*|EXTENSION_DIR = /' . basename(BUILD_MODULES_PATH) . '|" Makefile')
283-
->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
281+
->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install");
284282

285283
$ldflags = getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS') ?: '';
286284
$libDir = BUILD_LIB_PATH;

‎src/SPC/builder/macos/MacOSBuilder.php‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ protected function buildCli(): void
186186
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
187187

188188
$shell = shell()->cd(SOURCE_PATH . '/php-src');
189-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
190-
$shell->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cli");
189+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
190+
$shell->exec("make {$concurrency} {$vars} cli");
191191
if (!$this->getOption('no-strip', false)) {
192192
$shell->exec('dsymutil -f sapi/cli/php')->exec('strip -S sapi/cli/php');
193193
}
@@ -199,8 +199,8 @@ protected function buildCgi(): void
199199
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
200200

201201
$shell = shell()->cd(SOURCE_PATH . '/php-src');
202-
$SPC_CMD_PREFIX_PHP_MAKE = getenv('SPC_CMD_PREFIX_PHP_MAKE') ?: 'make';
203-
$shell->exec("{$SPC_CMD_PREFIX_PHP_MAKE} {$vars} cgi");
202+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
203+
$shell->exec("make {$concurrency} {$vars} cgi");
204204
if (!$this->getOption('no-strip', false)) {
205205
$shell->exec('dsymutil -f sapi/cgi/php-cgi')->exec('strip -S sapi/cgi/php-cgi');
206206
}
@@ -229,7 +229,8 @@ protected function buildMicro(): void
229229

230230
$shell = shell()->cd(SOURCE_PATH . '/php-src');
231231
// build
232-
$shell->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} micro");
232+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
233+
$shell->exec("make {$concurrency} {$vars} micro");
233234
// strip
234235
if (!$this->getOption('no-strip', false)) {
235236
$shell->exec('dsymutil -f sapi/micro/micro.sfx')->exec('strip -S sapi/micro/micro.sfx');
@@ -250,7 +251,8 @@ protected function buildFpm(): void
250251
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
251252

252253
$shell = shell()->cd(SOURCE_PATH . '/php-src');
253-
$shell->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . " {$vars} fpm");
254+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
255+
$shell->exec("make {$concurrency} {$vars} fpm");
254256
if (!$this->getOption('no-strip', false)) {
255257
$shell->exec('dsymutil -f sapi/fpm/php-fpm')->exec('strip -S sapi/fpm/php-fpm');
256258
}
@@ -263,9 +265,9 @@ protected function buildFpm(): void
263265
protected function buildEmbed(): void
264266
{
265267
$vars = SystemUtil::makeEnvVarString($this->getMakeExtraVars());
266-
268+
$concurrency = getenv('SPC_CONCURRENCY') ? '-j' . getenv('SPC_CONCURRENCY') : '';
267269
shell()->cd(SOURCE_PATH . '/php-src')
268-
->exec(getenv('SPC_CMD_PREFIX_PHP_MAKE') . ' INSTALL_ROOT=' . BUILD_ROOT_PATH . " {$vars} install");
270+
->exec("make {$concurrency} INSTALL_ROOT=" . BUILD_ROOT_PATH . " {$vars} install");
269271

270272
if (getenv('SPC_CMD_VAR_PHP_EMBED_TYPE') === 'static') {
271273
$AR = getenv('AR') ?: 'ar';

0 commit comments

Comments
 (0)