From c8e3641dce0d9d2adf1f84ea719d176442eba8af Mon Sep 17 00:00:00 2001
From: Mihai Prica <prica.mihai@gmail.com>
Date: Fri, 17 May 2013 17:53:45 +0300
Subject: qpid: added 0.20

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>
---
 .../recipes-extended/qpid/qpid-python_0.20.bb      | 15 +++++++
 .../recipes-extended/qpid/qpid/quick-fix.patch     | 25 +++++++++++
 meta-openstack/recipes-extended/qpid/qpid_0.20.bb  | 48 ++++++++++++++++++++++
 3 files changed, 88 insertions(+)
 create mode 100644 meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
 create mode 100644 meta-openstack/recipes-extended/qpid/qpid/quick-fix.patch
 create mode 100644 meta-openstack/recipes-extended/qpid/qpid_0.20.bb

diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
new file mode 100644
index 0000000..6528e16
--- /dev/null
+++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "AMQP message brokers"
+HOMEPAGE = "http://qpid.apache.org/"
+SECTION = "devel/python"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b1e01b26bacfc2232046c90a330332b3"
+PR = "r0"
+
+SRC_URI = "http://mirror.nexcess.net/apache/qpid/${PV}/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "d4dc28a3d68e4b364e54d8fe7f244e5d"
+SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c9e1c90"
+
+S = "${WORKDIR}/qpid-${PV}/python"
+
+inherit distutils
diff --git a/meta-openstack/recipes-extended/qpid/qpid/quick-fix.patch b/meta-openstack/recipes-extended/qpid/qpid/quick-fix.patch
new file mode 100644
index 0000000..cba0757
--- /dev/null
+++ b/meta-openstack/recipes-extended/qpid/qpid/quick-fix.patch
@@ -0,0 +1,25 @@
+Index: qpidc-0.20/configure.ac
+===================================================================
+--- qpidc-0.20.orig/configure.ac
++++ qpidc-0.20/configure.ac
+@@ -236,13 +236,13 @@ AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [tes
+ 
+ # Perl bindings:
+ 
+-AC_CHECK_PROG([PERL], [perl], [perl])
+-if test -n "$PERL"; then
+-    PERL_ARCHLIB=`perl -MConfig -e 'print "$Config{archlib}";'`
+-    AC_CHECK_FILE( ["$PERL_ARCHLIB/CORE/perl.h"],
+-            [AC_SUBST([PERL_INC], ["$PERL_ARCHLIB/CORE"])] )
+-    AC_SUBST(PERL_ARCHLIB)
+-fi
++#AC_CHECK_PROG([PERL], [perl], [perl])
++#if test -n "$PERL"; then
++#    PERL_ARCHLIB=`perl -MConfig -e 'print "$Config{archlib}";'`
++#    AC_CHECK_FILE( ["$PERL_ARCHLIB/CORE/perl.h"],
++#            [AC_SUBST([PERL_INC], ["$PERL_ARCHLIB/CORE"])] )
++#    AC_SUBST(PERL_ARCHLIB)
++#fi
+ AM_CONDITIONAL([HAVE_PERL_DEVEL], [test -n "$PERL" && test -n "$SWIG" && test -n "$PERL_INC"])
+ 
+ specdir=`pwd`/$srcdir/../specs
diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
new file mode 100644
index 0000000..902462a
--- /dev/null
+++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb
@@ -0,0 +1,48 @@
+DESCRIPTION = "AMQP message brokers"
+HOMEPAGE = "http://qpid.apache.org/"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b"
+SECTION = "mq"
+DEPENDS = "boost perl-native python " 
+#ruby"
+PR = "r0"
+
+SRC_URI = "http://mirror.nexcess.net/apache/${PN}/${PV}/qpid-cpp-0.20.tar.gz \
+           file://quick-fix.patch"
+
+SRC_URI[md5sum] = "566132c5939ca31a32a0e80cc4124122"
+SRC_URI[sha256sum] = "31b80ba3c4773d288b4e6245e3b2048438386331d460f7a7b0794cbd200301de"
+
+S = "${WORKDIR}/${PN}c-${PV}"
+
+inherit autotools python-dir perlnative cpan-base update-rc.d
+
+# Env var which tells perl if it should use host (no) or target (yes) settings
+export PERLCONFIGTARGET = "${@is_target(d)}"
+export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE"
+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"
+
+PACKAGES += "qmfgen qmfgen-python"
+
+FILES_qmfgen = "${bindir}/qmf-gen"
+
+FILES_qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*"
+
+FILES_qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*"
+
+FILES_${PN} += "${libdir}/${PN}/tests/test_store.so"
+
+FILES_${PN}-dev += "${libdir}/${PN}/tests/test_store.so "
+
+FILES_${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \
+                    ${libdir}/${PN}/tests/.debug/*  \
+                    ${libdir}/${PN}/daemon/.debug/*"
+
+FILES_${PN}-doc += "${datadir}/qpidc/*"
+
+INITSCRIPT_NAME = "qpidd"
+INITSCRIPT_PARAMS = "defaults"
-- 
cgit v1.2.3-54-g00ecf