The package rpms/hpx.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/hpx.git/commit/?id=0f8c4edd55a5b8....
Change:
-ExcludeArch: armv7hl
Thanks.
Full change:
============
commit 0f8c4edd55a5b81c2b041abea2eee0de6d1c4b5f
Author: Christoph Junghans <junghans(a)votca.org>
Date: Sun Dec 16 07:55:03 2018 -0700
added 3591.patch to fix build on armv7hlv
diff --git a/3591.patch b/3591.patch
new file mode 100644
index 0000000..0a7dc9a
--- /dev/null
+++ b/3591.patch
@@ -0,0 +1,33 @@
+From ee9fb5a49454a835f301656107a798f40d2a30d8 Mon Sep 17 00:00:00 2001
+From: Patrick Diehl <me(a)diehlpk.de>
+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>
diff --git a/hpx.spec b/hpx.spec
index be70241..34877c4 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,16 +1,15 @@
Name: hpx
Version: 1.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
URL:
http://stellar.cct.lsu.edu/tag/hpx/
Source0:
http://stellar.cct.lsu.edu/files/%{name}_%{version}.tar.gz
Patch0:
https://github.com/STEllAR-GROUP/hpx/pull/3551.patch
+Patch1:
https://github.com/STEllAR-GROUP/hpx/pull/3591.patch
#hpx has no support for
#
https://github.com/STEllAR-GROUP/hpx/issues/3511
ExcludeArch: s390x
-#
https://github.com/STEllAR-GROUP/hpx/issues/3509
-ExcludeArch: armv7hl
BuildRequires: gcc-c++ >= 4.9
BuildRequires: gperftools-devel
@@ -127,6 +126,7 @@ This package contains development headers and libraries
%prep
%setup -n %{name}_%{version} -q
%patch0 -p1
+%patch1 -p1
%build
# use generic context for these archs
@@ -243,6 +243,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* Sun Dec 16 2018 Christoph Junghans <junghans(a)votca.org> - 1.2.0-5
+- added 3591.patch to fix build on armv7hlv
+
* Thu Nov 22 2018 Christoph Junghans <junghans(a)votca.org> - 1.2.0-4
- use python3 for scripts