rpms/sblim-gather
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix multiple definiton of variables (FTBFS with GCC 10)

Browse Source
This commit is contained in:
Vitezslav Crhonek 2020-02-13 07:54:20 +01:00
parent 537d294033
commit 393f6907bf
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sblim-gather-2.2.9-fix-multiple-definition.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up sblim-gather-2.2.9/plugin/metricVirt.h.orig sblim-gather-2.2.9/plugin/metricVirt.h
--- sblim-gather-2.2.9/plugin/metricVirt.h.orig 2014-10-09 23:29:10.000000000 +0200
+++ sblim-gather-2.2.9/plugin/metricVirt.h 2020-02-12 13:52:56.161653863 +0100
@@ -48,7 +48,9 @@ struct node_statistics_type {
size_t total_domains;
unsigned long long total_memory;
unsigned long long free_memory;
-} node_statistics;
+};
+
+extern struct node_statistics_type node_statistics;
struct domain_statistics_type {
unsigned int domain_id[MAX_DOMAINS];
@@ -61,7 +63,9 @@ struct domain_statistics_type {
unsigned long long cpu_used[MAX_DOMAINS];
unsigned long long cpu_ready[MAX_DOMAINS];
struct vdisk_type * blkio[MAX_DOMAINS];
-} domain_statistics;
+};
+
+extern struct domain_statistics_type domain_statistics;
int testHypervisor(int type);

9
sblim-gather.spec
View File

@ -3,7 +3,7 @@
Name: sblim-gather Name: sblim-gather
Version: 2.2.9 Version: 2.2.9
Release: 15%{?dist} Release: 16%{?dist}
Summary: SBLIM Gatherer Summary: SBLIM Gatherer
License: EPL License: EPL
@ -41,6 +41,8 @@ Patch6: sblim-gather-2.2.9-prov-reg-sfcb-systemd.patch
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: fix link fail with gcc-10 (patch by Jeff Law)
Patch9: sblim-gather-2.2.9-inline.patch Patch9: sblim-gather-2.2.9-inline.patch
# Patch10: fixes multiple definiton of variables (FTBFS with GCC 10)
Patch10: sblim-gather-2.2.9-fix-multiple-definition.patch
Requires: cim-server Requires: cim-server
Requires(post): systemd Requires(post): systemd
@ -98,6 +100,7 @@ tar xfvz %{SOURCE4}
%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 %patch9 -p1 -b .inline
%patch10 -p1 -b .fix-multiple-definition
%build %build
%ifarch s390 s390x ppc ppc64 %ifarch s390 s390x ppc ppc64
@ -293,6 +296,10 @@ fi
%ldconfig_postun provider %ldconfig_postun provider
%changelog %changelog
* Thu Feb 13 2020 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.2.9-16
- Fix multiple definiton of variables (FTBFS with GCC 10)
Resolves: #1800073
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-15 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild