Hello community, here is the log from the commit of package hpx for openSUSE:Factory checked in at 2018-12-18 14:58:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hpx (Old) and /work/SRC/openSUSE:Factory/.hpx.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hpx" Tue Dec 18 14:58:27 2018 rev:4 rq:658774 version:1.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hpx/hpx.changes 2018-12-08 11:22:13.230733166 +0100 +++ /work/SRC/openSUSE:Factory/.hpx.new.28833/hpx.changes 2018-12-18 14:59:59.134107230 +0100 @@ -1,0 +2,5 @@ +Sun Dec 16 14:27:44 UTC 2018 - Christoph Junghans <[email protected]> + +- Added 3591.patch to fix build on %arm + +------------------------------------------------------------------- New: ---- 3591.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hpx.spec ++++++ --- /var/tmp/diff_new_pack.tOg2am/_old 2018-12-18 14:59:59.842106165 +0100 +++ /var/tmp/diff_new_pack.tOg2am/_new 2018-12-18 14:59:59.846106159 +0100 @@ -17,9 +17,6 @@ # -# See https://github.com/STEllAR-GROUP/hpx/issues/3509 -ExcludeArch: %arm - %define mpi_implem openmpi2 %ifarch ppc64 %define mpi_implem openmpi @@ -45,6 +42,8 @@ Patch1: 3557.patch #PATCH-FIX-OPENSUSE boo#1100677 avoid compile-time CPU-detection Patch2: reproducible.patch +#PATCH-FIX-UPSTREAM 3591.patch, fix build on arm, https://github.com/STEllAR-GROUP/hpx/pull/3591 +Patch3: 3591.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -107,9 +106,10 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build -%ifarch aarch64 s390x armv7hl ppc64 +%ifarch aarch64 s390x armv7hl ppc64 %arm %define cmake_opts -DHPX_WITH_GENERIC_CONTEXT_COROUTINES=ON %endif ++++++ 3591.patch ++++++ >From ee9fb5a49454a835f301656107a798f40d2a30d8 Mon Sep 17 00:00:00 2001 From: Patrick Diehl <[email protected]> Date: Sat, 15 Dec 2018 13:31:16 -0600 Subject: [PATCH] Fix compilation error n arm7 architecture. Compiles and runs on Fedora 29 on Pi 3. --- hpx/lcos/local/spinlock.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hpx/lcos/local/spinlock.hpp b/hpx/lcos/local/spinlock.hpp index 7c43fc5fd8b..54f66dc3229 100644 --- a/hpx/lcos/local/spinlock.hpp +++ b/hpx/lcos/local/spinlock.hpp @@ -2,8 +2,8 @@ // Copyright (c) 2011 Bryce Lelbach // Copyright (c) 2011-2018 Hartmut Kaiser // Copyright (c) 2014 Thomas Heller -// // Copyright (c) 2008 Peter Dimov +// Copyright (c) 2018 Patrick Diehl // // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -28,7 +28,7 @@ # include <boost/detail/interlocked.hpp> # endif #else -# if !defined(__ANDROID__) && !defined(ANDROID) && !defined(__arm__) +# if !defined(__ANDROID__) && !defined(ANDROID) # include <boost/smart_ptr/detail/spinlock.hpp> # if defined(__ia64__) && defined(__INTEL_COMPILER) # include <ia64intrin.h>
