mirror of
https://github.com/godotengine/buildroot.git
synced 2025-12-31 09:48:56 +03:00
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>
(cherry picked from commit 4c32b3d9ff8727fd61dbf2d55105c2900f0d2dec)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
3ff6c0ba88
commit
7f420077e0
@@ -1038,6 +1038,7 @@ package/olsr/0001-olsrd-migrate-to-using-bison-3.7.1.patch Upstream
|
||||
package/olsr/0002-lib-pud-Makefile-fix-parallel-build.patch Upstream
|
||||
package/olsr/0003-pud-adapt-to-API-changes-in-gpsd-3-20.patch Upstream
|
||||
package/olsr/0005-lib-pud-src-gpsdclient.c-drop-handling-of-gpsdata-fi.patch Upstream
|
||||
package/olsr/0006-build-patch-for-gpsd-3-25.patch Upstream
|
||||
package/olsr/S50olsr Indent Shellcheck Variables
|
||||
package/omxplayer/0001-Update-Makefile-to-be-compatible-with-buildroot.patch Upstream
|
||||
package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream
|
||||
|
||||
31
package/olsr/0006-build-patch-for-gpsd-3-25.patch
Normal file
31
package/olsr/0006-build-patch-for-gpsd-3-25.patch
Normal file
@@ -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
|
||||
*/
|
||||
Reference in New Issue
Block a user