qpid: Fix some issues with do_configure and do_compile

There were some fundamental issues preventing this package from
compiling. Make some necessary updates to the recipe and pull in an
upstream patch to allow the package to properly configure and compile.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 93 insertions, 2 deletions

diff --git a/meta-openstack/recipes-extended/qpid/qpid/QPID-4579-Fixes-building-Qpid-under-the-latest-GCC-4.patch b/meta-openstack/recipes-extended/qpid/qpid/QPID-4579-Fixes-building-Qpid-under-the-latest-GCC-4.patch
new file mode 100644
index 0000000..73bee5c
--- /dev/null
+++ b/meta-openstack/recipes-extended/qpid/qpid/QPID-4579-Fixes-building-Qpid-under-the-latest-GCC-4.patch
@@ -0,0 +1,89 @@
+From 9736799d05368da9641b2220aaa1cab850f562cb Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <mcpierce@apache.org>
+Date: Tue, 12 Feb 2013 19:26:13 +0000
+Subject: [PATCH] QPID-4579: Fixes building Qpid under the latest GCC (4.8.0).
+
+commit 631f31a401f308e93303d5cc3a60f03f4c5eca34 from upstream
+git://git.apache.org/qpid.git
+
+Moves the definition of Functor and MemFuncRef out of Handler class
+definition. Fixes the build failure in later versions of GCC.
+
+Contributed by: Petr Machata <pmachata@redhat.com>
+[MA: rebased]
+Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1445322 13f79535-47bb-0310-9956-ffa450edef68
+---
+ src/qpid/framing/Handler.h | 43 ++++++++++++++++++++++++-------------------
+ 1 file changed, 24 insertions(+), 19 deletions(-)
+
+diff --git a/src/qpid/framing/Handler.h b/src/qpid/framing/Handler.h
+index fa8db36..e0c0e59 100644
+--- a/src/qpid/framing/Handler.h
++++ b/src/qpid/framing/Handler.h
+@@ -49,29 +49,12 @@ struct Handler {
+      * Functor<F>(f) will copy f.
+      * Functor<F&>(f) will only take a reference to x.
+      */
+-    template <class F> class Functor : public Handler<T> {
+-      public:
+-        Functor(F f, Handler<T>* next=0) : Handler<T>(next), functor(f) {}
+-        void handle(T t) { functor(t); }
+-      private:
+-        F functor;
+-    };
++    template <class F> class Functor;
+ 
+     /** Adapt a member function of X as a Handler.
+      * Only holds a reference to its target, not a copy.
+      */
+-    template <class X, void (X::*F)(T)>
+-    class MemFunRef : public Handler<T> {
+-      public:
+-        MemFunRef(X& x, Handler<T>* next=0) : Handler(next), target(&x) {}
+-        void handle(T t) { (target->*F)(t); }
+-
+-        /** Allow calling with -> syntax */
+-        MemFunRef* operator->() { return this; }
+-
+-      private:
+-        X* target;
+-    };
++    template <class X, void (X::*F)(T)> class MemFunRef;
+ 
+     /** Interface for a handler that implements a
+      * pair of in/out handle operations.
+@@ -94,7 +77,29 @@ struct Handler {
+     };
+ };
+ 
++template <class T>
++template <class F>
++class Handler<T>::Functor : public Handler<T> {
++  public:
++    Functor(F f, Handler<T>* next=0) : Handler<T>(next), functor(f) {}
++    void handle(T t) { functor(t); }
++  private:
++    F functor;
++};
++
++template <class T>
++template <class X, void (X::*F)(T)>
++class Handler<T>::MemFunRef : public Handler<T> {
++  public:
++    MemFunRef(X& x, Handler<T>* next=0) : Handler(next), target(&x) {}
++    void handle(T t) { (target->*F)(t); }
++
++    /** Allow calling with -> syntax */
++    MemFunRef* operator->() { return this; }
+ 
++  private:
++    X* target;
++};
+ 
+ }}
+ #endif  /*!QPID_FRAMING_HANDLER_H*/
+-- 
+1.8.3.2
+
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
index d8c467e..a6f1c67 100644
--- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -3,11 +3,13 @@ HOMEPAGE = "http://qpid.apache.org/"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b"
 SECTION = "mq"
-DEPENDS = "boost perl-native python "
+DEPENDS = "boost perl-native python util-linux cyrus-sasl"
+RDEPENDS_${PN} = "cyrus-sasl-bin"
 PR = "r0"
 
 SRC_URI = "http://archive.apache.org/dist/${PN}/${PV}/qpid-cpp-0.20.tar.gz \
            file://quick-fix.patch \
+           file://QPID-4579-Fixes-building-Qpid-under-the-latest-GCC-4.patch \
            file://qpidd"
 
 SRC_URI[md5sum] = "566132c5939ca31a32a0e80cc4124122"
@@ -24,7 +26,7 @@ export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}
 export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
 export PERL="${STAGING_BINDIR}/perl"
 
-EXTRA_OECONF += " --without-help2man"
+EXTRA_OECONF += " --without-help2man SASL_PASSWD=/usr/sbin/saslpasswd2"
 
 do_install_append() {
      install -d ${D}${sysconfdir}/init.d