Skip to content

Commit 6fe55a4

Browse files
authored
Merge branch 'v3' into feat/pgo-v3
2 parents f1525c0 + b8ce9f7 commit 6fe55a4

12 files changed

Lines changed: 20 additions & 18 deletions

File tree

config/artifact/ncurses.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ ncurses:
44
- COPYING
55
source:
66
type: filelist
7-
url: 'https://ftp.gnu.org/pub/gnu/ncurses/'
7+
url: 'https://ftpmirror.gnu.org/gnu/ncurses/'
88
regex: '/href="(?<file>ncurses-(?<version>[^"]+)\.tar\.gz)"/'

config/env.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ AR=${SPC_DEFAULT_AR}
146146
RANLIB=${SPC_DEFAULT_RANLIB}
147147
LD=${SPC_DEFAULT_LD}
148148
; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
149-
SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-plt -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
149+
SPC_DEFAULT_CFLAGS="--target=${MAC_ARCH}-apple-darwin -O3 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -ffunction-sections -fdata-sections"
150150
SPC_DEFAULT_CXXFLAGS="${SPC_DEFAULT_CFLAGS}"
151151
SPC_DEFAULT_LDFLAGS="-Wl,-dead_strip"
152152
; phpmicro patches, for more info, see: https://github.com/easysoft/phpmicro/tree/master/patches

config/pkg/lib/gettext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ gettext:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/pub/gnu/gettext/'
6+
url: 'https://ftpmirror.gnu.org/gnu/gettext/'
77
regex: '/href="(?<file>gettext-(?<version>[^"]+)\.tar\.xz)"/'
88
metadata:
99
license-files: [gettext-runtime/intl/COPYING.LIB]

config/pkg/lib/gmp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ gmp:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/gnu/gmp/'
6+
url: 'https://ftpmirror.gnu.org/gnu/gmp/'
77
regex: '/href="(?<file>gmp-(?<version>[^"]+)\.tar\.xz)"/'
88
source-mirror:
99
type: url

config/pkg/lib/idn2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ idn2:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/gnu/libidn/'
6+
url: 'https://ftpmirror.gnu.org/gnu/libidn/'
77
regex: '/href="(?<file>libidn2-(?<version>[^"]+)\.tar\.gz)"/'
88
metadata:
99
license-files: [COPYING.LESSERv3]

config/pkg/lib/libiconv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ libiconv:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/gnu/libiconv/'
6+
url: 'https://ftpmirror.gnu.org/gnu/libiconv/'
77
regex: '/href="(?<file>libiconv-(?<version>[^"]+)\.tar\.gz)"/'
88
metadata:
99
license-files: [COPYING.LIB]

config/pkg/lib/libunistring.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ libunistring:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/gnu/libunistring/'
6+
url: 'https://ftpmirror.gnu.org/gnu/libunistring/'
77
regex: '/href="(?<file>libunistring-(?<version>[^"]+)\.tar\.gz)"/'
88
metadata:
99
license-files: [COPYING.LIB]

config/pkg/lib/readline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ readline:
33
artifact:
44
source:
55
type: filelist
6-
url: 'https://ftp.gnu.org/pub/gnu/readline/'
6+
url: 'https://ftpmirror.gnu.org/gnu/readline/'
77
regex: '/href="(?<file>readline-(?<version>[^"]+)\.tar\.gz)"/'
88
metadata:
99
license-files: [COPYING]

src/StaticPHP/Artifact/Artifact.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public function getSourceDir(): string
331331
public function getSourceRoot(): string
332332
{
333333
if (isset($this->config['metadata']['source-root'])) {
334-
return $this->getSourceDir() . '/' . ltrim($this->config['metadata']['source-root'], '/');
334+
return FileSystem::convertPath($this->getSourceDir() . '/' . ltrim($this->config['metadata']['source-root'], '/'));
335335
}
336336
return $this->getSourceDir();
337337
}

src/StaticPHP/Artifact/ArtifactCache.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,8 @@ public function getAllBinaryInfo(string $artifact_name): array
223223
public function getCacheFullPath(array $cache_info): string
224224
{
225225
return match ($cache_info['cache_type']) {
226-
'archive', 'file' => DOWNLOAD_PATH . '/' . $cache_info['filename'],
227-
'git' => DOWNLOAD_PATH . '/' . $cache_info['dirname'],
226+
'archive', 'file' => FileSystem::convertPath(DOWNLOAD_PATH . '/' . $cache_info['filename']),
227+
'git' => FileSystem::convertPath(DOWNLOAD_PATH . '/' . $cache_info['dirname']),
228228
'local' => $cache_info['dirname'], // local dirname is absolute path
229229
default => throw new SPCInternalException("Unknown cache type: {$cache_info['cache_type']}"),
230230
};

0 commit comments

Comments
 (0)