Hello community,

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

Package is "ibutils"

Sun Jun  7 21:40:00 2020 rev:10 rq:812235 version:1.5.7.0.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/ibutils/ibutils.changes  2019-06-01 
09:50:59.551293709 +0200
+++ /work/SRC/openSUSE:Factory/.ibutils.new.3606/ibutils.changes        
2020-06-07 21:40:08.301796264 +0200
@@ -1,0 +2,5 @@
+Sun Jun  7 12:58:06 UTC 2020 - Nicolas Morey-Chaisemartin 
<nmoreychaisemar...@suse.com>
+
+- Add ibis-drop-multiple-definition-of-IbisObj.patch to fix compilation with 
GCC10
+
+-------------------------------------------------------------------

New:
----
  ibis-drop-multiple-definition-of-IbisObj.patch

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

Other differences:
------------------
++++++ ibutils.spec ++++++
--- /var/tmp/diff_new_pack.hOVJkZ/_old  2020-06-07 21:40:09.413799790 +0200
+++ /var/tmp/diff_new_pack.hOVJkZ/_new  2020-06-07 21:40:09.417799802 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package ibutils
 #
-# 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
@@ -45,7 +45,8 @@
 # Add --disable-ibdiagui option to allow for split builds
 Patch6:         ibutils-diagui.patch
 Patch7:         ibutils-fix-build-dependency.patch
-Url:            http://www.openfabrics.org
+Patch8:         ibis-drop-multiple-definition-of-IbisObj.patch
+URL:            http://www.openfabrics.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -121,6 +122,7 @@
 %patch5
 %patch6
 %patch7
+%patch8
 
 %build
 autoreconf -fi

++++++ ibis-drop-multiple-definition-of-IbisObj.patch ++++++
commit 62998956cb17538f925f76ce6c4193f415f7cc01
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date:   Sun Jun 7 14:56:55 2020 +0200

    ibis drop multiple definition of IbisObj
    
    Drop multiple global definition of IbisObj that breaks with GCC10
    
    Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>

diff --git ibis/src/ibis.i ibis/src/ibis.i
index 28a0912dd848..e66d84e7bb80 100644
--- ibis/src/ibis.i
+++ ibis/src/ibis.i
@@ -180,7 +180,6 @@ ibisp_is_debug(void)
 
 %{
   /* globals */
-  ibis_t    IbisObj;
   static ibis_opt_t  *ibis_opt_p;
   ibis_opt_t IbisOpts;
 
diff --git ibis/src/ibis_wrap.c ibis/src/ibis_wrap.c
index ee9760127577..7efadea896ab 100644
--- ibis/src/ibis_wrap.c
+++ ibis/src/ibis_wrap.c
@@ -3004,7 +3004,6 @@ typedef struct {
 
 
   /* globals */
-  ibis_t    IbisObj;
   static ibis_opt_t  *ibis_opt_p;
   ibis_opt_t IbisOpts;
 
diff --git ibis/src/ibissh_wrap.cpp ibis/src/ibissh_wrap.cpp
index 917904fe382a..2f69c4018e71 100644
--- ibis/src/ibissh_wrap.cpp
+++ ibis/src/ibissh_wrap.cpp
@@ -3004,7 +3004,6 @@ typedef struct {
 
 
   /* globals */
-  ibis_t    IbisObj;
   static ibis_opt_t  *ibis_opt_p;
   ibis_opt_t IbisOpts;
 

Reply via email to