Hello community, here is the log from the commit of package hpx for openSUSE:Factory checked in at 2019-10-16 09:12:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hpx (Old) and /work/SRC/openSUSE:Factory/.hpx.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "hpx" Wed Oct 16 09:12:19 2019 rev:8 rq:734904 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/hpx/hpx.changes 2019-03-24 15:01:01.487171417 +0100 +++ /work/SRC/openSUSE:Factory/.hpx.new.2352/hpx.changes 2019-10-16 09:12:20.739922144 +0200 @@ -1,0 +2,5 @@ +Mon May 27 08:43:48 UTC 2019 - Nicolas Morey-Chaisemartin <[email protected]> + +- Always use the default openmpi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hpx.spec ++++++ --- /var/tmp/diff_new_pack.fd2GR3/_old 2019-10-16 09:12:21.503920175 +0200 +++ /var/tmp/diff_new_pack.fd2GR3/_new 2019-10-16 09:12:21.507920164 +0200 @@ -1,7 +1,7 @@ # # spec file for package hpx # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 Christoph Junghans # # All modifications and additions to the file contributed by third parties @@ -17,17 +17,6 @@ # -%define mpi_implem openmpi2 -%ifarch ppc64 -%define mpi_implem openmpi -%endif -%if 0%{?sle_version} == 120300 && 0%{?is_opensuse} -%define mpi_implem openmpi -%endif -%if 0%{?sle_version} == 120400 && !0%{?is_opensuse} -%define mpi_implem openmpi -%endif - Name: hpx Version: 1.2.1 Release: 0 @@ -43,13 +32,12 @@ BuildRequires: gcc-c++ >= 4.9 BuildRequires: gperftools-devel -BuildRequires: %{mpi_implem}-devel %if 0%{?suse_version} > 1325 BuildRequires: libboost_atomic-devel BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_system-devel BuildRequires: libboost_program_options-devel BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel %ifarch aarch64 %arm BuildRequires: libboost_chrono-devel BuildRequires: libboost_context-devel @@ -58,11 +46,10 @@ %else BuildRequires: boost-devel %endif -BuildRequires: %{mpi_implem} -BuildRequires: %{mpi_implem}-devel BuildRequires: cmake BuildRequires: fdupes BuildRequires: hwloc-devel +BuildRequires: openmpi-macros-devel %description HPX is a general purpose C++ runtime system for parallel and distributed applications of any scale. @@ -81,6 +68,7 @@ %package -n libhpx1 Summary: Libraries for the hpx package Group: System/Libraries +%openmpi_requires %description -n libhpx1 HPX is a general purpose C++ runtime system for parallel and distributed applications of any scale. @@ -110,7 +98,7 @@ %define cmake_opts -DCMAKE_SHARED_LINKER_FLAGS="$RPM_OPT_FLAGS -latomic" -DCMAKE_EXE_LINKER_FLAGS="$RPM_OPT_FLAGS -latomic" %endif -. %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%setup_openmpi %{cmake} -DLIB=%{_lib} %{?cmake_opts:%{cmake_opts}} -DHPX_WITH_BUILD_BINARY_PACKAGE=ON make # no _smp_mflags to save memory @@ -123,7 +111,7 @@ %check # full testsuite takes too much memory just run tests.examples in 1.2.0 -. %{_libdir}/mpi/gcc/%{mpi_implem}/bin/mpivars.sh +%setup_openmpi LD_LIBRARY_PATH="%{buildroot}/%{_libdir}:${LD_LIBRARY_PATH}" make -C build tests.examples %post -n libhpx1 -p /sbin/ldconfig
