From 171ee4dfe6d813c4ff247137b8157c5cf65953234713ed880008dbb2bd26ea71 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 27 Feb 2019 20:03:55 +0000 Subject: [PATCH 1/2] 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 --- ...ibplat-mommond_mod-for-parallel-builds.patch | 2 +- mumps.changes | 6 ++++++ mumps.spec | 17 +++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch b/Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch index 436ccd2..1720304 100644 --- a/Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch +++ b/Makefiles-Serialize-libseq-libplat-mommond_mod-for-parallel-builds.patch @@ -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 \ diff --git a/mumps.changes b/mumps.changes index 2caf0a3..8ab2a9c 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 27 18:29:25 UTC 2019 - Egbert Eich + +- 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 diff --git a/mumps.spec b/mumps.spec index 7edf126..8079705 100644 --- a/mumps.spec +++ b/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: 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}} From ee065c804c2340ccf04ca1e47e61cc6037a2c20cf49bd69400ab3dec32e2b461 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 28 Feb 2019 12:54:20 +0000 Subject: [PATCH 2/2] Accepting request 680113 from home:eeich:branches:science - Use -Wl,--whole-archive .. -Wl,--no-whole-archive instead of unpacking static library to build a shared library. - Add dependency to gcc-gfortran to non-HPC build of devel package. OBS-URL: https://build.opensuse.org/request/show/680113 OBS-URL: https://build.opensuse.org/package/show/science/mumps?expand=0&rev=26 --- mumps.changes | 7 +++++++ mumps.spec | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mumps.changes b/mumps.changes index 8ab2a9c..5d24a39 100644 --- a/mumps.changes +++ b/mumps.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 27 22:08:16 UTC 2019 - Egbert Eich + +- Use -Wl,--whole-archive .. -Wl,--no-whole-archive instead of unpacking + static library to build a shared library. +- Add dependency to gcc-gfortran to non-HPC build of devel package. + ------------------------------------------------------------------- Wed Feb 27 18:29:25 UTC 2019 - Egbert Eich diff --git a/mumps.spec b/mumps.spec index 8079705..2beab90 100644 --- a/mumps.spec +++ b/mumps.spec @@ -327,6 +327,7 @@ Requires: blas-devel Requires: lapack-devel %{?with_scotch:Requires: scotch-devel} %endif # mpi +Recommends: gcc-fortran %else # hpc %hpc_requires_devel Requires: libblacs2-%{compiler_family}-%{mpi_family}%{?mpi_ver}-hpc-devel @@ -493,9 +494,9 @@ rm -f *.o; ar -x ../libmumps_common%{?PLAT}.a -lpthread %{MUMPS_LIBF77} -o ../libmumps_common%{?PLAT}.so.%{version} ln -s libmumps_common%{?PLAT}.so.%{version} ../libmumps_common%{?PLAT}.so for ARITH in c d s z ; do - rm -f *.o; ar -x ../lib${ARITH}mumps%{?PLAT}.a - %F_C -shared *.o -Wl,-soname,lib${ARITH}mumps%{?PLAT}.so.%{version} -L.. -lmumps_common%{?PLAT} \ - %{LORDERINGS} %{MUMPS_LIBF77} %{LIBBLAS} %{?SCALAP} -o ../lib${ARITH}mumps%{?PLAT}.so.%{version} + %F_C -shared -Wl,--whole-archive ../lib${ARITH}mumps%{?PLAT}.a -Wl,--no-whole-archive \ + -Wl,-soname,lib${ARITH}mumps%{?PLAT}.so.%{version} -L.. -lmumps_common%{?PLAT} \ + %{LORDERINGS} %{MUMPS_LIBF77} %{LIBBLAS} %{?SCALAP} -o ../lib${ARITH}mumps%{?PLAT}.so.%{version} ln -s lib${ARITH}mumps%{?PLAT}.so.%{version} ../lib${ARITH}mumps%{?PLAT}.so done cd -