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=f501b0ba40c2df....
Change:
+%ifarch s390x
Thanks.
Full change:
============
commit 6860176cad1ac370a4978ca8927f4221946ada48
Author: Patrick Diehl <me(a)diehlpk.de>
Date: Wed Feb 20 10:23:59 2019 -0600
Update the Changelog
diff --git a/hpx.spec b/hpx.spec
index ab6ba5a..47d27c5 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -265,7 +265,7 @@ done
%{_libdir}/lib*.so*
%changelog
-* Fri Feb 01 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.2.1-1
+* Wed Feb 20 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.2.1-1
- HPX 1.2.1 release
* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 1.2.0-7
commit f07a1ab266c26eed4b558b2b68e67c332f36f4e4
Merge: f501b0b 4a9882b
Author: Patrick Diehl <me(a)diehlpk.de>
Date: Wed Feb 20 10:22:22 2019 -0600
Merge branch 'master' of
ssh://pkgs.fedoraproject.org/rpms/hpx
diff --cc hpx.spec
index 0c235d7,8fa7f0d..ab6ba5a
--- a/hpx.spec
+++ b/hpx.spec
@@@ -265,9 -240,8 +265,11 @@@ don
%{_libdir}/lib*.so*
%changelog
+* Fri Feb 01 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.2.1-1
- - HPX 1.2.1 for bulding with boost 1.69
- - Add s390x package
++- HPX 1.2.1 release
++
+ * Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 1.2.0-7
+ - Rebuild for openmpi 3.1.3
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit f501b0ba40c2df21678b4309c80db21c375e8f94
Author: Patrick Diehl <me(a)diehlpk.de>
Date: Wed Feb 20 10:18:38 2019 -0600
Update rawhide to hpx 1.2.1
diff --git a/.gitignore b/.gitignore
index dd872dc..4596a39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/hpx-*.src.rpm
/hpx_1.2.0.tar.gz
+/hpx_1.2.1.tar.gz
diff --git a/hpx.spec b/hpx.spec
index c23c78d..0c235d7 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,15 +1,11 @@
Name: hpx
-Version: 1.2.0
-Release: 6%{?dist}
+Version: 1.2.1
+Release: 1%{?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
+
BuildRequires: gcc-c++ >= 4.9
BuildRequires: gperftools-devel
@@ -17,7 +13,15 @@ BuildRequires: boost-devel
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
%global hpx_desc \
HPX is a general purpose C++ runtime system for parallel and distributed \
@@ -52,6 +56,10 @@ This package contains the examples
%package devel
Summary: Development headers and libraries for hpx
Requires: hpx = %{version}-%{release}
+Requires: boost-devel
+Requires: hwloc-devel
+Requires: gperftools-devel
+Requires: gcc-c++
%description devel
%{hpx_desc}
@@ -82,6 +90,11 @@ This package contains the examples
%package mpich-devel
Summary: Development headers and libraries for hpx
Requires: hpx-mpich = %{version}-%{release}
+Requires: boost-devel
+Requires: hwloc-devel
+Requires: mpich-devel
+Requires: gperftools-devel
+
%description mpich-devel
%{hpx_desc}.
@@ -94,6 +107,7 @@ Summary: HPX Open MPI libraries
Requires: openmpi
BuildRequires: openmpi-devel
+
%description openmpi
%{hpx_desc}
@@ -114,6 +128,10 @@ This package contains the examples
%package openmpi-devel
Summary: Development headers and libraries for hpx
Requires: hpx-openmpi = %{version}-%{release}
+Requires: boost-devel
+Requires: hwloc-devel
+Requires: openmpi-devel
+Requires: gperftools-devel
%description openmpi-devel
%{hpx_desc}
@@ -122,27 +140,35 @@ This package contains development headers and libraries
%prep
%setup -n %{name}_%{version} -q
-%patch0 -p1
-%patch1 -p1
%build
# use generic context for these archs
-%ifarch aarch64 s390x armv7hl
+%ifarch aarch64
%define cmake_opts -DHPX_WITH_GENERIC_CONTEXT_COROUTINES=ON
%endif
# ppc64 do not have enough memory
-%ifarch ppc64le aarch64
+%ifarch ppc64le aarch64 armv7hl
%global _smp_mflags -j1
%endif
+# use a different optimization level for arm dueo to memory limitations
+%ifarch armv7hl
+%define cmake_opts -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS -O1"
-DHPX_WITH_GENERIC_CONTEXT_COROUTINES=ON
+%endif
+
+# add lib atomic for s390x
+%ifarch s390x
+%define cmake_opts -DCMAKE_SHARED_LINKER_FLAGS="$RPM_OPT_FLAGS -latomic"
-DCMAKE_EXE_LINKER_FLAGS="$RPM_OPT_FLAGS -latomic"
+%endif
+
. /etc/profile.d/modules.sh
for mpi in '' openmpi mpich ; do
test -n "${mpi}" && module load mpi/${mpi}-%{_arch}
mkdir -p ${mpi:-serial}
pushd ${mpi:-serial}
test -n "${mpi}" && export CC=mpicc && export CXX=mpicxx
- %{cmake} ${mpi:+-DHPX_WITH_PARCELPORT_MPI=ON} -DLIB=${MPI_LIB:-%{_lib}}
%{?cmake_opts:%{cmake_opts}} ..
+ %{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/} ..
%make_build
test -n "${mpi}" && unset CC CXX
popd
@@ -156,8 +182,7 @@ for mpi in openmpi mpich '' ; do
test -n "${mpi}" && module load mpi/${mpi}-%{_arch} && mkdir
-p %{buildroot}/${MPI_BIN}
pushd ${mpi:-serial}
%make_install
- sed -i '1s@env python@python3@' %{buildroot}/%{_bindir}/{hpx*.py,hpxcxx}
%{buildroot}${MPI_LIB:-%{_libdir}}/cmake/HPX/templates/hpx{cxx,run.py}.in
- chmod +x %{buildroot}${MPI_LIB:-%{_libdir}}/cmake/HPX/templates/hpx{cxx,run.py}.in
+ sed -i '1s@env python@python3@' %{buildroot}/%{_bindir}/{hpx*.py,hpxcxx}
popd
pushd %{buildroot}/%{_bindir}
# rename executable with too generic names
@@ -165,7 +190,7 @@ for mpi in openmpi mpich '' ; do
test -n '${exe##hpx*}' && mv "${exe}"
"hpx_${exe}"
done
popd
- test -n "${mpi}" && mv %{buildroot}/%{_bindir}/*
%{buildroot}/${MPI_BIN}/
+ test -n "${mpi}" && mv %{buildroot}/%{_bindir}/*
%{buildroot}/${MPI_BIN}/
test -n "${mpi}" && module unload mpi/${mpi}-%{_arch}
done
@@ -240,6 +265,10 @@ done
%{_libdir}/lib*.so*
%changelog
+* Fri Feb 01 2019 Patrick Diehl <patrickdiehl(a)lsu.edu> - 1.2.1-1
+- HPX 1.2.1 for bulding with boost 1.69
+- Add s390x package
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.2.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 9ee8cbb..46a52b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (hpx_1.2.0.tar.gz) =
e2dec9484490f5a5fa7d60f712989f70068bcddac643d8b730d2d52aa2a7e49260b28c3becd519925a8e96e9a703473f19955adce087061cf50b861f4fed8ab1
+SHA512 (hpx_1.2.1.tar.gz) =
057724de1ef252e941a776174fa594a855255b5600461725a4da6e9002b1424a1e59be3f8a40673bb3db5a8aabd3c7b38abbb78042490befe247dd73c921b87c