Simplified code

This commit is contained in:
Andrew Murray 2025-06-25 20:07:37 +10:00
parent 1c2ec9fff9
commit d393d0937e
2 changed files with 3 additions and 7 deletions

View File

@ -43,10 +43,9 @@ if [[ "$CIBW_PLATFORM" == "ios" ]]; then
IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path) IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path)
CMAKE_SYSTEM_NAME=iOS CMAKE_SYSTEM_NAME=iOS
if [[ "$IOS_SDK" == "iphonesimulator" ]]; then
IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET-simulator
else
IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET
if [[ "$IOS_SDK" == "iphonesimulator" ]]; then
IOS_HOST_TRIPLE=$IOS_HOST_TRIPLE-simulator
fi fi
# GNU Autotools doesn't recognize the existence of arm64-apple-ios-simulator # GNU Autotools doesn't recognize the existence of arm64-apple-ios-simulator
@ -171,7 +170,6 @@ function build_brotli {
function build_harfbuzz { function build_harfbuzz {
if [ -e harfbuzz-stamp ]; then return; fi if [ -e harfbuzz-stamp ]; then return; fi
python3 -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-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)

View File

@ -51,8 +51,6 @@ def test_wheel_features() -> None:
elif sys.platform == "ios": elif sys.platform == "ios":
# Can't distribute raqm due to licensing, and there's no system version; # Can't distribute raqm due to licensing, and there's no system version;
# fribidi and harfbuzz won't be available if raqm isn't available. # fribidi and harfbuzz won't be available if raqm isn't available.
expected_features.remove("fribidi") expected_features -= {"raqm", "fribidi", "harfbuzz"}
expected_features.remove("raqm")
expected_features.remove("harfbuzz")
assert set(features.get_supported_features()) == expected_features assert set(features.get_supported_features()) == expected_features