Skip to content

[22.03] ola: fix compilation with musl 1.2.3 #18350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2022
Merged

[22.03] ola: fix compilation with musl 1.2.3 #18350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/ola/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)?
Expand Down
26 changes: 26 additions & 0 deletions net/ola/patches/030-musl-123.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 418b825ed98d84a5c781267df1e84c3819675d09 Mon Sep 17 00:00:00 2001
Copy link
Member

@BKPepe BKPepe Apr 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a pending patch - OpenLightingProject/ola#1773

There should be used different patch numbering as 030 means backport.
See: https://openwrt.org/docs/guide-developer/toolchain/use-patches-with-buildsystem#naming_patches

From: Rosen Penev <[email protected]>
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);
}