diff --git a/ibutils-1.5.7-gcc10.patch b/ibutils-1.5.7-gcc10.patch new file mode 100644 index 0000000..1d2057e --- /dev/null +++ b/ibutils-1.5.7-gcc10.patch @@ -0,0 +1,13 @@ +diff -up ibutils-1.5.7/ibis/src/ibis.c.me ibutils-1.5.7/ibis/src/ibis.c +diff -up ibutils-1.5.7/ibis/src/ibis.i.me ibutils-1.5.7/ibis/src/ibis.i +diff -up ibutils-1.5.7/ibis/src/ibis_wrap.c.me ibutils-1.5.7/ibis/src/ibis_wrap.c +--- ibutils-1.5.7/ibis/src/ibis_wrap.c.me 2020-03-06 14:20:14.131825861 +0100 ++++ ibutils-1.5.7/ibis/src/ibis_wrap.c 2020-03-06 15:03:55.330170055 +0100 +@@ -3004,7 +3004,6 @@ typedef struct { + + + /* globals */ +- ibis_t IbisObj; + static ibis_opt_t *ibis_opt_p; + ibis_opt_t IbisOpts; + diff --git a/ibutils.spec b/ibutils.spec index 21e267f..3e08bf0 100644 --- a/ibutils.spec +++ b/ibutils.spec @@ -21,7 +21,7 @@ Summary: OpenIB Mellanox InfiniBand Diagnostic Tools Name: ibutils Version: 1.5.7 -Release: 32%{?dist} +Release: 33%{?dist} # This is dual-licensed upstream, all code available under either license License: GPLv2 or BSD Url: https://www.openfabrics.org/ @@ -29,6 +29,7 @@ Source0: https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.2.gb Patch0: ibutils-1.5.7-tk86.patch Patch1: ibutils-1.5.7-format-security.patch Patch2: add-ibdev2netdev.patch +Patch3: ibutils-1.5.7-gcc10.patch Requires: tcl, tk, graphviz-tcl Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -74,6 +75,7 @@ Static libraries from the Mellanox Infiniband diagnostic utilities %patch0 -p1 %patch1 -p1 %patch2 +%patch3 -p1 -b .gcc10 autoreconf -fiv -I config sed -i "s/^libibmscli_la_LIBADD =/& -lpthread/" ibmgtsim/src/Makefile.in @@ -153,6 +155,9 @@ install -m 0755 ibdev2netdev %{buildroot}%{_bindir} %{_libdir}/*.a %changelog +* Fri Mar 06 2020 Than Ngo - 1.5.7-33 +- Fixed FTBFS against gcc10 + * Wed Jan 29 2020 Fedora Release Engineering - 1.5.7-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild