From e23b230a203ea974479fdc9fbc703eaa23b4d35b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Jul 2022 11:36:15 +0200 Subject: [PATCH] package/ola: fix build with musl 1.2.3 Fix the following build failure with musl 1.2.3: ola/AutoStart.cpp: In function 'ola::network::TCPSocket* ola::client::ConnectToServer(short unsigned int)': ola/AutoStart.cpp:116:12: error: invalid cast from type 'std::nullptr_t' to type 'char*' 116 | reinterpret_cast(NULL)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/88be323e64f66433cabc962e719307b5fb6a6177 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-ola-fix-compilation-with-musl-1-2-3.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch diff --git a/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch b/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch new file mode 100644 index 0000000000..f236ef0957 --- /dev/null +++ b/package/ola/0001-ola-fix-compilation-with-musl-1-2-3.patch @@ -0,0 +1,35 @@ +From eb31017284f9a1c95602a9c06d606df6b558a691 Mon Sep 17 00:00:00 2001 +From: Rosen Penev +Date: Thu, 14 Apr 2022 17:39:32 -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. + +Signed-off-by: Rosen Penev +[Retrieved from: +https://github.com/OpenLightingProject/ola/pull/1773/commits/eb31017284f9a1c95602a9c06d606df6b558a691] +Signed-off-by: Fabrice Fontaine +--- + ola/AutoStart.cpp | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ola/AutoStart.cpp b/ola/AutoStart.cpp +index 89fa51f115..4dbe20d317 100644 +--- a/ola/AutoStart.cpp ++++ b/ola/AutoStart.cpp +@@ -110,11 +110,11 @@ TCPSocket *ConnectToServer(unsigned short port) { + // 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(0)); ++#if __cplusplus >= 201103L ++ nullptr); + #else + reinterpret_cast(NULL)); +-#endif // __FreeBSD__ ++#endif // __cplusplus >= 201103L + OLA_WARN << "Failed to exec: " << strerror(errno); + _exit(1); + }