Skip to content

Commit d535e4f

Browse files
authored
libjpeg-turbo mustn't compile zlib symbols on its own (#1077)
2 parents 766f7fa + 5a5f54b commit d535e4f

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
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

src/globals/test-extensions.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// test php version (8.1 ~ 8.4 available, multiple for matrix)
1515
$test_php_version = [
16-
'8.1',
16+
// '8.1',
1717
// '8.2',
1818
// '8.3',
1919
'8.4',
@@ -24,11 +24,11 @@
2424
// test os (macos-15-intel, macos-15, ubuntu-latest, windows-latest are available)
2525
$test_os = [
2626
// 'macos-15-intel', // bin/spc for x86_64
27-
// 'macos-15', // bin/spc for arm64
28-
// 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
29-
// 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
27+
'macos-15', // bin/spc for arm64
28+
'ubuntu-latest', // bin/spc-alpine-docker for x86_64
29+
'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
3030
// 'ubuntu-24.04', // bin/spc for x86_64
31-
// 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
31+
'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
3232
// 'ubuntu-24.04-arm', // bin/spc for arm64
3333
// 'windows-2022', // .\bin\spc.ps1
3434
'windows-2025',
@@ -42,15 +42,15 @@
4242
// compress with upx
4343
$upx = false;
4444

45-
// whether to test frankenphp build, only available for macos and linux
45+
// whether to test frankenphp build, only available for macOS and linux
4646
$frankenphp = false;
4747

4848
// prefer downloading pre-built packages to speed up the build process
4949
$prefer_pre_built = false;
5050

5151
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
5252
$extensions = match (PHP_OS_FAMILY) {
53-
'Linux', 'Darwin' => 'pgsql',
53+
'Linux', 'Darwin' => 'zlib',
5454
'Windows' => 'gd,zlib,mbstring,filter',
5555
};
5656

@@ -66,7 +66,7 @@
6666

6767
// If you want to test extra libs for extensions, add them below (comma separated, example `libwebp,libavif`). Unnecessary, when $with_suggested_libs is true.
6868
$with_libs = match (PHP_OS_FAMILY) {
69-
'Linux', 'Darwin' => '',
69+
'Linux', 'Darwin' => 'libjpeg',
7070
'Windows' => '',
7171
};
7272

0 commit comments

Comments
 (0)