From 35da6a5ee3a6863e0b6bc9f3e366cc7d1a75070f Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" Date: Fri, 25 Jan 2013 10:02:47 -0500 Subject: [PATCH] Fixes build failure on non-x86 platforms. - Resolves: BZ#901526 --- ...-building-proton-on-non-x86-platform.patch | 31 +++++++++++++++++++ qpid-proton.spec | 12 ++++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch diff --git a/01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch b/01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch new file mode 100644 index 0000000..e9a3f6f --- /dev/null +++ b/01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch @@ -0,0 +1,31 @@ +From d50d9bfe0b84dcdcb8f2f627b50719a7d61d6dab Mon Sep 17 00:00:00 2001 +From: mcpierce +Date: Fri, 25 Jan 2013 14:56:42 +0000 +Subject: [PATCH] PROTON-202: Fixes building proton on non-x86 platforms. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Submitted by: Dan HorĂ¡k + +git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1438546 13f79535-47bb-0310-9956-ffa450edef68 +--- + proton-c/src/codec/codec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/proton-c/src/codec/codec.c b/proton-c/src/codec/codec.c +index 5e57f81..d72acc0 100644 +--- a/proton-c/src/codec/codec.c ++++ b/proton-c/src/codec/codec.c +@@ -1353,7 +1353,7 @@ int pn_data_vscan(pn_data_t *data, const char *fmt, va_list ap) + while (*fmt) { + char code = *(fmt++); + +- bool found; ++ bool found = false; + pn_type_t type; + + bool scanned; +-- +1.8.1 + diff --git a/qpid-proton.spec b/qpid-proton.spec index 60289f8..e2b7f1f 100644 --- a/qpid-proton.spec +++ b/qpid-proton.spec @@ -2,7 +2,7 @@ Name: qpid-proton Version: 0.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high performance, lightweight messaging library License: ASL 2.0 @@ -19,6 +19,10 @@ BuildRequires: python-devel BuildRequires: epydoc +# BZ#901526 +Patch1: 01-PROTON-202-Fixes-building-proton-on-non-x86-platform.patch + + %description Proton is a high performance, lightweight messaging library. It can be used in the widest range of messaging applications including brokers, client libraries, @@ -79,6 +83,8 @@ Summary: Documentation for the Python language bindings for Qpid Proton %prep %setup -q -n qpid-proton-c-%{version} +%patch1 -p2 + %build %cmake -DPROTON_DISABLE_RPATH=true . @@ -117,6 +123,10 @@ rm -rf %{buildroot}%{_sysconfdir}/php.d %changelog +* Fri Jan 25 2013 Darryl L. Pierce - 0.3-2 +- Fixes build failure on non-x86 platforms. +- Resolves: BZ#901526 + * Wed Jan 16 2013 Darryl L. Pierce - 0.3-1 - Rebased on Proton 0.3.