Architecture specific change in rpms/hpx.git
by githook-noreply@fedoraproject.org
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
commit 4a9882b4f88b87d4acdacad9f1ae7354a869b89d
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Feb 13 19:51:57 2019 -0700
Rebuild for openmpi 3.1.3
diff --git a/hpx.spec b/hpx.spec
index c23c78d..8fa7f0d 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,6 +1,6 @@
Name: hpx
Version: 1.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
URL: http://stellar.cct.lsu.edu/tag/hpx/
@@ -240,6 +240,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* 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 e3d6f7fceb676b64f445604e765a8ee346296b8e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 02:23:53 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/hpx.spec b/hpx.spec
index f8bffb6..c23c78d 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,6 +1,6 @@
Name: hpx
Version: 1.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
URL: http://stellar.cct.lsu.edu/tag/hpx/
@@ -240,6 +240,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* 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
+
* Sun Dec 16 2018 Christoph Junghans <junghans(a)votca.org> - 1.2.0-5
- added 3591.patch to fix build on armv7hlv
commit 6d971afa6cf2a49d772fca09e90025f5dfa046b2
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:48 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/hpx.spec b/hpx.spec
index 34877c4..f8bffb6 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -51,7 +51,6 @@ This package contains the examples
%package devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx = %{version}-%{release}
%description devel
@@ -82,7 +81,6 @@ This package contains the examples
%package mpich-devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx-mpich = %{version}-%{release}
%description mpich-devel
@@ -115,7 +113,6 @@ This package contains the examples
%package openmpi-devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx-openmpi = %{version}-%{release}
%description openmpi-devel
5 years, 2 months
Architecture specific change in rpms/hpx.git
by githook-noreply@fedoraproject.org
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
commit 4a9882b4f88b87d4acdacad9f1ae7354a869b89d
Author: Orion Poplawski <orion(a)nwra.com>
Date: Wed Feb 13 19:51:57 2019 -0700
Rebuild for openmpi 3.1.3
diff --git a/hpx.spec b/hpx.spec
index c23c78d..8fa7f0d 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,6 +1,6 @@
Name: hpx
Version: 1.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
URL: http://stellar.cct.lsu.edu/tag/hpx/
@@ -240,6 +240,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* 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 e3d6f7fceb676b64f445604e765a8ee346296b8e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 02:23:53 2019 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/hpx.spec b/hpx.spec
index f8bffb6..c23c78d 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -1,6 +1,6 @@
Name: hpx
Version: 1.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: General Purpose C++ Runtime System
License: Boost
URL: http://stellar.cct.lsu.edu/tag/hpx/
@@ -240,6 +240,9 @@ done
%{_libdir}/lib*.so*
%changelog
+* 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
+
* Sun Dec 16 2018 Christoph Junghans <junghans(a)votca.org> - 1.2.0-5
- added 3591.patch to fix build on armv7hlv
commit 6d971afa6cf2a49d772fca09e90025f5dfa046b2
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:48 2019 +0100
Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/hpx.spec b/hpx.spec
index 34877c4..f8bffb6 100644
--- a/hpx.spec
+++ b/hpx.spec
@@ -51,7 +51,6 @@ This package contains the examples
%package devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx = %{version}-%{release}
%description devel
@@ -82,7 +81,6 @@ This package contains the examples
%package mpich-devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx-mpich = %{version}-%{release}
%description mpich-devel
@@ -115,7 +113,6 @@ This package contains the examples
%package openmpi-devel
Summary: Development headers and libraries for hpx
-Group: Development/Libraries/C and C++
Requires: hpx-openmpi = %{version}-%{release}
%description openmpi-devel
5 years, 2 months
Architecture specific change in rpms/sundials.git
by githook-noreply@fedoraproject.org
The package rpms/sundials.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/sundials.git/commit/?id=1969a5e4d....
Change:
-%ifarch %{power64} %{arm} aarch64 s390x
Thanks.
Full change:
============
commit e136623fc0ede03c22b9f183c2e252dbc0294b75
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Feb 20 20:09:46 2019 +0100
Serial/MPI libraries are now separated
diff --git a/sundials.spec b/sundials.spec
index bd58bce..713bfac 100644
--- a/sundials.spec
+++ b/sundials.spec
@@ -50,7 +50,7 @@
%endif
###########
-# Tests of MPI libraries disabled for
+# Disable tests of MPI libraries for
# "not enough slots available" errors
%if 0%{?fedora} && 0%{?fedora} < 30
%global with_openmpicheck 1
@@ -659,7 +659,7 @@ popd
%changelog
* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 3.2.1-4
- Rebuild for openmpi 3.1.3
-- Tests of MPI libraries disabled for "not enough slots available" errors
+- Disable tests of MPI libraries for "not enough slots available" errors
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 1969a5e4dcef92c7abf765d2328f1e9513046d9b
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Feb 20 20:05:53 2019 +0100
Tests of MPI libraries disabled for 'not enough slots available' errors
diff --git a/sundials.spec b/sundials.spec
index db2a7fa..bd58bce 100644
--- a/sundials.spec
+++ b/sundials.spec
@@ -1,5 +1,5 @@
## Debug builds?
-%bcond_without debug
+%bcond_with debug
#
%if 0%{?rhel} && 0%{?rhel} < 7
@@ -50,8 +50,12 @@
%endif
###########
+# Tests of MPI libraries disabled for
+# "not enough slots available" errors
+%if 0%{?fedora} && 0%{?fedora} < 30
%global with_openmpicheck 1
%global with_mpichcheck 1
+%endif
%global with_sercheck 1
Summary: Suite of nonlinear solvers
@@ -305,8 +309,12 @@ popd
pushd buildopenmpi_dir
##Set openmpi library's paths
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_par/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_par/CMakeLists.txt
+sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_parhyp/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_parhyp/CMakeLists.txt
%if 0%{?with_petsc}
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_petsc/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_petsc/CMakeLists.txt
%endif
mkdir -p build && cd build
@@ -369,7 +377,7 @@ export CFLAGS=""
-DPETSC_INCLUDE_DIR:PATH=$MPI_INCLUDE/petsc \
-DPETSC_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/openmpi/lib \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON -DEXAMPLES_ENABLE_F77:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=OFF \
@@ -412,8 +420,12 @@ popd
pushd buildmpich_dir
##Set mpich library's paths
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_par/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_par/CMakeLists.txt
+sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_parhyp/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_parhyp/CMakeLists.txt
%if 0%{?with_petsc}
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_petsc/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_petsc/CMakeLists.txt
%endif
mkdir -p build && cd build
@@ -484,7 +496,7 @@ export CFLAGS=""
-DPETSC_INCLUDE_DIR:PATH=$MPI_INCLUDE/petsc \
-DPETSC_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/mpich/lib \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON -DEXAMPLES_ENABLE_F77:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=OFF \
@@ -558,19 +570,11 @@ rm -f %{buildroot}%{_includedir}/sundials/LICENSE
%if 0%{?with_openmpicheck}
pushd buildopenmpi_dir/build
%{_openmpi_load}
-export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB
+export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
%{_openmpi_unload}
popd
@@ -581,19 +585,11 @@ popd
%if 0%{?with_mpichcheck}
pushd buildmpich_dir/build
%{_mpich_load}
-export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB
+export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
%{_mpich_unload}
popd
@@ -604,17 +600,9 @@ popd
pushd sundials-%{version}/build
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
popd
%endif ## if with_sercheck
@@ -671,6 +659,7 @@ popd
%changelog
* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 3.2.1-4
- Rebuild for openmpi 3.1.3
+- Tests of MPI libraries disabled for "not enough slots available" errors
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months
Architecture specific change in rpms/sundials.git
by githook-noreply@fedoraproject.org
The package rpms/sundials.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/sundials.git/commit/?id=1969a5e4d....
Change:
-%ifarch %{power64} %{arm} aarch64 s390x
Thanks.
Full change:
============
commit 1969a5e4dcef92c7abf765d2328f1e9513046d9b
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Feb 20 20:05:53 2019 +0100
Tests of MPI libraries disabled for 'not enough slots available' errors
diff --git a/sundials.spec b/sundials.spec
index db2a7fa..bd58bce 100644
--- a/sundials.spec
+++ b/sundials.spec
@@ -1,5 +1,5 @@
## Debug builds?
-%bcond_without debug
+%bcond_with debug
#
%if 0%{?rhel} && 0%{?rhel} < 7
@@ -50,8 +50,12 @@
%endif
###########
+# Tests of MPI libraries disabled for
+# "not enough slots available" errors
+%if 0%{?fedora} && 0%{?fedora} < 30
%global with_openmpicheck 1
%global with_mpichcheck 1
+%endif
%global with_sercheck 1
Summary: Suite of nonlinear solvers
@@ -305,8 +309,12 @@ popd
pushd buildopenmpi_dir
##Set openmpi library's paths
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_par/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_par/CMakeLists.txt
+sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_parhyp/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_parhyp/CMakeLists.txt
%if 0%{?with_petsc}
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/openmpi-%{_arch}/nvector|g' src/nvec_petsc/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/openmpi/lib|g' src/nvec_petsc/CMakeLists.txt
%endif
mkdir -p build && cd build
@@ -369,7 +377,7 @@ export CFLAGS=""
-DPETSC_INCLUDE_DIR:PATH=$MPI_INCLUDE/petsc \
-DPETSC_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/openmpi/lib \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON -DEXAMPLES_ENABLE_F77:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=OFF \
@@ -412,8 +420,12 @@ popd
pushd buildmpich_dir
##Set mpich library's paths
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_par/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_par/CMakeLists.txt
+sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_parhyp/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_parhyp/CMakeLists.txt
%if 0%{?with_petsc}
sed -i 's|DESTINATION include/nvector|DESTINATION %{_includedir}/mpich-%{_arch}/nvector|g' src/nvec_petsc/CMakeLists.txt
+sed -i 's|CMAKE_INSTALL_LIBDIR}|CMAKE_INSTALL_LIBDIR}/mpich/lib|g' src/nvec_petsc/CMakeLists.txt
%endif
mkdir -p build && cd build
@@ -484,7 +496,7 @@ export CFLAGS=""
-DPETSC_INCLUDE_DIR:PATH=$MPI_INCLUDE/petsc \
-DPETSC_LIBRARY_DIR:PATH=$MPI_LIB \
%endif
- -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib}/mpich/lib \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
-DPYTHON_EXECUTABLE:FILEPATH=%{__python2} \
-DEXAMPLES_ENABLE_CXX:BOOL=ON -DEXAMPLES_ENABLE_C:BOOL=ON -DEXAMPLES_ENABLE_F77:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON -DBUILD_STATIC_LIBS:BOOL=OFF \
@@ -558,19 +570,11 @@ rm -f %{buildroot}%{_includedir}/sundials/LICENSE
%if 0%{?with_openmpicheck}
pushd buildopenmpi_dir/build
%{_openmpi_load}
-export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB
+export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
%{_openmpi_unload}
popd
@@ -581,19 +585,11 @@ popd
%if 0%{?with_mpichcheck}
pushd buildmpich_dir/build
%{_mpich_load}
-export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB
+export LD_LIBRARY_PATH=%{buildroot}$MPI_LIB:%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
%{_mpich_unload}
popd
@@ -604,17 +600,9 @@ popd
pushd sundials-%{version}/build
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%if %{with debug}
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
+ctest3 --force-new-ctest-process -VV %{?_smp_mflags} --output-on-failure --debug
%else
-ctest3 --force-new-ctest-process -VV -j 1 --output-on-failure --debug
-%endif
-%else
-%ifarch %{power64} %{arm} aarch64 s390x
-ctest3 --force-new-ctest-process -j 1 -E 'test_sunmatrix_sparse_400_400_0_0|test_nvector_mpi_4'
-%else
-ctest3 --force-new-ctest-process -j 1
-%endif
+ctest3 --force-new-ctest-process %{?_smp_mflags}
%endif
popd
%endif ## if with_sercheck
@@ -671,6 +659,7 @@ popd
%changelog
* Thu Feb 14 2019 Orion Poplawski <orion(a)nwra.com> - 3.2.1-4
- Rebuild for openmpi 3.1.3
+- Tests of MPI libraries disabled for "not enough slots available" errors
* Sun Feb 03 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months
Architecture specific change in rpms/hpx.git
by githook-noreply@fedoraproject.org
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
5 years, 2 months
Architecture specific change in rpms/vkd3d.git
by githook-noreply@fedoraproject.org
The package rpms/vkd3d.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/vkd3d.git/commit/?id=5d1e479e817d....
Change:
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
Thanks.
Full change:
============
commit 5d1e479e817d545e7611be929118945a6286527d
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Wed Feb 20 11:21:48 2019 -0600
EPEL 7 support
diff --git a/vkd3d.spec b/vkd3d.spec
index a511e49..4ac1653 100644
--- a/vkd3d.spec
+++ b/vkd3d.spec
@@ -17,6 +17,14 @@ BuildRequires: xcb-util-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xcb-util-wm-devel
+# Wine does not build on aarch64 due to clang requires
+# vulkan is not available in RHEL 7 for aarch64 either
+%if 0%{?rhel} == 7
+ExclusiveArch: %{ix86} x86_64 %{arm}
+%else
+ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
+%endif
+
%description
The vkd3d project includes libraries, shaders, utilities, and demos for
translating D3D12 to Vulkan.
5 years, 2 months
Architecture specific change in rpms/golang-github-pengsrc-shared.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-pengsrc-shared.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/golang-github-pengsrc-shared.git/....
Change:
+%ifarch ppc64le
Thanks.
Full change:
============
commit 8b32202e4769b8338f6ea2f5cae5c978ed3fcd4b
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Wed Feb 20 17:36:13 2019 +0100
Disable tests for ppc64le due to segfault
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-github-pengsrc-shared.spec b/golang-github-pengsrc-shared.spec
index 673f7dc..a293c83 100644
--- a/golang-github-pengsrc-shared.spec
+++ b/golang-github-pengsrc-shared.spec
@@ -1,5 +1,10 @@
# Run tests in check section
+# https://github.com/pengsrc/go-shared/issues/6
+%ifarch ppc64le
+%bcond_with check
+%else
%bcond_without check
+%endif
%global goipath github.com/pengsrc/go-shared
%global commit 1ef04317652833067e47e2ee9815f1f254a7a1da
@@ -11,7 +16,7 @@ Useful packages for the Go programming language.}
Name: %{goname}
Version: 0.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Useful packages for the Go programming language
License: ASL 2.0
URL: %{gourl}
@@ -59,6 +64,9 @@ building other packages which use import path with
%changelog
+* Wed Feb 20 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.2.0-5.20180718git1ef0431
+- Disable tests for ppc64le due to segfault
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-4.git1ef0431
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months
Architecture specific change in rpms/golang-github-pengsrc-shared.git
by githook-noreply@fedoraproject.org
The package rpms/golang-github-pengsrc-shared.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/golang-github-pengsrc-shared.git/....
Change:
+%ifarch ppc64le
Thanks.
Full change:
============
commit 844fed7d41d1553082a16076238c35c7d790a551
Author: Robert-Andr Mauchin <zebob.m(a)gmail.com>
Date: Wed Feb 20 17:36:13 2019 +0100
Disable tests for ppc64le due to segfault
Signed-off-by: Robert-Andr Mauchin <zebob.m(a)gmail.com>
diff --git a/golang-github-pengsrc-shared.spec b/golang-github-pengsrc-shared.spec
index 673f7dc..a293c83 100644
--- a/golang-github-pengsrc-shared.spec
+++ b/golang-github-pengsrc-shared.spec
@@ -1,5 +1,10 @@
# Run tests in check section
+# https://github.com/pengsrc/go-shared/issues/6
+%ifarch ppc64le
+%bcond_with check
+%else
%bcond_without check
+%endif
%global goipath github.com/pengsrc/go-shared
%global commit 1ef04317652833067e47e2ee9815f1f254a7a1da
@@ -11,7 +16,7 @@ Useful packages for the Go programming language.}
Name: %{goname}
Version: 0.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Useful packages for the Go programming language
License: ASL 2.0
URL: %{gourl}
@@ -59,6 +64,9 @@ building other packages which use import path with
%changelog
+* Wed Feb 20 2019 Robert-Andr Mauchin <zebob.m(a)gmail.com> - 0.2.0-5.20180718git1ef0431
+- Disable tests for ppc64le due to segfault
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-4.git1ef0431
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years, 2 months
Architecture specific change in rpms/hpx.git
by githook-noreply@fedoraproject.org
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 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
5 years, 2 months