rpms/mpich
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Move fortran .mod files to %{_fmoddir}/mpich

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2015-11-16 11:24:53 -05:00
parent 20b18894ee
commit 96a9fedebb
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mpich-modules.patch
View File

@ -12,7 +12,7 @@
-setenv exec_prefix @exec_prefix@ -setenv exec_prefix @exec_prefix@
+setenv MPI_BIN @LIBDIR@/bin +setenv MPI_BIN @LIBDIR@/bin
+setenv MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@ +setenv MPI_SYSCONFIG @sysconfdir@/@MPINAME@-@ARCH@
+setenv MPI_FORTRAN_MOD_DIR @includedir@ +setenv MPI_FORTRAN_MOD_DIR @fortranmoddir@/@MPINAME@-@ARCH@
+setenv MPI_INCLUDE @includedir@ +setenv MPI_INCLUDE @includedir@
+setenv MPI_LIB @libdir@ +setenv MPI_LIB @libdir@
+setenv MPI_MAN @mandir@ +setenv MPI_MAN @mandir@

29
mpich.spec
View File

@ -1,7 +1,7 @@
Summary: A high-performance implementation of MPI Summary: A high-performance implementation of MPI
Name: mpich Name: mpich
Version: 3.1.4 Version: 3.1.4
Release: 7%{?dist} Release: 8%{?dist}
License: MIT License: MIT
Group: Development/Libraries Group: Development/Libraries
URL: http://www.mpich.org/ URL: http://www.mpich.org/
@ -162,24 +162,26 @@ sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags} VERBOSE=1 make %{?_smp_mflags} VERBOSE=1
%install %install
make DESTDIR=%{buildroot} install %make_install
#mkdir -p %{buildroot}/%{_fmoddir}/%{name} mkdir -p %{buildroot}/%{_fmoddir}/%{name}
#mv %{buildroot}%{_includedir}/%{name}/*.mod %{buildroot}/%{_fmoddir}/%{name}/ mv %{buildroot}%{_includedir}/%{name}-*/*.mod %{buildroot}/%{_fmoddir}/%{name}/
# Install the module file # Install the module file
mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi mkdir -p %{buildroot}%{_sysconfdir}/modulefiles/mpi
sed 's#%{_bindir}#%{_libdir}/%{name}/bin#; sed -r 's|%{_bindir}|%{_libdir}/%{name}/bin|;
s#@LIBDIR@#%{_libdir}/%{name}#; s|@LIBDIR@|%{_libdir}/%{name}|;
s#@MPINAME@#%{name}#; s|@MPINAME@|%{name}|;
s#@py2sitearch@#%{python2_sitearch}#; s|@py2sitearch@|%{python2_sitearch}|;
s#@py3sitearch@#%{python3_sitearch}#; s|@py3sitearch@|%{python3_sitearch}|;
s#@ARCH@#%{_arch}#' \ s|@ARCH@|%{_arch}|;
s|@fortranmoddir@|%{_fmoddir}|;
' \
<src/packaging/envmods/mpich.module \ <src/packaging/envmods/mpich.module \
>%{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch} >%{buildroot}%{_sysconfdir}/modulefiles/mpi/%{name}-%{_arch}
mkdir -p %{buildroot}%{_sysconfdir}/profile.d mkdir -p %{buildroot}%{_sysconfdir}/profile.d
cat << EOF > %{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh cat >%{buildroot}%{_sysconfdir}/profile.d/mpich-%{_arch}.sh <<EOF
# Load mpich environment module # Load mpich environment module
module load mpi/%{name}-%{_arch} module load mpi/%{name}-%{_arch}
EOF EOF
@ -225,8 +227,8 @@ make check VERBOSE=1
%files devel %files devel
%{_includedir}/%{name}-%{_arch}/ %{_includedir}/%{name}-%{_arch}/
%{_libdir}/%{name}/lib/pkgconfig/ %{_libdir}/%{name}/lib/pkgconfig/
##%%{_fmoddir}/%%{name}/
%{_libdir}/%{name}/lib/*.so %{_libdir}/%{name}/lib/*.so
%{_fmoddir}/%{name}/
%{_rpmconfigdir}/macros.d/macros.%{name} %{_rpmconfigdir}/macros.d/macros.%{name}
%files doc %files doc
@ -235,6 +237,9 @@ make check VERBOSE=1
%{_mandir}/%{name}/man3/ %{_mandir}/%{name}/man3/
%changelog %changelog
* Mon Nov 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 3.1.4-8
- Move fortran .mod files to %%{_fmoddir}/mpich (#1154991)
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-7 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.4-7
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5