aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaio Toledo <caioviniciusdetoledo@gmail.com>2020-12-17 00:22:24 +0000
committerKhem Raj <raj.khem@gmail.com>2020-12-17 09:12:27 -0800
commit556293d49f973db863c82b211036f22171ffa7e6 (patch)
tree3754737f2e9e8d894a010004f678ac26cf9a9b0c
parenta6373a21eaa7e26478c770dc02462149a8d895ec (diff)
downloadmeta-openembedded-contrib-556293d49f973db863c82b211036f22171ffa7e6.tar.gz
meta-openembedded-contrib-556293d49f973db863c82b211036f22171ffa7e6.tar.bz2
meta-openembedded-contrib-556293d49f973db863c82b211036f22171ffa7e6.zip
Fix dbus-cxx build for musl
Signed-off-by: Caio Toledo <caioviniciusdetoledo@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/dbus-cxx/dbus-cxx_0.12.bb2
-rw-r--r--meta-oe/recipes-core/dbus-cxx/files/fix_build_musl.patch26
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 );
+
+ };
+