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

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

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

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
 

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 \