SHA256
1
0
forked from pool/mumps

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
This commit is contained in:
Egbert Eich 2019-02-28 12:54:20 +00:00 committed by Git OBS Bridge
parent 171ee4dfe6
commit ee065c804c
2 changed files with 11 additions and 3 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Feb 27 22:08:16 UTC 2019 - Egbert Eich <eich@suse.com>
- 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 <eich@suse.com>

View File

@ -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 -