Accepting request 679953 from home:eeich:branches:science
- Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch * Add missing dependency to serialize sub-builds. OBS-URL: https://build.opensuse.org/request/show/679953 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=25
This commit is contained in:
parent
1acdfa05d5
commit
171ee4dfe6
@ -85,7 +85,7 @@ index 88fc032..5a3c6e2 100644
|
||||
mumps_thread.o \
|
||||
mumps_save_restore_C.o
|
||||
|
||||
+common: $(OBJS_COMMON_MOD)
|
||||
+common: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
|
||||
+
|
||||
OBJS_MOD = \
|
||||
$(ARITH)ana_aux_par.o \
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 27 18:29:25 UTC 2019 - Egbert Eich <eich@suse.com>
|
||||
|
||||
- Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch
|
||||
* Add missing dependency to serialize sub-builds.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 25 05:37:27 UTC 2019 - Torben Mikael Hansen <torhans-build@sciomnis.com>
|
||||
|
||||
|
15
mumps.spec
15
mumps.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package mumps
|
||||
#
|
||||
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -12,7 +12,7 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
@ -221,19 +221,19 @@ BuildRequires: gcc-fortran
|
||||
%{?with_scotch:BuildRequires: %{scotch}%{?with_mpi:-%{mpi_family}%{?mpi_ext}}-devel}
|
||||
%if %{with mpi}
|
||||
BuildRequires: %{mpi_family}%{?mpi_ext}-devel
|
||||
BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel
|
||||
BuildRequires: libblacs2-%{mpi_family}%{?mpi_ext}-devel
|
||||
BuildRequires: scalapack-%{mpi_family}%{?mpi_ext}-devel
|
||||
%endif # mpi
|
||||
BuildRequires: blas-devel
|
||||
BuildRequires: lapack-devel
|
||||
%else # hpc
|
||||
BuildRequires: %{compiler_family}%{?c_f_ver}-compilers-hpc-macros-devel
|
||||
BuildRequires: %{mpi_family}%{?mpi_ver}-%{compiler_family}%{?c_f_ver}-hpc-macros-devel
|
||||
BuildRequires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
BuildRequires: libgomp1
|
||||
BuildRequires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
BuildRequires: suse-hpc
|
||||
BuildRequires: fdupes
|
||||
%endif # hpc
|
||||
|
||||
%description
|
||||
@ -275,8 +275,8 @@ Group: System/Libraries
|
||||
Requires: lib%{pname}%{?scotch:-scotch}%{so_ver} = %{version}
|
||||
%if %{without hpc} && %{with mpi}
|
||||
# Install link targets for non-HPC MPI compat links from the MPI libdir - see below.
|
||||
BuildRequires: lib%{pname}%{?scotch:-scotch}%{so_ver} = %{version}
|
||||
BuildRequires: %{pname}%{?scotch:-scotch}-devel-static = %version
|
||||
BuildRequires: lib%{pname}%{?scotch:-scotch}%{so_ver} = %{version}
|
||||
%endif
|
||||
|
||||
%description %{so_ver}-compat
|
||||
@ -329,8 +329,8 @@ Requires: lapack-devel
|
||||
%endif # mpi
|
||||
%else # hpc
|
||||
%hpc_requires_devel
|
||||
Requires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
Requires: libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
Requires: libscalapack2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel
|
||||
%endif
|
||||
|
||||
%description devel
|
||||
@ -590,6 +590,7 @@ rm -rf examples/*.o examples/*simpletest examples/c_example examples/multiple_ar
|
||||
%else
|
||||
%post -n %{libname}
|
||||
/sbin/ldconfig -N %{my_libdir}
|
||||
|
||||
%postun -n %{libname}
|
||||
/sbin/ldconfig -N %{my_libdir}
|
||||
%{?with_hpc:%{hpc_module_delete_if_default}}
|
||||
|
Loading…
Reference in New Issue
Block a user