-
-
Notifications
You must be signed in to change notification settings - Fork 326
fix building of shared extensions (grpc, simdjson, soap) #905
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 37 commits
d3ba04f
2e6329b
d0a9a3a
b5c7185
3c61466
fa2e041
40f89d1
b0538c0
83696e9
81430e6
d0b253c
e323d7b
927d7f5
44399cd
dcbfe1e
8dfe722
fa87149
35a90f2
e02be69
fc90b4a
8039ea4
8bda4fd
59dedbe
93e6dca
21149f6
cac57db
e862bac
8b2b658
c2813d5
fe09d8c
b0b031a
5b6c923
f774418
2d1a61d
c5316f9
044275d
31a4498
018dfae
897cb00
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,11 @@ trait imagemagick | |
{ | ||
protected function build(): void | ||
{ | ||
$original_ldflags = $this->builder->arch_ld_flags; | ||
if (str_contains($this->builder->arch_ld_flags, '-Wl,--as-needed')) { | ||
$this->builder->arch_ld_flags = str_replace('-Wl,--as-needed', '', $original_ldflags); | ||
} | ||
|
||
Comment on lines
+15
to
+19
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is it possible to change only for this scope rather than modifying builder property? I don't think modifying builder's value is the best idea. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I can't think of a way, unfortunately, other than patching imagemagick's ./configure, but that would be much worse than temporarily changing the ldflags. |
||
$ac = UnixAutoconfExecutor::create($this) | ||
->optionalLib('libzip', ...ac_with_args('zip')) | ||
->optionalLib('libjpeg', ...ac_with_args('jpeg')) | ||
|
@@ -32,7 +37,7 @@ protected function build(): void | |
); | ||
|
||
// special: linux-static target needs `-static` | ||
$ldflags = SPCTarget::isStatic() ? ('-static -ldl') : '-ldl'; | ||
$ldflags = SPCTarget::isStatic() ? '-static -ldl' : '-ldl'; | ||
|
||
// special: macOS needs -iconv | ||
$libs = SPCTarget::getTargetOS() === 'Darwin' ? '-liconv' : ''; | ||
|
@@ -45,6 +50,8 @@ protected function build(): void | |
|
||
$ac->configure()->make(); | ||
|
||
$this->builder->arch_ld_flags = $original_ldflags; | ||
|
||
$filelist = [ | ||
'ImageMagick.pc', | ||
'ImageMagick-7.Q16HDRI.pc', | ||
|
Uh oh!
There was an error while loading. Please reload this page.