rpm/mvapich2
SHA256
1
0
Fork 0
forked from pool/mvapich2
Code Pull Requests Activity

Accepting request 510127 from science:HPC

Browse Source 
- Add LD_LIBRARY_PATH to mpivars.sh and mpivars.csh

- Disable rpath in pkgconfig files

OBS-URL: https://build.opensuse.org/request/show/510127
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mvapich2?expand=0&rev=2
This commit is contained in:
Yuchen Lin 2017-08-10 12:03:05 +00:00 committed by Git OBS Bridge
commit ef9248c738
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mpivars.csh
View File

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

15
mpivars.sh
View File

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

10
mvapich2.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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
- Disable rpath in pkgconfig files
-------------------------------------------------------------------
Wed Jul 5 15:12:46 UTC 2017 - nmoreychaisemartin@suse.com

6
mvapich2.spec
View File

@ -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 \
@ -145,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 \