| Message ID | cb456daa92d4ccbb27a8fcef504f86a77a3a0e74.1539101799.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Headers | show |
| Series | gpsd: fix greis driver build with reconfigure disabled | expand |
Hello, On Tue, 9 Oct 2018 19:16:39 +0300, Baruch Siach wrote: > Add a patch fixing undefined function build failure when reconfigure > support is disabled. > > Fixes: > http://autobuild.buildroot.net/results/a13/a13a5d852c83cd1fc9f2d1fc2b7302db515278b8/ > http://autobuild.buildroot.net/results/185/18599ea12a35b9715a67c1f4e5c4e56906235c94/ > http://autobuild.buildroot.net/results/c00/c00d22a6dcadb82a19afab6eacea654d3c41b4c5/ > > Cc: Zoltan Gyarmati <zgyarmati@zgyarmati.de> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > ...-fix-build-with-reconfigure-disabled.patch | 49 +++++++++++++++++++ > 1 file changed, 49 insertions(+) > create mode 100644 package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch Applied to master, thanks. Seems like we're better than upstream at testing the different configuration combinations. It's not the first time we detect this kind of issues in gpsd. Thomas
On 9/10/18 21:38, Thomas Petazzoni wrote: > Hello, > > On Tue, 9 Oct 2018 19:16:39 +0300, Baruch Siach wrote: >> Add a patch fixing undefined function build failure when reconfigure >> support is disabled. >> >> Fixes: >> http://autobuild.buildroot.net/results/a13/a13a5d852c83cd1fc9f2d1fc2b7302db515278b8/ >> http://autobuild.buildroot.net/results/185/18599ea12a35b9715a67c1f4e5c4e56906235c94/ >> http://autobuild.buildroot.net/results/c00/c00d22a6dcadb82a19afab6eacea654d3c41b4c5/ >> >> Cc: Zoltan Gyarmati <zgyarmati@zgyarmati.de> >> Signed-off-by: Baruch Siach <baruch@tkos.co.il> >> --- >> ...-fix-build-with-reconfigure-disabled.patch | 49 +++++++++++++++++++ >> 1 file changed, 49 insertions(+) >> create mode 100644 package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch > > Applied to master, thanks. Seems like we're better than upstream at > testing the different configuration combinations. It's not the first > time we detect this kind of issues in gpsd. Yeah, we should probably ask an upstream developer to be added to the DEVELOPERS file so they see these issues... Regards, Arnout
diff --git a/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch b/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch new file mode 100644 index 000000000000..77badb31cf03 --- /dev/null +++ b/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch @@ -0,0 +1,49 @@ +From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <baruch@tkos.co.il> +Date: Tue, 9 Oct 2018 15:22:46 +0300 +Subject: [PATCH] driver_greis: fix build with reconfigure disabled + +Unhide the definition of greis_parse_input and greis_event_hook since +they are used unconditionally. + +Fixes the following build failure: + +driver_greis.c:969:25: error: 'greis_parse_input' undeclared here (not in a function); did you mean 'generic_parse_input'? + .parse_packet = greis_parse_input, + ^~~~~~~~~~~~~~~~~ + generic_parse_input +driver_greis.c:973:25: error: 'greis_event_hook' undeclared here (not in a function) + .event_hook = greis_event_hook, + ^~~~~~~~~~~~~~~~ + +Cc: Gregory Fong <gregory.fong@virginorbit.com> +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: http://lists.nongnu.org/archive/html/gpsd-dev/2018-10/msg00012.html + + driver_greis.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/driver_greis.c b/driver_greis.c +index 9eb148fc76cd..222bd9daf020 100644 +--- a/driver_greis.c ++++ b/driver_greis.c +@@ -797,7 +797,6 @@ static ssize_t greis_control_send(struct gps_device_t *session, + } + #endif /* CONTROLSEND_ENABLE */ + +-#ifdef RECONFIGURE_ENABLE + static void greis_event_hook(struct gps_device_t *session, event_t event) + { + if (session->context->readonly) +@@ -870,6 +869,7 @@ static gps_mask_t greis_parse_input(struct gps_device_t *session) + return 0; + } + ++#ifdef RECONFIGURE_ENABLE + /** + * Set port operating mode, speed, parity, stopbits etc. here. + * Note: parity is passed as 'N'/'E'/'O', but you should program +-- +2.19.1 +
Add a patch fixing undefined function build failure when reconfigure support is disabled. Fixes: http://autobuild.buildroot.net/results/a13/a13a5d852c83cd1fc9f2d1fc2b7302db515278b8/ http://autobuild.buildroot.net/results/185/18599ea12a35b9715a67c1f4e5c4e56906235c94/ http://autobuild.buildroot.net/results/c00/c00d22a6dcadb82a19afab6eacea654d3c41b4c5/ Cc: Zoltan Gyarmati <zgyarmati@zgyarmati.de> Signed-off-by: Baruch Siach <baruch@tkos.co.il> --- ...-fix-build-with-reconfigure-disabled.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch