kumquat-buildroot/package/olsr/0006-build-patch-for-gpsd-3-25.patch
Fabrice Fontaine 4c32b3d9ff package/olsr: fix build with gpsd >= 3.25
Fix the following build failure with gpsd >= 3.25 raised since commit
3c7fece853:

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>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-09-30 19:11:12 +02:00

32 lines
982 B
Diff

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
*/