olsrd: fix compilation with musl 1.2.x 596/head
authorRosen Penev <rosenp@gmail.com>
Tue, 11 Aug 2020 19:28:53 +0000 (12:28 -0700)
committerRosen Penev <rosenp@gmail.com>
Tue, 11 Aug 2020 19:38:12 +0000 (12:38 -0700)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
olsrd/Makefile
olsrd/patches/010-musl.patch [new file with mode: 0644]

index 7eb05e9840a5e36b4a36519e1cf428e82ea5b981..8a2f33a10d914eb272f9683744bb1d59157066a0 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=olsrd
 PKG_SOURCE_DATE:=2020-06-18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git
diff --git a/olsrd/patches/010-musl.patch b/olsrd/patches/010-musl.patch
new file mode 100644 (file)
index 0000000..3023f43
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/lib/pud/nmealib/src/info.c
++++ b/lib/pud/nmealib/src/info.c
+@@ -172,7 +172,7 @@ bool nmeaTimeParseDate(const char *s, NmeaTime *date) {
+ void nmeaTimeSet(NmeaTime *utc, uint32_t *present, struct timeval *timeval) {
+   struct timeval tv;
+   struct tm tm;
+-  long usec;
++  time_t usec;
+   if (!utc) {
+     return;