meson: Fix operation of D-Bus path macros #1182
Merged
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
ghost
self-assigned this
ghost
changed the title
ghost
marked this pull request as ready for review
rdmark
reviewed
Jul 1, 2024
meson_options.txt
Outdated
Comment on lines
201
to
207
| value: '/bin/dbus-daemon', | ||
| value: '', | ||
| description: 'Set path to D-Bus daemon', | ||
| ) | ||
| option( | ||
| 'with-dbus-sysconf-path', | ||
| type: 'string', | ||
| value: '/etc/dbus-1/system.d', | ||
| value: '', |
There was a problem hiding this comment.
It's a bit unfortunate that the default value isn't defined here anymore, since we lose the transparency to users. I assume you did this because you want a fallback for macOS?
There was a problem hiding this comment.
The value: argument in meson_options.txt may only be a string, int, bool, or array of those. The default dbus sysconf path is a concatenation of the prefix variable and 'etc/dbus-1/system.d' so we have to leave it as an empty string. We can keep the default bus-daemon path though as it is just a pure string.
rdmark
approved these changes
Jul 1, 2024
|
rdmark
pushed a commit
that referenced
this pull request
Jul 20, 2024
rdmark
pushed a commit
that referenced
this pull request
Jul 21, 2024
This pull request was closed.
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 commit fixes errors in setting the correct dbus-daemon and dbus-sysconf path variables. The variables now match those set by autotools.