From 648f8fa6350f47f2fe4c4a2471d298354b46a411793969d2f01097db1b24a64f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 5 Jul 2016 07:51:19 +0000 Subject: [PATCH] Accepting request 403844 from network 1 OBS-URL: https://build.opensuse.org/request/show/403844 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bitcoin?expand=0&rev=16 --- bitcoin.changes | 13 +++++++++++++ bitcoin.spec | 10 +++++++--- ...in_missing_ppc64le_in_ax_boost_base.m4.patch | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch diff --git a/bitcoin.changes b/bitcoin.changes index ec80335..cca8851 100644 --- a/bitcoin.changes +++ b/bitcoin.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jun 20 15:58:45 UTC 2016 - normand@linux.vnet.ibm.com + +- put back still need patch for ppc64le + bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch + (subset of upstream commit id cf5c786) + +------------------------------------------------------------------- +Sat Jun 18 11:17:59 UTC 2016 - mpluskal@suse.com + +- Update test dependencies +- Build with safer ldflags + ------------------------------------------------------------------- Fri May 27 07:53:02 UTC 2016 - mpluskal@suse.com diff --git a/bitcoin.spec b/bitcoin.spec index 9b04e19..91e6118 100644 --- a/bitcoin.spec +++ b/bitcoin.spec @@ -34,11 +34,13 @@ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/% Source1: %{base}d.service Source2: %{base}d.firewall Source3: %{base}d.conf +Patch1: bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel BuildRequires: gcc-c++ BuildRequires: git +BuildRequires: java-devel BuildRequires: lcov BuildRequires: libdb-4_8-devel BuildRequires: libminiupnpc-devel @@ -166,14 +168,16 @@ This package provides automated tests for %{name}-qt5 and %{name}d. %prep %setup -q +%patch1 -p1 # remove 128 resolution from Icon= line sed -i s/128// contrib/debian/%{name}-qt.desktop %build autoreconf -fiv -export CXXFLAGS="%{optflags} -fPIC" -export CFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIE -fPIC" +export CFLAGS="%{optflags} -fPIE -fPIC" +export LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now -pie" %configure \ --with-cli=yes \ --with-daemon=yes \ @@ -188,7 +192,7 @@ export CFLAGS="%{optflags} -fPIC" make %{?_smp_mflags} V=1 %check -make %{?_smp_mflags} check +make %{?_smp_mflags} check || cat src/test-suite.log %install make %{?_smp_mflags} DESTDIR=%{buildroot} install 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..48c6dad --- /dev/null +++ b/bitcoin_missing_ppc64le_in_ax_boost_base.m4.patch @@ -0,0 +1,17 @@ +--- + build-aux/m4/ax_boost_base.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: bitcoin-0.12.1/build-aux/m4/ax_boost_base.m4 +=================================================================== +--- bitcoin-0.12.1.orig/build-aux/m4/ax_boost_base.m4 ++++ bitcoin-0.12.1/build-aux/m4/ax_boost_base.m4 +@@ -95,7 +95,7 @@ if test "x$want_boost" = "xyes"; then + x86_64) + libsubdirs="lib64 libx32 lib lib64" + ;; +- ppc64|s390x|sparc64|aarch64) ++ ppc64|s390x|sparc64|aarch64|ppc64le) + libsubdirs="lib64 lib lib64" + ;; + esac