bunch of fixes/changes to make packages build #1006
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -385,6 +385,9 @@ public function buildShared(array $visited = []): void | |||||||
| logger()->info('Shared extension [' . $this->getName() . '] was already built, skipping (' . $this->getName() . '.so)'); | ||||||||
| return; | ||||||||
| } | ||||||||
| if ((string) Config::getExt($this->getName(), 'type') === 'addon') { | ||||||||
| return; | ||||||||
| } | ||||||||
| logger()->info('Building extension [' . $this->getName() . '] as shared extension (' . $this->getName() . '.so)'); | ||||||||
| foreach ($this->dependencies as $dependency) { | ||||||||
| if (!$dependency instanceof Extension) { | ||||||||
|
|
@@ -398,10 +401,12 @@ public function buildShared(array $visited = []): void | |||||||
| if (Config::getExt($this->getName(), 'type') === 'addon') { | ||||||||
| return; | ||||||||
| } | ||||||||
|
Comment on lines
401
to
403
There was a problem hiding this comment. There is a duplicate check for addon type at lines 388-390 and lines 401-403. The second check at lines 401-403 is redundant since if the extension is an addon, the function would have already returned at line 389. Consider removing the duplicate check.
Suggested change
|
||||||||
| $this->builder->emitPatchPoint('before-shared-ext[' . $this->getName() . ']-build'); | ||||||||
| match (PHP_OS_FAMILY) { | ||||||||
| 'Darwin', 'Linux' => $this->buildUnixShared(), | ||||||||
| default => throw new WrongUsageException(PHP_OS_FAMILY . ' build shared extensions is not supported yet'), | ||||||||
| }; | ||||||||
| $this->builder->emitPatchPoint('after-shared-ext[' . $this->getName() . ']-build'); | ||||||||
| } catch (SPCException $e) { | ||||||||
| $e->bindExtensionInfo(['extension_name' => $this->getName()]); | ||||||||
| throw $e; | ||||||||
|
|
@@ -452,12 +457,17 @@ public function buildUnixShared(): void | |||||||
|
|
||||||||
| // process *.so file | ||||||||
| $soFile = BUILD_MODULES_PATH . '/' . $this->getName() . '.so'; | ||||||||
| $soDest = $soFile; | ||||||||
| preg_match('/-release\s+(\S*)/', getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), $matches); | ||||||||
| if (!empty($matches[1])) { | ||||||||
| $soDest = str_replace('.so', '-' . $matches[1] . '.so', $soFile); | ||||||||
| } | ||||||||
| if (!file_exists($soFile)) { | ||||||||
| throw new ValidationException("extension {$this->getName()} build failed: {$soFile} not found", validation_module: "Extension {$this->getName()} build"); | ||||||||
| } | ||||||||
| /** @var UnixBuilderBase $builder */ | ||||||||
| $builder = $this->builder; | ||||||||
| $builder->deployBinary($soFile, $soDest, false); | ||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
|
|
@@ -543,6 +553,7 @@ protected function getSharedExtensionEnv(): array | |||||||
| 'CFLAGS' => $config['cflags'], | ||||||||
| 'CXXFLAGS' => $config['cflags'], | ||||||||
| 'LDFLAGS' => $config['ldflags'], | ||||||||
| 'EXTRA_LDFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS'), | ||||||||
| 'LIBS' => clean_spaces("{$preStatic} {$staticLibs} {$postStatic} {$sharedLibs}"), | ||||||||
| 'LD_LIBRARY_PATH' => BUILD_LIB_PATH, | ||||||||
| ]; | ||||||||
|
|
||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace SPC\builder\extension; | ||
|
|
||
| use SPC\builder\Extension; | ||
| use SPC\util\CustomExt; | ||
|
|
||
| #[CustomExt('mysqlnd_ed25519')] | ||
| class mysqlnd_ed25519 extends Extension | ||
| { | ||
| public function getConfigureArg(bool $shared = false): string | ||
| { | ||
| return '--with-mysqlnd_ed25519' . ($shared ? '=shared' : ''); | ||
| } | ||
|
|
||
| public function getUnixConfigureArg(bool $shared = false): string | ||
| { | ||
| return $this->getConfigureArg(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace SPC\builder\extension; | ||
|
|
||
| use SPC\builder\Extension; | ||
| use SPC\util\CustomExt; | ||
|
|
||
| #[CustomExt('mysqlnd_parsec')] | ||
| class mysqlnd_parsec extends Extension | ||
| { | ||
| public function getConfigureArg(bool $shared = false): string | ||
| { | ||
| return '--enable-mysqlnd_parsec' . ($shared ? '=shared' : ''); | ||
| } | ||
|
|
||
| public function getUnixConfigureArg(bool $shared = false): string | ||
| { | ||
| return $this->getConfigureArg(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest updating SPC_DOCKER_VERSION when changing docker image contents.