| Message ID | 20230212130336.373391-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/olsr: fix build with gpsd >= 3.25 | expand |
Fabrice, All, On 2023-02-12 14:03 +0100, Fabrice Fontaine spake thusly: > Fix the following build failure with gpsd >= 3.25 raised since commit > 3c7fece853f3def9a425eccc384b9dacb1010051: [--SNIP--] > +Signed-off-by: Rui Chen <rui@chenrui.dev> > +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] > +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > +--- > + lib/pud/src/gpsdclient.h | 8 -------- > + 1 file changed, 8 deletions(-) > + > +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h > +index 061056b12..a51dd2211 100644 > +--- a/lib/pud/src/gpsdclient.h > ++++ b/lib/pud/src/gpsdclient.h > +@@ -60,14 +60,6 @@ struct GpsdConnectionState { > + struct devconfig_t dev[MAXUSERDEVS]; > + }; > + > +-/* describe a data source */ > +-struct fixsource_t { > +- char spec[PATH_MAX]; /* working space, will be modified */ > +- char *server; /* pointer into spec field */ > +- char *port; /* pointer into spec field */ > +- char *device; /* pointer into spec field */ > +-}; Given that this breaks the build with older gpsd versions, I suspect this is not goign to be accepted by upstream. I've sent another proposal to fix that issue in a backward compatible manner: https://github.com/OLSR/olsrd/pull/120 Let's see a bit what upstream decides. Regards, Yann E. MORIN. > + /** > + * The gpsd daemon spec > + */ > -- > 2.39.0 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fix the following build failure with gpsd >= 3.25 raised since commit > 3c7fece853f3def9a425eccc384b9dacb1010051: > In file included from src/configuration.h:50, > from src/configuration.c:46: > src/gpsdclient.h:64:8: error: redefinition of 'struct fixsource_t' > 64 | struct fixsource_t { > | ^~~~~~~~~~~ > In file included from src/gpsdclient.h:49, > from src/configuration.h:50, > from src/configuration.c:46: > /tmp/instance-17/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/gps.h:2714:8: note: originally defined here > 2714 | struct fixsource_t > | ^~~~~~~~~~~ > Fixes: > - http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Yanns fix apprently never made it upstream, so committed, thanks.
>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes: >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: >> Fix the following build failure with gpsd >= 3.25 raised since commit >> 3c7fece853f3def9a425eccc384b9dacb1010051: >> In file included from src/configuration.h:50, >> from src/configuration.c:46: >> src/gpsdclient.h:64:8: error: redefinition of 'struct fixsource_t' >> 64 | struct fixsource_t { >> | ^~~~~~~~~~~ >> In file included from src/gpsdclient.h:49, >> from src/configuration.h:50, >> from src/configuration.c:46: >> /tmp/instance-17/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/gps.h:2714:8: note: originally defined here >> 2714 | struct fixsource_t >> | ^~~~~~~~~~~ >> Fixes: >> - http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e >> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > Yanns fix apprently never made it upstream, so committed, thanks. Committed to 2023.02.x and 2023.08.x, thanks.
diff --git a/package/olsr/0006-build-patch-for-gpsd-3-25.patch b/package/olsr/0006-build-patch-for-gpsd-3-25.patch new file mode 100644 index 0000000000..c82bc1bb28 --- /dev/null +++ b/package/olsr/0006-build-patch-for-gpsd-3-25.patch @@ -0,0 +1,31 @@ +From 17d583258969c1d182361e0e168b3cad79ef64e6 Mon Sep 17 00:00:00 2001 +From: Rui Chen <rui@chenrui.dev> +Date: Mon, 16 Jan 2023 18:35:32 -0500 +Subject: [PATCH] build: patch for gpsd 3.25 + +Signed-off-by: Rui Chen <rui@chenrui.dev> +[Retrieved from: https://github.com/OLSR/olsrd/pull/119] +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +--- + lib/pud/src/gpsdclient.h | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/lib/pud/src/gpsdclient.h b/lib/pud/src/gpsdclient.h +index 061056b12..a51dd2211 100644 +--- a/lib/pud/src/gpsdclient.h ++++ b/lib/pud/src/gpsdclient.h +@@ -60,14 +60,6 @@ struct GpsdConnectionState { + struct devconfig_t dev[MAXUSERDEVS]; + }; + +-/* describe a data source */ +-struct fixsource_t { +- char spec[PATH_MAX]; /* working space, will be modified */ +- char *server; /* pointer into spec field */ +- char *port; /* pointer into spec field */ +- char *device; /* pointer into spec field */ +-}; +- + /** + * The gpsd daemon spec + */
Fix the following build failure with gpsd >= 3.25 raised since commit 3c7fece853f3def9a425eccc384b9dacb1010051: In file included from src/configuration.h:50, from src/configuration.c:46: src/gpsdclient.h:64:8: error: redefinition of 'struct fixsource_t' 64 | struct fixsource_t { | ^~~~~~~~~~~ In file included from src/gpsdclient.h:49, from src/configuration.h:50, from src/configuration.c:46: /tmp/instance-17/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/include/gps.h:2714:8: note: originally defined here 2714 | struct fixsource_t | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/47a619686bb47debd525c92aa7e14bee5c40ca9e Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- .../olsr/0006-build-patch-for-gpsd-3-25.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/olsr/0006-build-patch-for-gpsd-3-25.patch