From ba869927d33d08d66f252bcb0ed34ff6d8a8ce8c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 5 Nov 2019 16:57:35 +0100 Subject: [PATCH] Fix link fail with gcc-10 --- sblim-gather-2.2.9-inline.patch | 12 ++++++++++++ sblim-gather.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sblim-gather-2.2.9-inline.patch diff --git a/sblim-gather-2.2.9-inline.patch b/sblim-gather-2.2.9-inline.patch new file mode 100644 index 0000000..cb54237 --- /dev/null +++ b/sblim-gather-2.2.9-inline.patch @@ -0,0 +1,12 @@ +diff -up sblim-gather-2.2.9/repos.c.orig sblim-gather-2.2.9/repos.c +--- sblim-gather-2.2.9/repos.c.orig 2014-10-09 23:29:11.000000000 +0200 ++++ sblim-gather-2.2.9/repos.c 2019-11-05 15:01:49.529369051 +0100 +@@ -781,7 +781,7 @@ static RepositoryPlugin* pl_find(const c + } + return p?p->plugin:NULL; + } +-inline int valueCompare(int type, ValueItem *v, ValueItem *w, int dir) ++static inline int valueCompare(int type, ValueItem *v, ValueItem *w, int dir) + { + long long llv, llw; + unsigned long long ulv, ulw; diff --git a/sblim-gather.spec b/sblim-gather.spec index 041022b..fbe8198 100644 --- a/sblim-gather.spec +++ b/sblim-gather.spec @@ -3,7 +3,7 @@ Name: sblim-gather Version: 2.2.9 -Release: 13%{?dist} +Release: 14%{?dist} Summary: SBLIM Gatherer License: EPL @@ -39,6 +39,8 @@ Patch6: sblim-gather-2.2.9-prov-reg-sfcb-systemd.patch # Patch7: remove conflicting assoc class Linux_MetricElementConformsToProfile # from Linux_MetricProfile.mof (already included in Linux_Metric.mof) Patch7: sblim-gather-2.2.9-remove-assoc-conflict.patch +# Patch9: fix link fail with gcc-10 (patch by Jeff Law) +Patch9: sblim-gather-2.2.9-inline.patch Requires: cim-server Requires(post): systemd @@ -95,6 +97,7 @@ tar xfvz %{SOURCE4} %patch6 -p1 -b .prov-reg-sfcb-systemd %patch7 -p1 -b .remove-assoc-conflict %patch8 -p1 -b .remove-cxx-check +%patch9 -p1 -b .inline %build %ifarch s390 s390x ppc ppc64 @@ -290,6 +293,9 @@ fi %ldconfig_postun provider %changelog +* Tue Nov 05 2019 Vitezslav Crhonek - 2.2.9-14 +- Fix link fail with gcc-10 (patch by Jeff Law) + * Fri Jul 26 2019 Fedora Release Engineering - 2.2.9-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild