From a5c81a712c4df4858cb33960ac087cd06a774d5afabb67d2842985098502ed14 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 31 Jan 2018 08:08:34 +0000 Subject: [PATCH 1/2] Accepting request 571222 from home:eeich:branches:science:HPC - Use macro in mpivars.(c)sh to be independent of changes to the module setup for the compiler (boo#1078364). OBS-URL: https://build.opensuse.org/request/show/571222 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=29 --- mvapich2.changes | 6 ++++++ mvapich2.spec | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mvapich2.changes b/mvapich2.changes index 355e2ba..b838d01 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 30 20:04:01 UTC 2018 - eich@suse.com + +- Use macro in mpivars.(c)sh to be independent of changes to the module + setup for the compiler (boo#1078364). + ------------------------------------------------------------------- Fri Jan 5 19:03:44 UTC 2018 - eich@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index b415202..2d7e421 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -406,9 +406,13 @@ prepend-path MPI_DIR %{hpc_prefix} family "MPI" EOF cat < %{buildroot}/%{p_bindir}/mpivars.sh -module load %{hpc_compiler_family}/%{hpc_cf_full_version} %{hpc_mpi_family}%{?pack_suff}/%{version} +%hpc_setup_compiler +module load %{hpc_mpi_family}%{?pack_suff}/%{version} EOF -ln -s mpivars.sh %{buildroot}/%{p_bindir}/mpivars.csh +sed -e "s/export/setenv/" -e "s/=/ /" \ + %{buildroot}/%{mpi_bindir}/mpivars.sh > \ + %{buildroot}/%{mpi_bindir}/mpivars.csh +mkdir -p %{buildroot}%{_sysconfdir}/rpm %endif # with hpc From 9518fa9a55653372a83db7ecc7aaeda3fb6afb5c82bf3ea036c6ef7c8cfe1ca1 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 31 Jan 2018 10:08:01 +0000 Subject: [PATCH 2/2] Fix path got mpivars OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=30 --- mvapich2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mvapich2.spec b/mvapich2.spec index 2d7e421..df57541 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -410,8 +410,8 @@ cat < %{buildroot}/%{p_bindir}/mpivars.sh module load %{hpc_mpi_family}%{?pack_suff}/%{version} EOF sed -e "s/export/setenv/" -e "s/=/ /" \ - %{buildroot}/%{mpi_bindir}/mpivars.sh > \ - %{buildroot}/%{mpi_bindir}/mpivars.csh + %{buildroot}/%{p_bindir}/mpivars.sh > \ + %{buildroot}/%{p_bindir}/mpivars.csh mkdir -p %{buildroot}%{_sysconfdir}/rpm %endif # with hpc