From 95fe6ae19e3a0de63fcf83a10d1d8803b17eec5c Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 10 Feb 2015 15:42:33 +0100 Subject: [PATCH] Fix build fail with gcc5 --- pegasus-2.13.0-gcc5-build.patch | 23 +++++++++++++++++++++++ tog-pegasus.spec | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pegasus-2.13.0-gcc5-build.patch diff --git a/pegasus-2.13.0-gcc5-build.patch b/pegasus-2.13.0-gcc5-build.patch new file mode 100644 index 0000000..35fae89 --- /dev/null +++ b/pegasus-2.13.0-gcc5-build.patch @@ -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 InteropProvider::enum + Array 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" diff --git a/tog-pegasus.spec b/tog-pegasus.spec index 1b0ed5f..0a95a9f 100644 --- a/tog-pegasus.spec +++ b/tog-pegasus.spec @@ -88,6 +88,8 @@ Patch31: pegasus-2.13.0-CMGetKey-data-type-fix.patch # 32: bz#1038013, fixes wrong EmbeddedInstances from CIMOM callback, # backported from upstream 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: openssl, openssl-devel @@ -235,6 +237,7 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0 %patch30 -p1 -b .genssl %patch31 -p0 -b .CMGetKey-data-type-fix %patch32 -p1 -b .wrong-embedded-instances-from-cimom-callback +%patch33 -p1 -b .gcc5-build %build @@ -511,6 +514,7 @@ fi * Tue Feb 10 2015 Vitezslav Crhonek - 2:2.13.0-23 - Fix tog-pegasus.service is marked world-inaccessible Resolves: #1191026 +- Fix build fail with gcc5 * Mon Feb 02 2015 Vitezslav Crhonek - 2:2.13.0-22 - Backup only latest repository when upgrading the package