rpms/tog-pegasus
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build fail with gcc5

Browse Source
This commit is contained in:
Vitezslav Crhonek 2015-02-10 15:42:33 +01:00
parent ac67d0d0a2
commit 95fe6ae19e
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pegasus-2.13.0-gcc5-build.patch Normal file
View File

@ -0,0 +1,23 @@
diff -up pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp.orig pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp
--- pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp.orig 2015-02-10 15:00:48.660891308 +0100
+++ pegasus/src/Pegasus/ControlProviders/InteropProvider/ElementConformsToProfile.cpp 2015-02-10 15:02:01.811194154 +0100
@@ -129,6 +129,7 @@ Array<CIMInstance> InteropProvider::enum
Array<CIMInstance> InteropProvider::enumElementConformsToProfileInstances(
const OperationContext & opContext, const CIMNamespaceName & opNamespace)
{
+ const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
CIMClass elementConformsClass = repository->getClass(
PEGASUS_NAMESPACENAME_INTEROP,
PEGASUS_CLASSNAME_PG_ELEMENTCONFORMSTOPROFILE,
diff -up pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h.orig pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h
--- pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h.orig 2015-02-10 14:43:34.168607514 +0100
+++ pegasus/src/Pegasus/ControlProviders/InteropProvider/InteropConstants.h 2015-02-10 14:43:44.165648967 +0100
@@ -150,7 +150,7 @@ const String PEGASUS_INTERNAL_PROVIDER_T
const String PEGASUS_INTERNAL_SERVICE_TYPE(
"Internal Service");
const String PEGASUS_DYNAMIC("__DYNAMIC_");
-const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
+// const Uint32 PEGASUS_DYNAMIC_LEN(PEGASUS_DYNAMIC.size());
const CIMNamespaceName PEGASUS_NAMESPACENAME_ROOT("root");
#define thisProvider "InteropProvider"

4
tog-pegasus.spec
View File

@ -88,6 +88,8 @@ Patch31: pegasus-2.13.0-CMGetKey-data-type-fix.patch
# 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback, # 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback,
# backported from upstream # backported from upstream
Patch32: pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch Patch32: pegasus-2.13.0-wrong-embedded-instances-from-cimom-callback.patch
# 33: fixes build with gcc5
Patch33: pegasus-2.13.0-gcc5-build.patch
BuildRequires: procps, libstdc++, pam-devel BuildRequires: procps, libstdc++, pam-devel
BuildRequires: openssl, openssl-devel BuildRequires: openssl, openssl-devel
@ -235,6 +237,7 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
%patch30 -p1 -b .genssl %patch30 -p1 -b .genssl
%patch31 -p0 -b .CMGetKey-data-type-fix %patch31 -p0 -b .CMGetKey-data-type-fix
%patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback %patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback
%patch33 -p1 -b .gcc5-build
%build %build
@ -511,6 +514,7 @@ fi
* Tue Feb 10 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-23 * Tue Feb 10 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-23
- Fix tog-pegasus.service is marked world-inaccessible - Fix tog-pegasus.service is marked world-inaccessible
Resolves: #1191026 Resolves: #1191026
- Fix build fail with gcc5
* Mon Feb 02 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-22 * Mon Feb 02 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.13.0-22
- Backup only latest repository when upgrading the package - Backup only latest repository when upgrading the package