From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@buildroot.org
Cc: Julien Olivain <ju.o@free.fr>,
Fabrice Fontaine <fontaine.fabrice@gmail.com>
Subject: [Buildroot] [PATCH 1/1] package/ola: fix build with musl 1.2.3
Date: Thu, 14 Jul 2022 11:36:15 +0200 [thread overview]
Message-ID: <20220714093615.632188-1-fontaine.fabrice@gmail.com> (raw)
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<char*>(NULL));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/88be323e64f66433cabc962e719307b5fb6a6177
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...-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 <rosenp@gmail.com>
+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 <rosenp@gmail.com>
+[Retrieved from:
+https://github.com/OpenLightingProject/ola/pull/1773/commits/eb31017284f9a1c95602a9c06d606df6b558a691]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ 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<char*>(0));
++#if __cplusplus >= 201103L
++ nullptr);
+ #else
+ reinterpret_cast<char*>(NULL));
+-#endif // __FreeBSD__
++#endif // __cplusplus >= 201103L
+ OLA_WARN << "Failed to exec: " << strerror(errno);
+ _exit(1);
+ }
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2022-07-14 9:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 9:36 Fabrice Fontaine [this message]
2022-07-16 22:06 ` [Buildroot] [PATCH 1/1] package/ola: fix build with musl 1.2.3 Yann E. MORIN
2022-08-04 15:03 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220714093615.632188-1-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@buildroot.org \
--cc=ju.o@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.