[PATCH] [MAMAC] OpenMAMA mock RPM's fail to build


Gary Molloy <g.molloy@...>
 

Bugzilla Ticket :- Bug 179

 

Testing Strategy:-

Not middleware or O/S specific. 
This applies to building with QPID only
 

Try building OpenMAMA against the latest version of proton (v0.8) and the build will fail with the following error:

 

mama/c_cpp/src/c/bridge/qpid/qpiddefs.h:37:25: error: proton/util.h: No such file or directory

 

After applying the patch you will be able to build successfully.

 

=========================================================================================================

 

From fcaaf81364fceb05515c43c6e507f0d8a3c0f01a Mon Sep 17 00:00:00 2001

From: Gary Molloy <g.molloy@...>

Date: Fri, 17 Apr 2015 05:06:50 -0400

Subject: [PATCH] [MAMAC] OpenMAMA mock RPM's fail to build

 

The OpenMAMA mock RPM's are failing to build due to the Fedora

repository having updated the default version of proton to 0.8.

 

The problem is that it no longer contains the proton header file

"proton/util.h" which we try to include.

 

[OMAMA-342]

 

Signed-off-by: Gary Molloy <g.molloy@...>

---

mama/c_cpp/src/c/bridge/qpid/qpiddefs.h |    6 +++++-

1 files changed, 5 insertions(+), 1 deletions(-)

 

diff --git a/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h b/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h

index 8e686ea..cd52e96 100644

--- a/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h

+++ b/mama/c_cpp/src/c/bridge/qpid/qpiddefs.h

@@ -34,7 +34,6 @@

/* Qpid include files */

#include <proton/driver.h>

#include <proton/message.h>

-#include <proton/util.h>

#include <proton/messenger.h>

 #include "endpointpool.h"

@@ -84,6 +83,11 @@ typedef enum qpidMsgType_

     qpidBridgeMamaTransportImpl_freeProtonMessenger (messenger)

#endif

+/* The proton header util.h was removed in version 0.8 */

+#if (PN_VERSION_MAJOR == 0 && PN_VERSION_MINOR <= 7)

+#include <proton/util.h>

+#endif

+

/* Place other version specific macros here */

 #else

--

1.7.1

 

 

Gary Molloy – SR Labs

Adelaide Exchange | 24-26 Adelaide Street | Belfast | BT2 8GD

Tel: +44 28 9099 7580  Ext 3397

g.molloy@...

 

Join Openmama-dev@lists.openmama.org to automatically receive all group messages.