Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork33.3k
bpo-41100: Support macOS 11 and Apple Silicon#22855
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.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
ronaldoussoren merged 49 commits intopython:masterfromronaldoussoren:macos11-deploy-earlier-branchNov 8, 2020
Merged
bpo-41100: Support macOS 11 and Apple Silicon#22855
ronaldoussoren merged 49 commits intopython:masterfromronaldoussoren:macos11-deploy-earlier-branchNov 8, 2020
+1,587 −345
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
We should consider just dropping support for macOS 10.4 hereto simplify the code.
This is support for ctypes on macOS/arm64 basedon PR 21249 by Lawrence D'Anna (Apple).Changes:- changed __builtin_available tests from 11.0 to 10.15- added test to setup.py for ffi_closure_alloc and use that in malloc_closure.c- Minor change in the code path for ffi_prep_closure_var (coding style change)
The preprocessor guard in the old version doesn't work, andisn't really needed (10.4 only supported 32-bit code whereunsigned long is the same as uint32_t).
This also adds an option to stop building after compiling the3th-party dependencies, as well as a script for archiving thosedependencies. This makes it easier to work on the build.There are three changes to build-installer.py related to universal2support:1. Add 'universal2' information to build-installer.py;2. Building OpenSSL for arm64 requires a patch at this time;3. For some reason I had to patch the Tcl build to avoid a build error.
Needed because my previous workaround doesn't work anymore.This uses a private API, that should be made public later...
- __builtin_available is not present in the compiler, fall back to the ancient way of testing if a symbol is usable.- Logic error code in pytime.c resulted in a compile error.
…oren/cpython into macos11-deploy-earlier-branch
The tests are not entirely done yet, and somethingsimilar needs to be done for the time module.
…on isn't present.I don't particularly like the code duplication, but this codeshould be pretty stable.
I've started work on the backport to 3.8. That's more work that the 3.9 backport due to unrelated changes that interfere with merging. I expect to have a PR with a manual complete backport later today, and might create a manual backport of a subset of the functionality as well. |
5 tasks
mozillazg pushed a commit to mozillazg/pypy that referenced this pull requestJan 14, 2021
On Big Sur, there is no longer a separate dylib file for each systemlibrary. Instead, they have been combined into a single shared cachefile. As a result, it no longer suffices to check file existence todetermine whether a system library is present. Fix this by calling_dyld_shared_cache_contains_path to check the dyld shared cache as well.The changes under lib-python/ are copied frompython/cpython#22855.The _dyld_shared_cache_contains_path function is exposed to the ctypespython code using CFFI, similar to what is done in other modules, suchas lib_pypy/_sha3.Fixes issue #3314.
adorilson pushed a commit to adorilson/cpython that referenced this pull requestMar 13, 2021
Co-authored-by: Lawrence D’Anna <lawrence_danna@apple.com>* Add support for macOS 11 and Apple Silicon (aka arm64) As a side effect of this work use the system copy of libffi on macOS, and remove the vendored copy* Support building on recent versions of macOS while deploying to older versions This allows building installers on macOS 11 while still supporting macOS 10.9.
isuruf added a commit to isuruf/cpython that referenced this pull requestMay 31, 2021
pythonGH-25806 was a python 3.8 backport ofpythonGH-22855 to support macOS 11,but didn't backport the changes that enabled building pythonwith a new macOS SDK and target an older macOS version.This commit adds support for that.
colesbury referenced this pull request in colesbury/nogilOct 7, 2021
…295)* [3.9] bpo-41100: Support macOS 11 and Apple Silicon (GH-22855)Co-authored-by: Lawrence D’Anna <lawrence_danna@apple.com>* Add support for macOS 11 and Apple Silicon (aka arm64) As a side effect of this work use the system copy of libffi on macOS, and remove the vendored copy* Support building on recent versions of macOS while deploying to older versions This allows building installers on macOS 11 while still supporting macOS 10.9..(cherry picked from commit4176193)Co-authored-by: Ronald Oussoren <ronaldoussoren@mac.com>* Back port of changes to _decimal to support arm64* temp_dir is in test.support in 3.9
| elifnot_supports_arm64_builds(): | ||
| # Look for "-arch arm64" and drop that | ||
| foridxinrange(len(compiler_so)): |
ddl-jamesleeDec 1, 2021 • edited
Loading Uh oh!
There was an error while loading.Please reload this page.
edited
Uh oh!
There was an error while loading.Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Whenidx islen(compiler_so)-1, it will throw anIndexError exception.
So, it should befor idx in range(len(compiler_so)-1):
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
dang, looks like you're right
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
This PR was merged over a year ago and has long since been released to the field. Please open a new issue on the bug tracker and, if possible, provide a PR. Otherwise, it will likely be forgotten about it. Thanks!
zware added a commit to zware/cpython that referenced this pull requestDec 26, 2022
It was an ancient, modified copy of libffi that has not been in usesincepythonGH-22855.
zware added a commit to zware/cpython that referenced this pull requestDec 26, 2022
It has had no effect on non-macOS platforms for a long time, and has hadthe non-obvious effect of invoking `pkg_config` and not setting`-DUSING_APPLE_OS_LIBFFI` on macOS sincepythonGH-22855.
zware added a commit that referenced this pull requestDec 28, 2022
zware added a commit that referenced this pull requestDec 28, 2022
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Labels
None yet
15 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading.Please reload this page.
This merges my other two PRs, and improves on the PR that implements support for older macOS versions.
on systems that don't support his.
https://bugs.python.org/issue41100