From 348d8c127706873364ddcca35cd44f60c8f41aa933e3767ddd1006cf21f7bcbe Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 13 Jul 2017 08:13:19 +0000 Subject: [PATCH 1/2] Accepting request 510018 from home:NMoreyChaisemartin:branches:science:HPC - Disable rpath in pkgconfig files OBS-URL: https://build.opensuse.org/request/show/510018 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=17 --- mvapich2.changes | 5 +++++ mvapich2.spec | 2 ++ 2 files changed, 7 insertions(+) diff --git a/mvapich2.changes b/mvapich2.changes index 9643585..21a9ca9 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 13 07:54:38 UTC 2017 - nmoreychaisemartin@suse.com + +- Disable rpath in pkgconfig files + ------------------------------------------------------------------- Wed Jul 5 15:12:46 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index 1bde41f..ad2447c 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global flavor @BUILD_FLAVOR@%nil %if "%{flavor}" != "" @@ -126,6 +127,7 @@ cp /usr/share/automake*/config.* . %build #./autogen.sh %configure \ + --disable-wrapper-rpath \ %if "%{flavor}" == "psm" --with-device=ch3:psm \ --with-psm=/usr \ From 76845889a874e7423cc04fbf6f26e38f985df2fee9d12c60376306a00cbd5ae7 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Thu, 13 Jul 2017 15:51:59 +0000 Subject: [PATCH 2/2] Accepting request 510125 from home:NMoreyChaisemartin:branches:science:HPC - Add LD_LIBRARY_PATH to mpivars.sh and mpivars.csh OBS-URL: https://build.opensuse.org/request/show/510125 OBS-URL: https://build.opensuse.org/package/show/science:HPC/mvapich2?expand=0&rev=18 --- mpivars.csh | 6 ++++++ mpivars.sh | 15 +++++++++++++++ mvapich2.changes | 5 +++++ mvapich2.spec | 4 ++-- 4 files changed, 28 insertions(+), 2 deletions(-) diff --git a/mpivars.csh b/mpivars.csh index 4d78e32..5c7f4a3 100644 --- a/mpivars.csh +++ b/mpivars.csh @@ -7,3 +7,9 @@ if ($?MANPATH) then else setenv MANPATH prefix/man: endif + +if ($?LD_LIBRARY_PATH) then + setenv LD_LIBRARY_PATH libdir:$LD_LIBRARY_PATH +else + setenv LD_LIBRARY_PATH libdir +endif diff --git a/mpivars.sh b/mpivars.sh index cc31227..c8317da 100644 --- a/mpivars.sh +++ b/mpivars.sh @@ -13,4 +13,19 @@ case $MANPATH in ;; *) MANPATH=prefix/share/man:$MANPATH + export MANPATH +esac + + +case $LD_LIBRARY_PATH in + *libdir*) + true + ;; + *) + if [ -z "$LD_LIBRARY_PATH" ]; then + LD_LIBRARY_PATH=libdir + else + LD_LIBRARY_PATH="libdir:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH esac diff --git a/mvapich2.changes b/mvapich2.changes index 21a9ca9..c704cce 100644 --- a/mvapich2.changes +++ b/mvapich2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 13 14:59:13 UTC 2017 - nmoreychaisemartin@suse.com + +- Add LD_LIBRARY_PATH to mpivars.sh and mpivars.csh + ------------------------------------------------------------------- Thu Jul 13 07:54:38 UTC 2017 - nmoreychaisemartin@suse.com diff --git a/mvapich2.spec b/mvapich2.spec index ad2447c..2ccb860 100644 --- a/mvapich2.spec +++ b/mvapich2.spec @@ -147,8 +147,8 @@ make V=1 check %install make DESTDIR=%{buildroot} V=1 install # make and install mpivars files -sed 's,prefix,%_prefix,g' %{S:1} > %{buildroot}%{_bindir}/mpivars.sh -sed 's,prefix,%_prefix,g' %{S:2} > %{buildroot}%{_bindir}/mpivars.csh +sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:1} > %{buildroot}%{_bindir}/mpivars.sh +sed -e 's,prefix,%_prefix,g' -e 's,libdir,%{_libdir},g' %{S:2} > %{buildroot}%{_bindir}/mpivars.csh rm -f %{buildroot}%{_libdir}/libfmpich.la \ %{buildroot}%{_libdir}/libmpich.la \ %{buildroot}%{_libdir}/libmpichcxx.la \