From 7eb7b676f02b43bef293079cc065e2026bf631c51e8a6bd1376b18afe6290d8a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 10 Aug 2015 07:16:00 +0000 Subject: [PATCH] Accepting request 321223 from network 1 OBS-URL: https://build.opensuse.org/request/show/321223 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitcoin?expand=0&rev=7 --- bitcoin.changes | 6 ++++ bitcoin.spec | 5 ++-- ..._missing_ppc64le_in_ax_boost_base.m4.patch | 30 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch diff --git a/bitcoin.changes b/bitcoin.changes index 27cca07..97ae789 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 7 10:17:04 UTC 2015 - normand@linux.vnet.ibm.com + +- new patch for ppc64le build and remove ExcludeArch ppc ppc64 + bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch + ------------------------------------------------------------------- Sun Jul 12 22:40:07 UTC 2015 - prusnak@opensuse.org diff --git a/bitcoin.spec b/bitcoin.spec index bbbc857..edc0691 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -1,7 +1,7 @@ # # spec file for package bitcoin # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011-2014 P Rusnak # # All modifications and additions to the file contributed by third parties @@ -30,6 +30,7 @@ Source2: bitcoind.firewall Source3: bitcoind.conf # PATCH-FIX-OPENSUSE bitcoin-fix-desktop-icon-name.patch prusnak@opensuse.org -- Rename icon in desktop file to remove size reference. Patch0: bitcoin-fix-desktop-icon-name.patch +Patch1: bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -53,7 +54,6 @@ Requires(post): update-desktop-files Requires(postun): update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} -ExcludeArch: ppc64 ppc %description Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. @@ -129,6 +129,7 @@ This package provides automated tests for bitcoin-qt5 and bitcoind. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build autoreconf -fiv diff --git a/bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch b/bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch new file mode 100644 index 0000000..9e83fae --- /dev/null +++ b/bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch @@ -0,0 +1,30 @@ +From: Michel Normand +Subject: bitcoin missing ppc64le in ax_boost_base.m4 +Date: Fri, 07 Aug 2015 11:39:49 +0200 + +bitcoin missing ppc64le in ax_boost_base.m4 +that is the cause of following error message: +=== +[ 138s] checking whether the Boost::System library is available... yes +[ 138s] configure: error: Could not find a version of the boost_system library! +=== + +Signed-off-by: Michel Normand +--- + build-aux/m4/ax_boost_base.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +Index: bitcoin-0.11.0/build-aux/m4/ax_boost_base.m4 +=================================================================== +--- bitcoin-0.11.0.orig/build-aux/m4/ax_boost_base.m4 ++++ bitcoin-0.11.0/build-aux/m4/ax_boost_base.m4 +@@ -98,6 +98,9 @@ if test "x$want_boost" = "xyes"; then + ppc64|s390x|sparc64|aarch64) + libsubdirs="lib64 lib lib64" + ;; ++ ppc64le) ++ libsubdirs="lib64" ++ ;; + esac + + dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give