diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-08-12 15:46:49 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:32:07 -0700 |
commit | e8b286f893cd2cd88fa684c9d10296045610c6de (patch) | |
tree | 9fcfeea8bcc33dfe8699d9a4c3b5c018b39b6772 /meta-oe/dynamic-layers/meta-python | |
parent | a6f710f6cd320cedfc613a2c56b9586f884432d4 (diff) | |
download | meta-openembedded-e8b286f893cd2cd88fa684c9d10296045610c6de.tar.gz |
lcdproc: Fix compilation with GCC >= 10.x
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/dynamic-layers/meta-python')
2 files changed, 47 insertions, 0 deletions
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch new file mode 100644 index 000000000..35634dd9b --- /dev/null +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc/0001-Fix-compilation-with-GCC-10.x.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From 9b07f6a472c24f5e1b65746756764391be0d55e4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Harald Geyer <harald@ccbib.org> | ||
3 | Date: Mon, 10 Feb 2020 13:15:10 +0100 | ||
4 | Subject: [PATCH] Fix compilation with GCC >= 10.x | ||
5 | |||
6 | Starting with GCC >= 10.x, -fno-common is used as default | ||
7 | instead of -fcommon. This patch fixes the compilation. | ||
8 | |||
9 | Closes: #148 | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Suggested-by: Conrad Kostecki <conrad@kostecki.com> | ||
13 | Signed-off-by: Harald Geyer <harald@ccbib.org> | ||
14 | --- | ||
15 | clients/lcdproc/iface.c | 1 + | ||
16 | clients/lcdproc/iface.h | 2 +- | ||
17 | 2 files changed, 2 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c | ||
20 | index 40e50cb7..1ac355bd 100644 | ||
21 | --- a/clients/lcdproc/iface.c | ||
22 | +++ b/clients/lcdproc/iface.c | ||
23 | @@ -32,6 +32,7 @@ | ||
24 | #define UNSET_INT -1 | ||
25 | #define UNSET_STR "\01" | ||
26 | |||
27 | +IfaceInfo iface[MAX_INTERFACES]; | ||
28 | |||
29 | static int iface_count = 0; /* number of interfaces */ | ||
30 | static char unit_label[10] = "B"; /* default unit label is Bytes */ | ||
31 | diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h | ||
32 | index cc6dbaaf..c1bd6b5b 100644 | ||
33 | --- a/clients/lcdproc/iface.h | ||
34 | +++ b/clients/lcdproc/iface.h | ||
35 | @@ -18,7 +18,7 @@ | ||
36 | /** max number of interfaces in multi-interface mode */ | ||
37 | #define MAX_INTERFACES 3 | ||
38 | |||
39 | -IfaceInfo iface[MAX_INTERFACES]; /* interface info */ | ||
40 | +extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ | ||
41 | |||
42 | /** Update screen content */ | ||
43 | int iface_screen(int rep, int display, int *flags_ptr); | ||
44 | -- | ||
45 | 2.28.0 | ||
46 | |||
diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 275b984e4..35585d069 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb | |||
@@ -15,6 +15,7 @@ SRC_URI = "git://github.com/lcdproc/lcdproc \ | |||
15 | file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ | 15 | file://0001-Fix-parallel-build-fix-port-internal-make-dependenci.patch \ |
16 | file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ | 16 | file://0002-Include-limits.h-for-PATH_MAX-definition.patch \ |
17 | file://0003-Fix-non-x86-platforms-on-musl.patch \ | 17 | file://0003-Fix-non-x86-platforms-on-musl.patch \ |
18 | file://0001-Fix-compilation-with-GCC-10.x.patch \ | ||
18 | " | 19 | " |
19 | 20 | ||
20 | S = "${WORKDIR}/git" | 21 | S = "${WORKDIR}/git" |