lib/pud: fix build with gpsd >= 3.25 #122
Open
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
This reverts commit 59417b5, reversing changes made to b52c790. We can't simply remove that code, otherwise we do break the build for versions of gpsd that came before gpsd-3.25. Signed-off-by: Yann E. MORIN <[email protected]>
Our `struct fixsource_t` conflicts with the one provide in gps.h since gpsd 3.25. gps.h only defines an API version; it does not provide the version of gpsd itself (and that's probably good), so we can't compare the gpsd version to decde whether we need to define that struct or not. However, `struct fixsource_t` was moved as part of API 14, so we use that instead. This is not very clean, as the proper fix would be to detect that as part of configure-like step, but since we have none, we need to detect it at build time with C preprocessor tests. Closes: OLSR#118 Supersedes: OLSR#119 OLSR#120 OLSR#121 Signed-off-by: Yann E. MORIN <[email protected]>
yann-morin-1998
changed the title
|
@mathiashro As requested in #120, here's a respin of the gpsd 3.25 fix, with a revert of #119. |
|
@mathiashro Do you have any feedback to provide, please? Currently, the build is broken with versions of gpsd older than 3.25, which are |
|
This does not seem correct. The major version was already bumped for v23: However, the fixsource_t was changed in v24: So v23 will not build with this change here? |
n-peugnet
pushed a commit
to n-peugnet/olsrd
that referenced
this pull request
Jun 27, 2024
Introduce back the fixsource_t struct definition based on libgps version, retrieved from pkg-config. This fixes the build with libgps versions inferior or equal to 3.24 Closes: OLSR#122 Signed-off-by: Nicolas Peugnet <[email protected]>
n-peugnet
added a commit
to n-peugnet/olsrd
that referenced
this pull request
Jun 27, 2024
Introduce back the fixsource_t struct definition based on libgps version, retrieved from pkg-config. This fixes the build with libgps versions inferior or equal to 3.24 Closes: OLSR#122 Co-authored-by: Nicolas Peugnet <[email protected]>
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.
Fix build against gpsd-3.25.
Fixes: #118
Supersedes: #119 #120 #121
This was tested to fix the build with gpsd-3.25, as detected by Buildroot autobuilders:
http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e