Update for building on modern systems, including Apple Silicon #2
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's probably worth tagging this as 2.5.0-pebble5 if merged - should I update the version in this commit or will that happen after this is merged? |
macOS on Apple Silicon does not allow memory pages to be marked as RWX. Instead, to achieve the same behaviour, pages be allocated with the MAP_JIT flag, and the permissions are dynamically switched between RW and RX using the pthread_jit_write_protect function.[1] Most of this commit is derived from upstream work in [2], with changes as necessary to apply onto this older tree. [1]: https://developer.apple.com/documentation/apple-silicon/porting-just-in-time-compilers-to-apple-silicon [2]: https://gitlab.com/qemu-project/qemu/-/commit/653b87eb36045b506b79f0bb433016ef1c54bc9a Signed-off-by: Ruby Iris Juric <[email protected]>
At some point, sys/memfd.h was removed from most systems.[1] Instead, the definitions we need from it can now be found in sys/mman.h. [1]: https://stackoverflow.com/questions/56615488/getting-gcc-error-sys-memfd-h-no-such-file-or-directory Signed-off-by: Ruby Iris Juric <[email protected]>
Without these includes, the build fails on some systems due to missing declarations for qemu_system_reset_request, which live in sysemu/sysemu.h. Signed-off-by: Ruby Iris Juric <[email protected]>
Similarly to 745fb61, it seems some definitions may have been moved around in the C stdlib, and accessing major requires explicitly including sys/sysmacros.h. Signed-off-by: Ruby Iris Juric <[email protected]>
Somewhere in the macOS build, there's an #include for <version>. Because the root source directory is added to the include path during build, that include picks up this VERSION file, which makes the build fail since it doesn't contain valid C code. Renaming the file to prevent the name collision allows the build to proceed as normal. Signed-off-by: Ruby Iris Juric <[email protected]>
All of the old submodules are currently dead, either because of dropping support for the old git:// scheme (like GitHub), or because the repos have been moved to a new location. Signed-off-by: Ruby Iris Juric <[email protected]>
Sorixelle
force-pushed
the
modern-build-support
branch
from
cff84e6 to
6b5da58
Compare
|
Works for me. We'd have to create and push a new tag after this is merged. Also we might want to mention that unlike the FW, Python 2 is required to build this. |
|
It should be pretty trivial to port these scripts to Python 3, especially since there's no external dependencies - |
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 is an upstream of the patches in https://github.com/Sorixelle/pebble.nix/tree/main/derivations/pebble-qemu that allow this repo to be built, and the resulting binaries to be run on modern systems, particularly Apple Silicon macOS systems. All of this is generally useful outside of a Nix environment, so it would be nice to have here so anyone can build this repo easily if they need to.