From ec382f66ecdadb84ee84ab1eb18509aecde885a34e53642cd3b46939dbd7c3c2 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 8 Jun 2020 12:28:55 +0000
Subject: [PATCH] - add gcc-10-no-common.patch:   * Fixes link with gcc 10,
 upstream (https://github.com/distcc/distcc/pull/373)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/distcc?expand=0&rev=25
---
 distcc.changes         |  6 ++++++
 distcc.spec            |  5 +++--
 gcc-10-no-common.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 gcc-10-no-common.patch

diff --git a/distcc.changes b/distcc.changes
index 1287e9f..b5d2e91 100644
--- a/distcc.changes
+++ b/distcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  8 11:25:04 UTC 2020 - Dirk Mueller <dmueller@suse.com>
+
+- add gcc-10-no-common.patch: 
+  * Fixes link with gcc 10, upstream (https://github.com/distcc/distcc/pull/373)
+
 -------------------------------------------------------------------
 Mon Sep 23 08:12:50 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/distcc.spec b/distcc.spec
index e09bd31..893e1be 100644
--- a/distcc.spec
+++ b/distcc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package distcc
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,13 +26,14 @@ Release:        0
 Summary:        A distributed C/C++ compiler
 License:        GPL-2.0-or-later
 Group:          Development/Tools/Building
-Url:            https://github.com/distcc/distcc
+URL:            https://github.com/distcc/distcc
 Source0:        https://github.com/distcc/distcc/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        distccd.sysconfig
 Source2:        distccd.service
 Patch1:         distcc-3.2_rc1-freedesktop.patch
 Patch2:         distcc-3.2_rc1-gssapi.patch
 Patch3:         distcc-3.2_rc1-python.patch
+Patch4:         gcc-10-no-common.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  binutils-devel
diff --git a/gcc-10-no-common.patch b/gcc-10-no-common.patch
new file mode 100644
index 0000000..708b849
--- /dev/null
+++ b/gcc-10-no-common.patch
@@ -0,0 +1,28 @@
+From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001
+From: Romain Geissler <romain.geissler@amadeus.com>
+Date: Mon, 27 Jan 2020 09:28:43 +0000
+Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf
+ https://gcc.gnu.org/gcc-10/porting_to.html)
+
+This fixes the following link error I see when I use the latest gcc 10
+git branch:
+/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
+/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
+collect2: error: ld returned 1 exit status
+---
+ src/stats.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/stats.h b/src/stats.h
+index 9bde285..74d4690 100644
+--- a/src/stats.h
++++ b/src/stats.h
+@@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD,
+                 STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT,
+                 STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX };
+ 
+-const char *stats_text[20];
++extern const char *stats_text[20];
+ 
+ int  dcc_stats_init(void);
+ void dcc_stats_init_kid(void);