Cleanups and typos identified by code review.

This commit is contained in:
Russell Keith-Magee 2024-10-25 10:55:30 +08:00
parent 0fe55d6115
commit fc35fcc5ea
No known key found for this signature in database
GPG Key ID: 3D2DAB6A37BB5BC3
2 changed files with 5 additions and 5 deletions

View File

@ -23,7 +23,7 @@ OPENJPEG_VERSION=2.5.2
XZ_VERSION=5.6.3 XZ_VERSION=5.6.3
TIFF_VERSION=4.6.0 TIFF_VERSION=4.6.0
LCMS2_VERSION=2.16 LCMS2_VERSION=2.16
RAQM_VERSION=0.7.1 RAQM_VERSION=0.10.2
FRIBIDI_VERSION=1.0.16 FRIBIDI_VERSION=1.0.16
if [[ -n "$IS_MACOS" ]]; then if [[ -n "$IS_MACOS" ]]; then
GIFLIB_VERSION=5.2.2 GIFLIB_VERSION=5.2.2
@ -71,7 +71,7 @@ function build_brotli {
function build_harfbuzz { function build_harfbuzz {
if [ -e harfbuzz-stamp ]; then return; fi if [ -e harfbuzz-stamp ]; then return; fi
python -m pip install meson ninja python3 -m pip install meson ninja
local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
(cd $out_dir \ (cd $out_dir \
@ -176,9 +176,9 @@ if [[ -n "$IS_MACOS" ]]; then
mkdir -p "$BUILD_PREFIX/bin" mkdir -p "$BUILD_PREFIX/bin"
mkdir -p "$BUILD_PREFIX/lib" mkdir -p "$BUILD_PREFIX/lib"
# Ensure pkg-confg and cmake are available # Ensure pkg-config and cmake are available
build_pkg_config build_pkg_config
python -m pip install cmake python3 -m pip install cmake
fi fi
wrap_wheel_builder build wrap_wheel_builder build

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -e set -e
# For Unix, Ensure fibidi is installed by the system. # For Unix, ensure fribidi is installed by the system.
if [[ "$OSTYPE" != "darwin"* ]]; then if [[ "$OSTYPE" != "darwin"* ]]; then
if [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then if [ "${AUDITWHEEL_POLICY::9}" == "musllinux" ]; then
apk add curl fribidi apk add curl fribidi