Skip to content

Commit a6ab428

Browse files
committed
Fix dbus-cxx build for musl
Signed-off-by: Caio Toledo <[email protected]>
1 parent 794e66d commit a6ab428

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ SECTION = "base"
44
LICENSE = "GPLv3"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83"
66

7+
FILEEXTRAPATHS_prepend = "${THISDIR}/files"
78
SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master"
9+
SRC_URI += "file://fix_build_musl.patch"
810
SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e"
911

1012
DEPENDS = "\
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp
2+
index 16e9f7e..aa0b99f 100644
3+
--- a/dbus-cxx/timeout.cpp
4+
+++ b/dbus-cxx/timeout.cpp
5+
@@ -132,7 +132,7 @@ namespace DBus
6+
return m_cobj;
7+
}
8+
9+
- void Timeout::timer_callback_proxy( sigval_t sv ) {
10+
+ void Timeout::timer_callback_proxy( union sigval sv ) {
11+
SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" );
12+
Timeout* t;
13+
t = ( Timeout* ) sv.sival_ptr;
14+
diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h
15+
index 1e469b5..5b69fbb 100644
16+
--- a/dbus-cxx/timeout.h
17+
+++ b/dbus-cxx/timeout.h
18+
@@ -83,7 +83,7 @@ namespace DBus
19+
20+
std::mutex m_arming_mutex;
21+
22+
- static void timer_callback_proxy( sigval_t sv );
23+
+ static void timer_callback_proxy( union sigval sv );
24+
25+
};
26+

0 commit comments

Comments
 (0)