From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 13 Apr 2022 03:35:59 +0000 (-0700)
Subject: ola: fix compilation with musl 1.2.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6b95596ba291f02c7bc9289da9f296409729a77;p=feed%2Fpackages.git

ola: fix compilation with musl 1.2.3

Upstream sent patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit e35467459b8b7d51d498e380c8216b79b0dc4fd3)
---

diff --git a/net/ola/Makefile b/net/ola/Makefile
index a0abec3c6d..3a2f1a85b6 100644
--- a/net/ola/Makefile
+++ b/net/ola/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ola
 PKG_VERSION:=0.10.8
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/OpenLightingProject/ola/tar.gz/$(PKG_VERSION)?
diff --git a/net/ola/patches/030-musl-123.patch b/net/ola/patches/030-musl-123.patch
new file mode 100644
index 0000000000..838340b909
--- /dev/null
+++ b/net/ola/patches/030-musl-123.patch
@@ -0,0 +1,26 @@
+From 418b825ed98d84a5c781267df1e84c3819675d09 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Tue, 12 Apr 2022 20:34:55 -0700
+Subject: [PATCH] ola: fix compilation with musl 1.2.3
+
+musl 1.2.3 defines NULL as nullptr. Cannot use reinterpret_cast with nullptr.
+
+No idea why this is even here. NULL in C == 0.
+---
+ ola/AutoStart.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/ola/AutoStart.cpp
++++ b/ola/AutoStart.cpp
+@@ -110,11 +110,7 @@ TCPSocket *ConnectToServer(unsigned shor
+     // Try to start the server, we pass --daemon (fork into background) and
+     // --syslog (log to syslog).
+     execlp("olad", "olad", "--daemon", "--syslog",
+-#ifdef __FreeBSD__
+            reinterpret_cast<char*>(0));
+-#else
+-           reinterpret_cast<char*>(NULL));
+-#endif  // __FreeBSD__
+     OLA_WARN << "Failed to exec: " << strerror(errno);
+     _exit(1);
+   }