pbrobinson pushed to qpid-cpp (master). "Re-add patch that fixes builds on aarch64/ppc64le"

[notifications at fedoraproject.org]

>From fa64391df758dde1c3701399849a977ada296dfc Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Mon, 13 Apr 2015 19:14:51 +0100
Subject: Re-add patch that fixes builds on aarch64/ppc64le


diff --git a/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch b/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
new file mode 100644
index 0000000..a76a438
--- /dev/null
+++ b/0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
@@ -0,0 +1,52 @@
+From d74c6441a1e4cb364337f338287b4790ca9c98fd Mon Sep 17 00:00:00 2001
+From: "Darryl L. Pierce" <dpierce at redhat.com>
+Date: Wed, 29 Oct 2014 11:13:04 -0400
+Subject: [PATCH 06/10] QPID-6170: Adds build support for aarch64 and ppc64le
+ architectures.
+
+Contributed by Marcin Juszkiewicz <mjuszkiewicz at redhat.com>
+---
+ qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h | 21 ++++++++++-----------
+ 1 file changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
+index 01d92ee..6fa8471 100644
+--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
++++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcfg.h
+@@ -33,23 +33,22 @@
+ #ifndef QPID_LEGACYSTORE_JRNL_JCFG_H
+ #define QPID_LEGACYSTORE_JRNL_JCFG_H
+ 
+-#if defined(__i386__) || (__arm__) /* little endian, 32 bits */
++#include <endian.h>
++
++#if __BYTE_ORDER == __LITTLE_ENDIAN
+ #define JRNL_LITTLE_ENDIAN
+-#define JRNL_32_BIT
+-#elif defined(__PPC__) || defined(__s390__)  /* big endian, 32 bits */
++#else
+ #define JRNL_BIG_ENDIAN
++#endif
++
++#include <bits/wordsize.h>
++
++#if __WORDSIZE == 32
+ #define JRNL_32_BIT
+-#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__) || (__arm64__) /* little endian, 64 bits */
+-#define JRNL_LITTLE_ENDIAN
+-#define JRNL_64_BIT
+-#elif defined(__powerpc64__) || defined(__s390x__) /* big endian, 64 bits */
+-#define JRNL_BIG_ENDIAN
+-#define JRNL_64_BIT
+ #else
+-#error endian?
++#define JRNL_64_BIT
+ #endif
+ 
+-
+ /**
+ * <b>Rule:</b> Data block size (JRNL_DBLK_SIZE) MUST be a power of 2 such that
+ * <pre>
+-- 
+2.1.0
+
diff --git a/qpid-cpp.spec b/qpid-cpp.spec
index be50f25..96c5fff 100644
--- a/qpid-cpp.spec
+++ b/qpid-cpp.spec
@@ -7,7 +7,7 @@
 
 Name:          qpid-cpp
 Version:       0.32
-Release:       1%{?dist}.1
+Release:       2%{?dist}
 Summary:       Libraries for Qpid C++ client applications
 License:       ASL 2.0
 URL:           http://qpid.apache.org
@@ -18,6 +18,7 @@ Source2:       http://www.apache.org/dist/qpid/%{version}/qpid-python-%{version}
 Patch0001:     0001-NO-JIRA-qpidd.service-file-for-use-on-Fedora.patch
 Patch0002:     0002-NO-JIRA-Allow-overriding-the-Perl-install-location.patch
 Patch0003:     0003-NO-JIRA-Allow-overriding-the-Ruby-install-location.patch
+Patch0004:     0006-QPID-6170-Adds-build-support-for-aarch64-and-ppc64le.patch
 
 BuildRequires: gcc-c++
 BuildRequires: cmake
@@ -500,6 +501,7 @@ Provides:  python-qpid_messaging = %{version}-%{release}
 %patch0001 -p2
 %patch0002 -p3
 %patch0003 -p3
+%patch0004 -p3
 
 
 pushd qpid-tools-%{version}
@@ -599,6 +601,9 @@ mkdir -p %{buildroot}/%{_localstatedir}/lib/qpidd
 
 
 %changelog
+* Mon Apr 13 2015 Peter Robinson <pbrobinson at fedoraproject.org> 0.32-2
+- Re-add patch that fixes builds on aarch64/ppc64le
+
 * Tue Apr  7 2015 Darryl L. Pierce <dpierce at redhat.com> - 0.32-1.1
 - Bumped the release to force a build against Proton 0.9 in F22.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/qpid-cpp.git/commit/?h=master&id=fa64391df758dde1c3701399849a977ada296dfc