Hello community,

here is the log from the commit of package distcc for openSUSE:Factory checked 
in at 2020-06-09 00:08:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/distcc (Old)
 and      /work/SRC/openSUSE:Factory/.distcc.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "distcc"

Tue Jun  9 00:08:40 2020 rev:9 rq:812599 version:3.3.3

Changes:
--------
--- /work/SRC/openSUSE:Factory/distcc/distcc.changes    2019-09-25 
08:12:21.498517621 +0200
+++ /work/SRC/openSUSE:Factory/.distcc.new.3606/distcc.changes  2020-06-09 
00:10:13.370450926 +0200
@@ -1,0 +2,6 @@
+Mon Jun  8 11:25:04 UTC 2020 - Dirk Mueller <[email protected]>
+
+- add gcc-10-no-common.patch: 
+  * Fixes link with gcc 10, upstream 
(https://github.com/distcc/distcc/pull/373)
+
+-------------------------------------------------------------------

New:
----
  gcc-10-no-common.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ distcc.spec ++++++
--- /var/tmp/diff_new_pack.uP96k5/_old  2020-06-09 00:10:17.006462084 +0200
+++ /var/tmp/diff_new_pack.uP96k5/_new  2020-06-09 00:10:17.010462097 +0200
@@ -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 @@
 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

++++++ gcc-10-no-common.patch ++++++
>From 377969cc762569f4a5ec409a1e7ad6a7be3e51b3 Mon Sep 17 00:00:00 2001
From: Romain Geissler <[email protected]>
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);

Reply via email to