diff options
| author |   Luca Boccassi <luca.boccassi@microsoft.com> | 2019-10-28 14:58:23 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-10-28 15:26:42 -0700 |
| commit | 71af733347cf3aa2f22abbaded72ae1383c40375 (patch) | |
| tree | 351ed1d390f0fdc20249e9a6dcb5dd17a68f19e7 /meta-oe/recipes-core/dbus | |
| parent | 9ac1df048a8af359f55fb5c57b6e031353996617 (diff) | |
| download | meta-openembedded-contrib-71af733347cf3aa2f22abbaded72ae1383c40375.tar.gz | |
dbus-broker: add patch to fix build with musl libc
Forwarded upstream: https://github.com/bus1/dbus-broker/pull/214
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core/dbus')
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch | 38 | ||||
| -rw-r--r-- | meta-oe/recipes-core/dbus/dbus-broker_21.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch b/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..0348d97225 --- /dev/null +++ b/meta-oe/recipes-core/dbus/dbus-broker/0004-launcher-fix-build-with-musl-libc.patch @@ -0,0 +1,38 @@ +From fc1d26dd08c48c04fc9883b36a94c219aba2091c Mon Sep 17 00:00:00 2001 +From: Luca Boccassi <luca.boccassi@microsoft.com> +Date: Mon, 28 Oct 2019 14:31:38 +0000 +Subject: [PATCH] launcher: fix build with musl libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +../src/launch/launcher.c: In function ‘launcher_fork’: +../src/launch/launcher.c:378:60: error: ‘WEXITED’ undeclared (first use in this function); did you mean ‘WIFEXITED’? + r = sd_event_add_child(launcher->event, NULL, pid, WEXITED, launcher_on_child_exit, launcher); + ^~~~~~~ + WIFEXITED + +Include sys/wait.h which defines it. + +Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> +Suggested-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: pending https://github.com/bus1/dbus-broker/pull/214 +--- + src/launch/launcher.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/launch/launcher.c b/src/launch/launcher.c +index 2ec4bda..1f38fcf 100644 +--- a/src/launch/launcher.c ++++ b/src/launch/launcher.c +@@ -10,6 +10,7 @@ + #include <stdlib.h> + #include <sys/prctl.h> + #include <sys/un.h> ++#include <sys/wait.h> + #include <systemd/sd-bus.h> + #include <systemd/sd-daemon.h> + #include <systemd/sd-event.h> +-- +2.20.1 + diff --git a/meta-oe/recipes-core/dbus/dbus-broker_21.bb b/meta-oe/recipes-core/dbus/dbus-broker_21.bb index c509ff6f29..d2d0510708 100644 --- a/meta-oe/recipes-core/dbus/dbus-broker_21.bb +++ b/meta-oe/recipes-core/dbus/dbus-broker_21.bb @@ -10,6 +10,7 @@ SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-bro SRC_URI += " file://0001-launch-improve-error-handling-for-opendir.patch" SRC_URI += " file://0002-metrics-change-the-constant-used-for-invalid-timesta.patch" SRC_URI += " file://0003-dbus-socket-treat-MSG_CTRUNC-gracefully.patch" +SRC_URI += " file://0004-launcher-fix-build-with-musl-libc.patch" SRC_URI[md5sum] = "a17886a92ab1e0bc2e4b1a274339e388" SRC_URI[sha256sum] = "6fff9a831a514659e2c7d704e76867ce31ebcf43e8d7a62e080c6656f64cd39e" |