2 files changed, 28 insertions, 0 deletions

diff --git a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb
index 44f8180bc9..db4e591cb9 100644
--- a/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb
+++ b/meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb
@@ -4,7 +4,9 @@ SECTION = "base"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4cf0188f02184e1e84b9586ac53c3f83"
 
+FILEEXTRAPATHS_prepend = "${THISDIR}/files"
 SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master"
+SRC_URI += "file://fix_build_musl.patch"
 SRCREV = "ea7f8e361d11dc7d41d9ae2c4128aed2cdadd84e"
 
 DEPENDS = "\
diff --git a/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch
new file mode 100644
index 0000000000..3d912e0b01
--- /dev/null
+++ b/meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch
@@ -0,0 +1,26 @@
+diff --git a/dbus-cxx/timeout.cpp b/dbus-cxx/timeout.cpp
+index 16e9f7e..aa0b99f 100644
+--- a/dbus-cxx/timeout.cpp
++++ b/dbus-cxx/timeout.cpp
+@@ -132,7 +132,7 @@ namespace DBus
+     return m_cobj;
+   }
+ 
+-  void Timeout::timer_callback_proxy( sigval_t sv ) {
++  void Timeout::timer_callback_proxy( union sigval sv ) {
+     SIMPLELOGGER_DEBUG( "dbus.Timeout","Timeout::timer_callback_proxy" );
+     Timeout* t;
+     t = ( Timeout* ) sv.sival_ptr;
+diff --git a/dbus-cxx/timeout.h b/dbus-cxx/timeout.h
+index 1e469b5..5b69fbb 100644
+--- a/dbus-cxx/timeout.h
++++ b/dbus-cxx/timeout.h
+@@ -83,7 +83,7 @@ namespace DBus
+ 
+       std::mutex m_arming_mutex;
+ 
+-      static void timer_callback_proxy( sigval_t sv );
++      static void timer_callback_proxy( union sigval sv );
+ 
+   };
+