Skip to content

Commit 5e8fbe4

Browse files
jingjingxykmatyhtf
andauthored
Feature v5.1.x 拉取main 分支代码 (#1001)
* 完善 upgrade php version to 8.1.29 (#752) * update * sync php code * update extension swoole code * update setup-php-runtime.sh (#751) * disable swoolg pg test (#755) * disable swoolg pg test * Update linux-x86_64.yml --------- Co-authored-by: Tianfeng.Han <[email protected]> * v6 cygwin 环境禁用 opcache (#760) * 默认下载的 swoole-cli 版本由 v5.13.0 升级为 v5.1.4.0 (#759) * 升级下载 swoole-cli 默认版本为 v5.1.4.0 * update * Feature test swoole pg (#758) * test v6 swoole pdo_pgsql * test * test * update swoole PGSQL Test * Optimize code * Optimize cygwin scripts * fix * Update ext-swoole * add liburing io_uring library (#700) * 更新 quickstart 脚本 (#766) * 更新 quickstart 脚本 * update quickstart script * update quickstart script * 调整 github aciton macos workflow (#764) * 调整 github aciton macos workflow * optimize code * 更新 下载源码包(all-deps.zip) 集合 hash 签名 (#768) * 更新 下载源码包 集合 hash 签名 * update * update sync-source-code.php (#763) * 调整 uuid 扩展 依赖库 命名 (#771) * Optimize gettext * Optimize code. default enable gettext, intl, uuid * Upgrade mongodb to 1.19.4, Fix macOS * Remove gettext, intl, uuid extensions because they cannot be supported on macOS. Optimize directory name. * update extensions.md (#780) * 删除 multistage-build-dependencies-container , 此功能由 build-export-container.sh 脚本代替 (#778) * optimzie * 移除提前构建依赖容器脚本, 此功能由 build-export-container.sh 脚本代替 * fix uuid gettext config error (#776) * update setup php swoole-cli runtime (#784) * update workflow (#772) * dockerfile 和 dockerfile-arm64 合并为一个 (#777) * 使用 tini 正确地回收其子进程 * format bash script * 合并dockerfile dockerfile-arm64 * 自动指定构建容器的架构 * 构建容器指定架构 * 添加 开放原子 容器镜像 解决拉取基础镜像超时 (#767) * 添加 开放原子 容器镜像 解决拉取基础镜像超时 * update * fix script error * update make.sphp * 1. 修复 libxml2, libxslt URL 2. 删除 docker build --progress=plain 参数,非通用参数,部分 docker 版本不支持 3. 修复 PHP 8.4 支持 4. 为 make.sh 添加可执行属性 * Fix mongodb extension build error (#788) * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * update mongodb extension config * fix readline not work (#802) * Feature optimize code for macOS builder (#792) * optimize code * macos x86_64 with macOS 13 * update macos workflow config * update macos-init.sh * update macos-init.sh * update macos-init.sh * 更新 swoole 至最新 * 修复 macos 编译出错的问题 --filter=[macos-aarch64][macos-x86_64] * 设置 加载 php.ini 默认目录 (#812) * update prepare.php (#813) * Fix sync source code (#798) * fix bug sync-source-code.php * fix bug sync-source-code.php * fix sync-source-code * update sync-source-code.php * fix readline not work * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php * update sync-source-code.php for fpm * update prepare.php * update sync-source-code.php for fpm * update swoole souce code (#833) * update setup-swoole-cli-runtime.sh (#834) * 更新 下载所有依赖包的hash 值 和 升级默认下载的swoole-cli 版本 (#821) * 更新 下载 所有依赖包 hash 值 * update to latest swoole * update to latest swoole version * gd 扩展支持 avif 格式图片 (#815) * gd 扩展支持 avif 格式图片 * gd 扩展支持 avif 格式图片 * update libaom build config * tar-default * update libgav1 build config * update * update libyuv * update svt-av1 build config * update gd extenison config * update library for libavif * update gd config option * update libyuv build config * checkout file composer.lock * workflow show gd extension info * update swoole version * update libyuv download url * update library.php * update to latest swoole version * update test GD extension * update libyuv build config * gd 支持 avif 图片 * gd 支持 avif 图片 * 默认启用xslwriter 扩展 (#838) * format download-box script (#837) * 下载 swoole-cli 运行时 可指定版本 (#842) * 指定下载 swoole-cli 版本 * 指定下载 swoole-cli 版本 * extensions.md add xslwriter (#840) * extensions.md add xslwriter * extensions.md add xslwriter * fix enable xlswriter (#846) * fix download swoole-cli runtime bug (#852) * swoole support zstd (#856) * swoole support zstd * update swoole source code * swoole add depend libzstd * add ZSTD_CFLAGS ZSTD_LIBS * 生成 artifacts hash (#857) * generate artifacts sha256sum * 生成指定版本的 hash * 生成指定版本的 hash * 生成指定版本的 hash * 生成 发版 hash * fix 生成 发版 hash * update generate artifact hash script * update artifact-hash.yaml * optimize generate artifact hash * optimize generate artifact * fix bug (#870) * upgrade swoole version to v6.0.0 (#869) * 使用 curl下载出现错误时,打印错误信息 (#887) * update download-box version (#888) * update install cygwin build environment (#889) * update install cygwin build environment * update windows-cygwin.yml * add runner-images.md * runner-images.md * 为 make.sh 脚本添加 bash 执行引导 * 修复拼写错误和 php warning * 优化 cygwin 构建环境 (#893) * 优化 cygwin 构建环境 * 优化 cygwin 构建环境 * updae install-cygwin.bat * test cygwin make * update cygwin-build.sh * update cygwin-build.sh * update cygwin-build.sh * quickstart linux 运行容器名称与默认保持一致 (#890) * 发版时自动上传到腾讯云对象存储 (#874) * 发版时自动上传到腾讯云对象存储 * optimize workflow upload file to cloud object storage * update * optimize upload cloud object storage * optimize upload to cloud object storage * optimize workflow if condition * update cygwin workflow config * update cygwin workflow config * download all-deps.zip version * update dowonload-cygwin.bat * merge main source code * merge main source code * 更新 获取 github respository 仓库变量 * 更新 获取 github respository 仓库变量 * Feature quickstart fix error and format script code (#897) * update quickstart linux connection container config * format code * update install-docker.sh * update make.php * 细节优化 * fix cygwin git error (#899) * Fix quickstart connection swoole-cli-builder bug (#902) * fix quickstart connection continer bug * fix quickstart connection swoole-cli-buider bug * optimize * quickstart run-swoole-cli-builder.sh 优化 (#903) * fix run-swoole-cli-buider-bug * quickstart run-swoole-cli-builder.sh 优化 * AtomHub 已下线,移除开放原子容器镜像 (#914) * 添加生成 docker.io/phpswoole/swoole-cli 容器 脚本 (#913) * 添加生成 docker.io/phpswoole/swoole-cli 容器 * build-swoole-cli-alpine-container.sh * build-swoole-cli-alpine-container.sh * update * 改进 测试数据库 启动配置 (#916) * 该进 测试数据库 启动配置 * update install-docker-compose.sh * update database docker-compose.yaml * 优化 同步 php 源码 (#909) * 优化 同步 php 源码 * update upgrade.md * update download-php-src-archive.php * update upgrade.md * udate download-php-src-archive.php * update download-php-src-archive.php * swoole upgrade v6.0.1 (#921) * 启用github action linux aarch64 原生构建 (#922) * 启用github action linux aarch64 原生构建 * merge code * merge code * 更新 github action linux workflow 生成容器镜像 OS 类型 * 更新 github action workflow 配置 * 改进一下自动升级的脚本,创建一个唯一的临时目录作为文件下载的目标目录 * 优化 cygwin 构建环境 (#906) * 优化 cygwin 环境初始化 * add uninstall-cygwin.bat * update install-cygwin.sh * update install-cygwin.sh * update install-cygwin.sh * update cygwin-build README.md * update cygwin-config-ext.sh * update cygwin-config-ext.sh * update download-cygwin.bat * cygwin 增加shell脚本打包php.exe * update cygwin-pack.sh * update cygwin-pack.sh * update cygwin-pack.sh * update cygwin-config-ext.sh * update cygwin-config-ext.sh * update cygwin-config-ext.sh * update cygwin-pack.sh * update cygwin-config-ext.sh * update install-re2c.sh * windows-cygwin.yml 添加备注 * 将重复的逻辑封装为一个函数,修复 MongoDB 相关部分错误写作 redis 的问题 * unix_odbc使用readline 作为命令行工具,移除 libedit 依赖 (#933) * 默认使用readline 作为命令行 工具 * Update unix_odbc.php --------- Co-authored-by: Tianfeng.Han <[email protected]> * 优化自动缓存 依赖库 (#935) * 优化自动缓存 依赖库 * 更新 优化自动缓存 依赖库 * update auto cache pool tarball * 修复 macos 环境下,启用 gettext 扩展 缺失依赖库 libintl (#932) * 修复 macos 环境下,启用gettext 扩展 缺失依赖库 libintl * macos 环境构建添加 链接 framework 去重 * 优化 macOS -framework 链接代码 * fix bug macOS -framework 链接代码 (#941) * 升级swoole 版本为 v6.0.2 (#944) * 升级swoole 版本为 v6.0.2 * cygwin 构建环境下,解决 IN6_ADDR 未定义 * update cygwin 环境依赖包 * cygwin add libnet-devel * cygwin 环境添加 libnet6-devel * 更新配置运行时脚本 (#946) * 更新配置运行时脚本 * install docker with script * update README.md * update build-release-example.sh * update run-swoole-cli-builder-container.sh * update mimalloc vesion and build config (#949) * brotli,lz4 构建指定 最低cmake 版本,解决macos 环境下构建报错 (#950) * brotli 构建指定 最低cmake 版本,解决macos 环境下构建报错 * libz4 添加 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 * update libzstd CMAKE_POLICY_VERSION_MINIMUM=3.5 * update libssh2 cmake config * update libzip cmake config * update libjpeg build config * update svt_av1 build config * update libyuv build config * Feature static-pie (#951) * 验证 -static-pie 链接参数 * 验证 -fPIE 参数 * 验证完毕,恢复修改 * 新增msys2 构建环境 (#968) * 新增msys2 构建环境 * optimize cygwin build * update msys2 build environment * msys2 构建环境优化 * 优化 msys2 环境 构建步骤 * fix msys2 install-libzip.sh word error * update install-msys2.sh * update cygwin-config.sh * 增加windows powershell 环境下下载 swoole-cli (#957) * 增加windows powershell 环境下下载 swoole-cli * setup-swoole-cli-runtime.ps1 添加使用代理配置 * fix setup-swoole-cli-runtime.ps1 bug * 使用配置文件 配置swoole 版本 (#975) * 修复 cygwin intl 链接 icu 库错误 * cywin 使用 git clone swoole源码 * cywin 使用 git clone swoole源码 * optimize cygwin config ext * optimize Cygwin Build environment * cygwin 环境添加源码编译libzip * update cygwin workflow * update cygwin-build.sh * 添加配置 swoole 版本 * 添加配置 swoole 版本 * 使用配置文件配置swoole 版本 * cygwin 启用源码编译 libzip * Update windows-cygwin.yml --------- Co-authored-by: Tianfeng.Han <[email protected]> * linux 构建环境 增加检查 生成的二进制文件是否存在动态链接 (#961) * 格式化 upgrade.md (#985) * 格式化 upgrade.md * 格式化 upgrade.md * Update upgrade.md --------- Co-authored-by: Tianfeng.Han <[email protected]> * 更新 默认php 运行时所在目录 (#976) * 更新 默认设置php 运行时所在目录 * 更新使用swoole-cli 运行时 * update auto-cache-pool-tarball.yml * update * update setup-swoole-cli-runtime.sh * 解决构建时 php 运行时目录错误 * update run-swoole-cli-builder-container.sh * 使用内存作为 缓存目录,加快构建 * update * update setup-php-runtime.sh * update setup-php-runtime.sh * update setup-php-runtime.sh * update setup-php-runtime.sh * update setup-swoole-cli-runtime.sh * 移除无效的代码 * 修复cygwin 构建环境缺失 libiconv-devel (#989) * 修复cygwin 构建环境链接 libiconv 错误 * fix libiconv-devel no found * LIBS add -liconv * cygwin-config add LIBS config * 修复 cygwin 环境下 iconv 链接错误 * swoole 启用 引入的面向对象风格的语法扩展 (#990) * 修复cygwin 构建环境链接 libiconv 错误 * fix libiconv-devel no found * LIBS add -liconv * cygwin-config add LIBS config * swoole 引入面向对象风格的语法扩展 * update README.md * update README.md * 修复 cygwin 环境下 iconv 链接错误 * update README.md * update README.md * 在 github action runner 环境下,当swoole版本设置为开发版本时, 保持拉取最新 swoole 版本 (#988) * 当swoole版本设置为开发版本时,同时在 github action runner 环境下 保持拉取最新 swoole 版本 * 在 github action runner 环境下,当swoole版本设置为开发版本时, 保持拉取最新 swoole 版本 * 修复cygwin 构建环境链接 libiconv 错误 * fix libiconv-devel no found * LIBS add -liconv * cygwin-config add LIBS config * 修复 cygwin 环境下 iconv 链接错误 * Optimize msys2 打包 (#991) * 修复cygwin 构建环境链接 libiconv 错误 * fix libiconv-devel no found * LIBS add -liconv * cygwin-config add LIBS config * 修复 cygwin 环境下 iconv 链接错误 * 优化 msys2 打包 * 优化 msys2 环境下 构建配置 * fix create license bug * update install-msys2-package.sh (#994) * 更新 下载swoole-cli 地址 (#997) * Fix upload tencent cos (#1000) * 修复 腾讯云对象存储上传 报错 * 修复 腾讯云对象存储上传 报错 * 拉取main 分支代码 --------- Co-authored-by: Tianfeng.Han <[email protected]>
1 parent c6a8a5d commit 5e8fbe4

13 files changed

+44
-40
lines changed

.github/workflows/linux-aarch64.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ jobs:
131131
./bin/swoole-cli -m
132132
./bin/swoole-cli --ri gd
133133
./bin/swoole-cli --ri swoole
134+
ldd ./bin/swoole-cli
134135
file ./bin/swoole-cli
135136
readelf -h ./bin/swoole-cli
136137
APP_VERSION=$(./bin/swoole-cli -v | awk '{print $2}')

build-release-example.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ fi
139139

140140
if [ ! -f "${__PROJECT__}/runtime/php/php" ]; then
141141
if [ "$MIRROR" = 'china' ]; then
142-
bash sapi/quickstart/setup-php-runtime.sh --mirror china
142+
bash ${__PROJECT__}/setup-php-runtime.sh --mirror china
143143
else
144-
bash sapi/quickstart/setup-php-runtime.sh
144+
bash ${__PROJECT__}/setup-php-runtime.sh
145145
fi
146146
fi
147147

sapi/SWOOLE-VERSION.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
v5.1.8
1+
v5.1.8
22

sapi/quickstart/windows/msys2-build/install-msys2.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,17 @@ fi
5050
pacman -S --needed --noconfirm git curl wget openssl
5151
pacman -S --needed --noconfirm zip unzip xz gcc gcc-libs cmake make
5252
pacman -S --needed --noconfirm re2c
53-
pacman -S --needed --noconfirm openssl-devel libreadline
5453
pacman -S --needed --noconfirm lzip
5554
pacman -S --needed --noconfirm zip unzip
5655
pacman -S --needed --noconfirm zlib-devel
5756
pacman -S --needed --noconfirm bison automake autoconf libtool coreutils
57+
pacman -S --needed --noconfirm openssl-devel libreadline-devel libiconv-devel
5858
pacman -S --needed --noconfirm libcurl-devel libxml2-devel libxslt-devel
5959
pacman -S --needed --noconfirm libbz2-devel liblz4-devel liblzma-devel libcares-devel
60-
pacman -S --needed --noconfirm libyaml-devel libzstd-devel libreadline-devel
61-
pacman -S --needed --noconfirm libssh2-devel libidn2-devel gettext-devel
6260
pacman -S --needed --noconfirm libzstd-devel
63-
pacman -S --needed --noconfirm icu-devel
64-
pacman -S --needed --noconfirm libsqlite-devel libsqlite
61+
pacman -S --needed --noconfirm libyaml-devel
62+
pacman -S --needed --noconfirm libssh2-devel libidn2-devel gettext-devel
63+
pacman -S --needed --noconfirm libsqlite-devel
6564
pacman -S --needed --noconfirm libedit-devel
6665
pacman -S --needed --noconfirm gmp-devel
6766
pacman -S --needed --noconfirm brotli-devel

sapi/scripts/cygwin/cygwin-build.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@ mkdir -p bin/.libs
1414
# export LDFLAGS="-all-static"
1515
LOGICAL_PROCESSORS=$(nproc)
1616

17+
: <<'EOF'
18+
set +u
19+
if [ -n "${GITHUB_ACTION}" ]; then
20+
if test $LOGICAL_PROCESSORS -ge 4; then
21+
LOGICAL_PROCESSORS=$((LOGICAL_PROCESSORS - 2))
22+
fi
23+
make
24+
# make -j $LOGICAL_PROCESSORS
25+
else
26+
make -j $LOGICAL_PROCESSORS
27+
fi
28+
set -u
29+
EOF
30+
1731
make -j $LOGICAL_PROCESSORS
1832

1933
./bin/swoole-cli -v

sapi/scripts/download-php-src-archive.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
$php_source_folder = $poject_dir . "/var/php-{$php_version_tag}";
66
$php_archive_file = $poject_dir . "/pool/php-tar/php-{$php_version_tag}.tar.gz";
77
$php_archive_file_sha256sum = '41c9e703caaf73ba6c77ee641709a3a5378a5dcb7bcc1fd1997f6e156a84abd4';
8-
98
$download_dir = dirname($php_archive_file);
109
$download_php_counter = 0;
1110

sapi/scripts/tencent-cloud-object-storage.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ test -f ${APP_RUNTIME} || curl -fSLo ${APP_RUNTIME} https://github.com/tencentyu
116116
chmod a+x ${APP_RUNTIME}
117117

118118
BUCKET_NAME=$(grep "\- name: " ${CLOUD_OBJECT_STORAGE_CONFIG} | sed 's/\- name: //g' | sed 's/^ *//;s/ *$//' | tr -d '"')
119-
COSCLI="${__PROJECT__}/var/tencent-cloud-object-storage/${APP_RUNTIME} --config-path ${CLOUD_OBJECT_STORAGE_CONFIG} --log-path ${__PROJECT__}/var/tencent-cloud-object-storage/coscli.log "
119+
COSCLI="${__PROJECT__}/var/tencent-cloud-object-storage/${APP_RUNTIME} --config-path ${CLOUD_OBJECT_STORAGE_CONFIG} --log-path ${__PROJECT__}/var/tencent-cloud-object-storage/"
120120
COS_BUCKET_FOLDER="cos://${BUCKET_NAME}/dist/"
121121

122122
if [ "${UPLOAD_TYPE}" == 'all' ]; then
@@ -135,17 +135,17 @@ set -u
135135
if [ "${UPLOAD_TYPE}" == 'all' ]; then
136136
SWOOLE_VERSION=$(echo ${SWOOLE_CLI_VERSION} | awk -F '.' '{ printf "%s.%s.%s" ,$1,$2,$3 }')
137137
cd ${__PROJECT__}/var/artifact-hash/${SWOOLE_CLI_VERSION}
138-
${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
139-
${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
140-
${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
141-
${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
142-
${COSCLI} sync swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
138+
${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-cygwin-x64.zip ${COS_BUCKET_FOLDER}
139+
${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-arm64.tar.xz ${COS_BUCKET_FOLDER}
140+
${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-linux-x64.tar.xz ${COS_BUCKET_FOLDER}
141+
${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-arm64.tar.xz ${COS_BUCKET_FOLDER}
142+
${COSCLI} cp swoole-cli-${SWOOLE_VERSION}-macos-x64.tar.xz ${COS_BUCKET_FOLDER}
143143
cd ${__PROJECT__}
144144
exit 0
145145
fi
146146

147147
if [ "${UPLOAD_TYPE}" == 'single' ]; then
148-
${COSCLI} sync ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
148+
${COSCLI} cp ${UPLOAD_FILE} ${COS_BUCKET_FOLDER}
149149
exit 0
150150
fi
151151

sapi/src/Preprocessor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -800,9 +800,7 @@ public function execute(): void
800800
}
801801

802802
$this->generateFile(__DIR__ . '/template/make.php', $this->rootDir . '/make.sh');
803-
804803
shell_exec('chmod a+x ' . $this->rootDir . '/make.sh');
805-
806804
$this->mkdirIfNotExists($this->rootDir . '/bin');
807805
$this->generateFile(__DIR__ . '/template/license.php', $this->rootDir . '/bin/LICENSE');
808806
$this->generateFile(__DIR__ . '/template/credits.php', $this->rootDir . '/bin/credits.html');

sapi/src/builder/library/gettext.php

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
use SwooleCli\Preprocessor;
55

66
return function (Preprocessor $p) {
7+
8+
// gettext 包含 libintl 库
79
// 在常见的 Linux 发行版里,libintl 是由 libc 提供的,此时 gettext 编译的时候就不会附带 libintl;
810
// 而如果在 macOS 上,由于 macOS 的 libc 没有 libintl 的 API,所以 gettext 编译的时候就要附带 libintl
911
// 详情: https://jia.je/devops/2023/07/08/gentoo-prefix-m1/#libintl
10-
1112
$gettext_prefix = GETTEXT_PREFIX;
1213
$libunistring_prefix = LIBUNISTRING_PREFIX;
1314
$iconv_prefix = ICONV_PREFIX;
1415
$libxml2_prefix = LIBXML2_PREFIX;
1516
$ncurses_prefix = NCURSES_PREFIX;
16-
1717
$options = '';
1818
if ($p->isMacos()) {
1919
$options .= ' --with-included-gettext ';
@@ -56,31 +56,23 @@
5656
--with-libunistring-prefix={$libunistring_prefix} \
5757
--without-emacs \
5858
--without-lispdir \
59-
--without-cvs \
6059
--disable-acl \
6160
--disable-java \
6261
--disable-csharp \
62+
--without-cvs \
6363
--without-git \
6464
--without-xz \
6565
{$options} \
6666
6767
EOF
6868
)
69-
->withDependentLibraries(
70-
'libunistring',
71-
'libiconv',
72-
'ncurses',
73-
'libxml2',
74-
'zlib'
75-
)
69+
->withDependentLibraries('libunistring', 'libiconv', 'ncurses', 'libxml2', 'zlib')
7670
);
7771

7872
$p->withVariable('CPPFLAGS', '$CPPFLAGS -I' . $gettext_prefix . '/include');
7973
$p->withVariable('LDFLAGS', '$LDFLAGS -L' . $gettext_prefix . '/lib');
8074
$p->withVariable('LIBS', '$LIBS -lintl ');
81-
8275
if ($p->isMacos()) {
8376
$p->withFramework('CoreFoundation');
8477
}
85-
8678
};

sapi/src/constants.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,3 @@
6363
define("AOM_PREFIX", $p->getGlobalPrefix() . '/aom');
6464
define("SVT_AV1_PREFIX", $p->getGlobalPrefix() . '/svt_av1');
6565
define("LIBYUV_PREFIX", $p->getGlobalPrefix() . '/libyuv');
66-

0 commit comments

Comments
 (0)