release/1.8: Work around capnproto incompatibility#2267
Merged
Conversation
For some reason including capnproto before X11 header makes the compiler happy. See capnproto/capnproto#1393
RAOF
approved these changes
Jan 12, 2022
Contributor
RAOF
left a comment
RAOF
left a comment
There was a problem hiding this comment.
Can't¹ hurt!
bors r+
¹: Or, at least, is extremely unlikely to hurt 😉
bors Bot
added a commit
that referenced
this pull request
Jan 12, 2022
2266: release/1.8: Stop forcing systemtap integration r=RAOF a=z3ntu
```
This isn't available on Alpine (and other distros)
/usr/include/lttng/tracepoint.h:39:10: fatal error: sys/sdt.h: No such file or directory
39 | #include <sys/sdt.h>
| ^~~~~~~~~~~
(cherry picked from commit 77920fb)
```
Original pull request: #1957
2267: release/1.8: Work around capnproto incompatibility r=RAOF a=z3ntu
For some reason including capnproto before X11 header makes the compiler
happy.
See capnproto/capnproto#1393
---
Capnproto is gone with Mir 2.x so it's not a problem there fortunately.
Co-authored-by: Luca Weiss <luca@z3ntu.xyz>
Contributor
|
This PR was included in a batch that was canceled, it will be automatically retried |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
For some reason including capnproto before X11 header makes the compiler
happy.
See capnproto/capnproto#1393
Capnproto is gone with Mir 2.x so it's not a problem there fortunately.