python312Packages.cffi: remove unnecessary Darwin patch (attempt 2) #382404
Conversation
This file contains 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
It doesn’t appear to do anything on Darwin, so drop it.
This header contains availability annotations for libffi functions, which some packages (such as Python’s) check to determine whether they are building against Apple’s libffi fork.
…ch"" This reverts commit 340c3f6.
reckenrode
force-pushed
the
push-ronxxroxsumq
branch
from
1026639 to
741de2b
Compare
|
I dropped the commit to build I also checked the segments on the |
emilazy
approved these changes
Feb 17, 2025
emilazy
reviewed
Feb 17, 2025
Comment on lines
+69
to
+71
| # Make sure Apple’s header with availability annotations is installed in place of the generated one. | ||
| # Use `macCatalyst` instead of `iosmac` to avoid errors due to invalid availability annotations. | ||
| substitute darwin/include/ffi.h "$dev/include/ffi.h" --replace-fail iosmac macCatalyst |
There was a problem hiding this comment.
By the way, is this an internal SDK difference or a bootstrap tools thing or what?
There was a problem hiding this comment.
The header that Apple ships uses macCatalyst, but the one in the source release uses iosmac. I assume they do some sort of post-processing when they build the SDK.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR updates the build of darwin.libffi to more closely match the way the system library is built, which should allow the Python cffi patch to be dropped.
Pinging @emilazy who worked on the previous attempt to drop it and @patryk4815 who reported #380786 (which is now closed, but that issue prompted the work on this PR). It would be good to know whether (the previous version of?) unicorn still exhibits the reported issue.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.