Fix link fail with gcc-10
This commit is contained in:
parent
4b1b212adf
commit
ba869927d3
12
sblim-gather-2.2.9-inline.patch
Normal file
12
sblim-gather-2.2.9-inline.patch
Normal file
@ -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;
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: sblim-gather
|
Name: sblim-gather
|
||||||
Version: 2.2.9
|
Version: 2.2.9
|
||||||
Release: 13%{?dist}
|
Release: 14%{?dist}
|
||||||
Summary: SBLIM Gatherer
|
Summary: SBLIM Gatherer
|
||||||
|
|
||||||
License: EPL
|
License: EPL
|
||||||
@ -39,6 +39,8 @@ Patch6: sblim-gather-2.2.9-prov-reg-sfcb-systemd.patch
|
|||||||
# Patch7: remove conflicting assoc class Linux_MetricElementConformsToProfile
|
# Patch7: remove conflicting assoc class Linux_MetricElementConformsToProfile
|
||||||
# from Linux_MetricProfile.mof (already included in Linux_Metric.mof)
|
# from Linux_MetricProfile.mof (already included in Linux_Metric.mof)
|
||||||
Patch7: sblim-gather-2.2.9-remove-assoc-conflict.patch
|
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: cim-server
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
@ -95,6 +97,7 @@ tar xfvz %{SOURCE4}
|
|||||||
%patch6 -p1 -b .prov-reg-sfcb-systemd
|
%patch6 -p1 -b .prov-reg-sfcb-systemd
|
||||||
%patch7 -p1 -b .remove-assoc-conflict
|
%patch7 -p1 -b .remove-assoc-conflict
|
||||||
%patch8 -p1 -b .remove-cxx-check
|
%patch8 -p1 -b .remove-cxx-check
|
||||||
|
%patch9 -p1 -b .inline
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%ifarch s390 s390x ppc ppc64
|
%ifarch s390 s390x ppc ppc64
|
||||||
@ -290,6 +293,9 @@ fi
|
|||||||
%ldconfig_postun provider
|
%ldconfig_postun provider
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 05 2019 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.9-14
|
||||||
|
- Fix link fail with gcc-10 (patch by Jeff Law)
|
||||||
|
|
||||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-13
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-13
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user