rpms/openmpi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup fortran module install (bug #1154982)

Browse Source
This commit is contained in:
Orion Poplawski 2015-11-05 15:04:37 -07:00
parent e6652b85c0
commit cc576de47a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openmpi.spec
View File

@ -176,7 +176,14 @@ sed 's#@LIBDIR@#%{_libdir}/%{name}#;
# make the rpm config file # make the rpm config file
install -Dpm 644 %{SOURCE4} %{buildroot}/%{macrosdir}/macros.%{namearch} install -Dpm 644 %{SOURCE4} %{buildroot}/%{macrosdir}/macros.%{namearch}
# Link the fortran module to proper location
mkdir -p %{buildroot}/%{_fmoddir}/%{name} mkdir -p %{buildroot}/%{_fmoddir}/%{name}
for mod in %{buildroot}%{_libdir}/%{name}/lib/*.mod
do
modname=$(basename $mod)
ln -s ../../../%{name}/lib/${modname} %{buildroot}/%{_fmoddir}/%{name}/
done
# Remove extraneous wrapper link libraries (bug 814798) # Remove extraneous wrapper link libraries (bug 814798)
sed -i -e s/-ldl// -e s/-lhwloc// \ sed -i -e s/-ldl// -e s/-lhwloc// \
@ -199,7 +206,6 @@ make check
%dir %{_libdir}/%{name}/lib/openmpi %dir %{_libdir}/%{name}/lib/openmpi
%dir %{_mandir}/%{namearch} %dir %{_mandir}/%{namearch}
%dir %{_mandir}/%{namearch}/man* %dir %{_mandir}/%{namearch}/man*
%dir %{_fmoddir}/%{name}
%dir %{python2_sitearch}/%{name} %dir %{python2_sitearch}/%{name}
%{python2_sitearch}/openmpi.pth %{python2_sitearch}/openmpi.pth
%dir %{python3_sitearch}/%{name} %dir %{python3_sitearch}/%{name}
@ -242,6 +248,7 @@ make check
%{_libdir}/%{name}/bin/shmem[cf]* %{_libdir}/%{name}/bin/shmem[cf]*
%{_libdir}/%{name}/bin/vt* %{_libdir}/%{name}/bin/vt*
%{_includedir}/%{namearch}/* %{_includedir}/%{namearch}/*
%{_fmoddir}/%{name}/
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
%{_libdir}/%{name}/lib/lib*.a %{_libdir}/%{name}/lib/lib*.a
%{_libdir}/%{name}/lib/*.mod %{_libdir}/%{name}/lib/*.mod
@ -272,6 +279,7 @@ make check
* Thu Nov 5 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.1-1 * Thu Nov 5 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.1-1
- Update to 1.10.1 - Update to 1.10.1
- Require environment(modules) - Require environment(modules)
- Fixup fortran module install (bug #1154982)
* Tue Oct 6 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-3 * Tue Oct 6 2015 Orion Poplawski <orion@cora.nwra.com> - 1.10.0-3
- Do not set CFLAGS in %%_openmpi_load - Do not set CFLAGS in %%_openmpi_load