-
-
Notifications
You must be signed in to change notification settings - Fork 729
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix msgpack runtime on big-endian OpenBSD/sparc64 #7181
Conversation
@klemensn Hmm, the CI is unhappy, https://linux.die.net/man/3/ntohl man page says it needs |
This reverts commit 63beb57. ntohl(3) requires <arpa/inet.h> which got removed from the !WIN32 block. Found through borgbackup#7181 failing CI after only applying msgpack-python's patches: https://github.com/borgbackup/borg/actions/runs/3605243326/jobs/6080079422#step:8:51 ``` src/borg/algorithms/msgpack/sysdep.h:90:28: error: ‘ntohs’ was not declared in this scope 90 | # define _msgpack_be16(x) ntohs(x) | ^~~~~ ```
Indeed. I guess this header is pulled in by something else already on OpenBSD. |
Other big-endian OpenBSD architectures such as macppc and octeon are NOT effected by this, hence the updated PR title. This is most likely due to the fact that octeon and macppc use clang 13.0.0 from base while sparc64 still uses GCC 8.4.0 from ports to build borgbackup and msgpack-python packages. |
Codecov Report
@@ Coverage Diff @@
## 1.1-maint #7181 +/- ##
=============================================
- Coverage 79.66% 79.06% -0.60%
=============================================
Files 27 27
Lines 10595 10595
Branches 2172 2172
=============================================
- Hits 8440 8377 -63
- Misses 1614 1673 +59
- Partials 541 545 +4
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Ah, CI is happy again. So I guess msgpack project should also revert that change. |
I've pointed that out already in their PR. |
Can you increase that (...borg1 -> ...borg2) and add a small description there? Maybe first wait for feedback from msgpack project though. |
They just did through msgpack/msgpack-python#514. |
OK, looks like this is finished (and CI is happy)? |
Yup, pretty sure that's it. |
Thanks for fixing this! (such platform stuff is hard to test) |
Would you be able to add new platforms to your CI? |
IIRC github actions only has intel/amd CPUs (and linux, macos and windows as OS). So guess it would need quite some work to do BE testing there, like using kvm to emulate a BE CPU, having some appropriate BE-supporting OS in that VM, ... Could be also quite slow. For bootstrapping that VM as well as for the borg pytest test run. |
Backport msgpack/msgpack-python#513 (as discussed in
#6149 (comment)) and msgpack/msgpack-python#514.
Applied with
Tested on OpenBSD/sparc64 (big-endian) and OpenBSD/amd64 (little-endian).