Skip to content

Add framework linking for iOS builds. #14541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 4, 2025
Merged

Add framework linking for iOS builds. #14541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7287e8
Add framework linking for iOS builds.
freakboy3742 May 1, 2025
3965d8d
Work around the mising RECORD file with homebrew pip.
freakboy3742 May 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ jobs:
# productive -- only victim blaming -- however it bites particularly badly because this is a container/VM
# See commit 5c479d7a13a518c18ccb4dc3b6bdd7bfc2a9bdb5 for a more thorough analysis.
find /opt/homebrew/Cellar/python* -name EXTERNALLY-MANAGED -print0 | xargs -0 rm -vf
# Homebrew's installation of pip 25.0.1 in Python 3.13.3 is broken; it
# doesn't include a RECORD file, so it can't be upgraded by pip. Create
# a dummy RECORD file.
PIP_RECORD=$(python3 -c "import pip, os; print(f'{os.path.dirname(pip.__file__)}-{pip.__version__}.dist-info/RECORD')")
touch $PIP_RECORD
# use python3 from homebrew because it is a valid framework, unlike the actions one:
# https://github.com/actions/setup-python/issues/58
- run: brew install pkg-config ninja llvm qt@5 boost ldc hdf5 openmpi lapack scalapack sdl2 boost-python3 gtk-doc zstd ncurses objfw libomp
Expand Down
10 changes: 8 additions & 2 deletions mesonbuild/dependencies/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,14 @@ def __init__(self, name: str, environment: 'Environment',
SystemDependency.__init__(self, name, environment, kwargs)
_PythonDependencyBase.__init__(self, installation, kwargs.get('embed', False))

# match pkg-config behavior
if self.link_libpython:
# For most platforms, match pkg-config behavior. iOS is a special case;
# check for that first, so that check takes priority over
# `link_libpython` (which *shouldn't* be set, but just in case)
if self.platform.startswith('ios-'):
# iOS doesn't use link_libpython - it links with the *framework*.
self.link_args = ['-framework', 'Python', '-F', self.variables.get('prefix')]
self.is_found = True
elif self.link_libpython:
# link args
if mesonlib.is_windows():
self.find_libpy_windows(environment, limited_api=False)
Expand Down
Loading