summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-05 10:50:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-06 15:12:39 +0100
commit140483d180577c9f754ed0adbb7b3e59aebd4aa5 (patch)
treeb48c90c9764499fddde03a599f1c9543883d1d21
parentd9f2e593172d9d2d5f4c70ff820416c292a976ef (diff)
downloadpoky-140483d180577c9f754ed0adbb7b3e59aebd4aa5.tar.gz
distcc: Fix build with -fno-common
(From OE-Core rev: 3ee28664c7db2e0e548941205ec94c1652a3ac17) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.3.3.bb1
-rw-r--r--meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch34
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/distcc/distcc_3.3.3.bb b/meta/recipes-devtools/distcc/distcc_3.3.3.bb
index c52f136be8..d92b9c3046 100644
--- a/meta/recipes-devtools/distcc/distcc_3.3.3.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.3.3.bb
@@ -17,6 +17,7 @@ RRECOMMENDS_${PN}-server = "avahi-daemon"
17SRC_URI = "git://github.com/distcc/distcc.git \ 17SRC_URI = "git://github.com/distcc/distcc.git \
18 file://fix-gnome.patch \ 18 file://fix-gnome.patch \
19 file://separatebuilddir.patch \ 19 file://separatebuilddir.patch \
20 file://0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch \
20 file://default \ 21 file://default \
21 file://distcc \ 22 file://distcc \
22 file://distcc.service" 23 file://distcc.service"
diff --git a/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch b/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch
new file mode 100644
index 0000000000..86c07c11f8
--- /dev/null
+++ b/meta/recipes-devtools/distcc/files/0001-Fix-build-with-gcc-10-which-defaults-to-fno-common-c.patch
@@ -0,0 +1,34 @@
1From 98530865795300008fe06bb647a6fc2dddfc7967 Mon Sep 17 00:00:00 2001
2From: Romain Geissler <romain.geissler@amadeus.com>
3Date: Mon, 27 Jan 2020 09:28:43 +0000
4Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf
5 https://gcc.gnu.org/gcc-10/porting_to.html)
6
7This fixes the following link error I see when I use the latest gcc 10
8git branch:
9/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here
10/opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here
11collect2: error: ld returned 1 exit status
12
13Upstream-Status: Backport [https://github.com/distcc/distcc/pull/373]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 src/stats.h | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19diff --git a/src/stats.h b/src/stats.h
20index 9bde285..74d4690 100644
21--- a/src/stats.h
22+++ b/src/stats.h
23@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD,
24 STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
25 STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
26
27-const char *stats_text[20];
28+extern const char *stats_text[20];
29
30 int dcc_stats_init(void);
31 void dcc_stats_init_kid(void);
32--
332.28.0
34