Skip to content

Commit daae5f2

Browse files
committed
libjpeg-turbo mustn't compile zlib symbols on its own
1 parent 766f7fa commit daae5f2

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

config/lib.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@
494494
"static-libs-windows": [
495495
"libjpeg_a.lib"
496496
],
497-
"lib-suggests-windows": [
497+
"lib-depends": [
498498
"zlib"
499499
]
500500
},

config/source.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,7 @@
641641
"libjpeg": {
642642
"type": "ghtar",
643643
"repo": "libjpeg-turbo/libjpeg-turbo",
644+
"prefer-stable": true,
644645
"license": {
645646
"type": "file",
646647
"path": "LICENSE.md"

src/SPC/builder/unix/library/libjpeg.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ protected function build(): void
1414
->addConfigureArgs(
1515
'-DENABLE_STATIC=ON',
1616
'-DENABLE_SHARED=OFF',
17+
'-DWITH_SYSTEM_ZLIB=ON'
1718
)
1819
->build();
1920
// patch pkgconfig

0 commit comments

Comments
 (0)