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=f39c15c8aa0ac4....
Change:
-%ifarch s390x
Thanks.
Full change:
============
commit f39c15c8aa0ac4bd07b09100389292cd43d04082
Author: Patrick Diehl <me(a)diehlpk.de>
Date: Thu May 23 17:28:20 2019 -0500
Update to 1.3.0
diff --git a/hpx.spec b/hpx.spec
index 9dcf47b..21c8046 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,5 +1,5 @@
Name: hpx
-Version: 1.2.1
+Version: 1.3.0
Release: 1%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
@@ -14,11 +14,9 @@ BuildRequires: hwloc-devel
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: git
-
-%ifarch s390x
BuildRequires: libatomic
-Requires: libatomic
-%endif
+
+
#Add libatomic since it is not installed with gcc on Fedora
Requires: libatomic
@@ -168,7 +166,7 @@ for mpi in '' openmpi mpich ; do
mkdir -p ${mpi:-serial}
pushd ${mpi:-serial}
test -n "${mpi}" && export CC=mpicc && export CXX=mpicxx
- %{cmake} ${mpi:+-DHPX_WITH_PARCELPORT_MPI=ON} %{?cmake_opts:%{cmake_opts}}
-DLIB_INSTALL_DIR=%_libdir/${mpi}/${mpi:+lib/} -DLIBDIR=%_libdir/${mpi}/${mpi:+lib/}
-DCMAKE_INSTALL_LIBDIR=%_libdir/${mpi}/${mpi:+lib/} ..
+ %{cmake} ${mpi:+-DHPX_WITH_PARCELPORT_MPI=ON} %{?cmake_opts:%{cmake_opts}}
-DHPX_WITH_BUILD_DISTRIBUTION=ON -DLIB_INSTALL_DIR=%_libdir/${mpi}/${mpi:+lib/}
-DLIBDIR=%_libdir/${mpi}/${mpi:+lib/} -DCMAKE_INSTALL_LIBDIR=%_libdir/${mpi}/${mpi:+lib/}
..
%make_build
test -n "${mpi}" && unset CC CXX
popd
@@ -265,6 +263,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* Fri May 03 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.3.0-1
+- HPX 1.3.0 release
+
* Wed Feb 20 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.2.1-1
- HPX 1.2.1 release
commit 87394fc0012a0e7b03471fd40dec9c5b22e2979b
Author: Patrick Diehl <me(a)diehlpk.de>
Date: Fri May 3 21:07:40 2019 -0500
Delete old patch files
diff --git a/3551.patch b/3551.patch
deleted file mode 100644
index 22bd73d..0000000
--- a/3551.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 5ffbb5fdcce82b8ba19efd9cc6a7bfcc0b62ba15 Mon Sep 17 00:00:00 2001
-From: John Biddiscombe <biddisco(a)cscs.ch>
-Date: Thu, 15 Nov 2018 11:49:21 +0100
-Subject: [PATCH] Fix uint64_t causing compilation fail on i686
-
-use std:: for all uint16_t and uint64_t throughout
----
- .../async_customization.cpp | 22 +++++++++----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/examples/resource_partitioner/async_customization.cpp
b/examples/resource_partitioner/async_customization.cpp
-index 16aca83b5a5..e6c6a61e004 100644
---- a/examples/resource_partitioner/async_customization.cpp
-+++ b/examples/resource_partitioner/async_customization.cpp
-@@ -29,7 +29,7 @@
- #include "shared_priority_queue_scheduler.hpp"
- //
- #include <cstddef>
--#include <cstddef>
-+#include <cstdint>
- #include <iostream>
- #include <memory>
- #include <string>
-@@ -382,11 +382,11 @@ int test(Executor &exec)
- // test 3b
- std::cout << "============================" << std::endl;
- std::cout << "Test 3b : when_all(shared)" << std::endl;
-- future<uint64_t> fws1 = make_ready_future(uint64_t(42));
-+ future<std::uint64_t> fws1 = make_ready_future(std::uint64_t(42));
- shared_future<float> fws2 = make_ready_future(3.1415f).share();
- //
- auto fws = when_all(fws1, fws2).then(exec,
-- [](future<util::tuple<future<uint64_t>,
shared_future<float>>> && f)
-+ [](future<util::tuple<future<std::uint64_t>,
shared_future<float>>> && f)
- {
- auto tup = f.get();
- auto cmplx = std::complex<double>(
-@@ -401,13 +401,13 @@ int test(Executor &exec)
- // test 4a
- std::cout << "============================" << std::endl;
- std::cout << "Test 4a : dataflow()" << std::endl;
-- future<uint16_t> f1 = make_ready_future(uint16_t(255));
-+ future<std::uint16_t> f1 = make_ready_future(std::uint16_t(255));
- future<double> f2 = make_ready_future(127.890);
- //
- auto fd = dataflow(exec,
-- [](future<uint16_t> && f1, future<double> && f2)
-+ [](future<std::uint16_t> && f1, future<double> &&
f2)
- {
-- auto cmplx = std::complex<uint64_t>(f1.get(), f2.get());
-+ auto cmplx = std::complex<std::uint64_t>(f1.get(), f2.get());
- std::cout << "Inside dataflow : " << cmplx <<
std::endl;
- return cmplx;
- }
-@@ -419,13 +419,13 @@ int test(Executor &exec)
- // test 4b
- std::cout << "============================" << std::endl;
- std::cout << "Test 4b : dataflow(shared)" << std::endl;
-- future<uint16_t> fs1 = make_ready_future(uint16_t(255));
-+ future<std::uint16_t> fs1 = make_ready_future(std::uint16_t(255));
- shared_future<double> fs2 = make_ready_future(127.890).share();
- //
- auto fds = dataflow(exec,
-- [](future<uint16_t> && f1, shared_future<double> &&
f2)
-+ [](future<std::uint16_t> && f1, shared_future<double>
&& f2)
- {
-- auto cmplx = std::complex<uint64_t>(f1.get(), f2.get());
-+ auto cmplx = std::complex<std::uint64_t>(f1.get(), f2.get());
- std::cout << "Inside dataflow(shared) : " << cmplx
<< std::endl;
- return cmplx;
- }
-@@ -453,14 +453,14 @@ namespace hpx { namespace threads { namespace executors
- std::cout << "Hint 2 \n";
- return 0;
- }
-- int operator()(const uint16_t, const double) const {
-+ int operator()(const std::uint16_t, const double) const {
- std::cout << "Hint 3 \n";
- return 0;
- }
- int operator()(const util::tuple<future<int>, future<double>>
&) const {
- return 0;
- }
-- int operator()(const util::tuple<future<long unsigned int>,
-+ int operator()(const util::tuple<future<std::uint64_t>,
- shared_future<float>> &) const
- {
- return 0;
diff --git a/3591.patch b/3591.patch
deleted file mode 100644
index 0a7dc9a..0000000
--- a/3591.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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>