diff options
author | Andreas Müller <schnitzeltony@gmail.com> | 2019-11-17 22:13:02 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-11-17 21:02:14 -0800 |
commit | 74645e0e443c2ef7e74acca4a9562c23fb5762c9 (patch) | |
tree | 60280073c09ebf63d8044d35b574fe17e1ccc18a | |
parent | a2fe8bdd4bc533863513e372aebc70c6f153730a (diff) | |
download | meta-openembedded-74645e0e443c2ef7e74acca4a9562c23fb5762c9.tar.gz |
gnome-terminal: Fix build for musl
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 35 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch new file mode 100644 index 0000000000..a69390eb2b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From f231cecc151930fd5b6309da317a8c5bc6001f38 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> | ||
3 | Date: Sun, 17 Nov 2019 15:55:54 +0100 | ||
4 | Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | ||
12 | --- | ||
13 | src/terminal.c | 6 ++++++ | ||
14 | 1 file changed, 6 insertions(+) | ||
15 | |||
16 | diff --git a/src/terminal.c b/src/terminal.c | ||
17 | index d06ce35..6284e4c 100644 | ||
18 | --- a/src/terminal.c | ||
19 | +++ b/src/terminal.c | ||
20 | @@ -47,6 +47,12 @@ | ||
21 | GS_DEFINE_CLEANUP_FUNCTION0(TerminalOptions*, gs_local_options_free, terminal_options_free) | ||
22 | #define gs_free_options __attribute__ ((cleanup(gs_local_options_free))) | ||
23 | |||
24 | +/* fix for musl */ | ||
25 | +#ifndef W_EXITCODE | ||
26 | +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) | ||
27 | +#endif | ||
28 | + | ||
29 | + | ||
30 | /* Wait-for-exit helper */ | ||
31 | |||
32 | typedef struct { | ||
33 | -- | ||
34 | 2.21.0 | ||
35 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb index d688176d53..ffbabbf88d 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb | |||
@@ -21,6 +21,7 @@ DEPENDS = " \ | |||
21 | 21 | ||
22 | SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16" | 22 | SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16" |
23 | SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d" | 23 | SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d" |
24 | SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" | ||
24 | 25 | ||
25 | EXTRA_OECONF += " \ | 26 | EXTRA_OECONF += " \ |
26 | --disable-search-provider \ | 27 | --disable-search-provider \ |