Upgrade to 1.5, set MANPATH in openmpi.module, minor cleanup.

This commit is contained in:
Jay Fenlason 2010-10-18 17:37:46 -04:00
parent a978faa317
commit 19a6b61ce5
4 changed files with 25 additions and 16 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
openmpi-1.4.1-RH.tar.bz2 openmpi-1.4.1-RH.tar.bz2
/openmpi-1.5-RH.tar.bz2

View File

@ -5,6 +5,7 @@
prepend-path PATH @LIBDIR@/bin prepend-path PATH @LIBDIR@/bin
prepend-path LD_LIBRARY_PATH @LIBDIR@/lib prepend-path LD_LIBRARY_PATH @LIBDIR@/lib
prepend-path PYTHONPATH @PYSITEARCH@ prepend-path PYTHONPATH @PYSITEARCH@
prepend-path MANPATH @MANDIR@
setenv MPI_BIN @LIBDIR@/bin setenv MPI_BIN @LIBDIR@/bin
setenv MPI_SYSCONFIG @ETCDIR@ setenv MPI_SYSCONFIG @ETCDIR@
setenv MPI_FORTRAN_MOD_DIR @FMODDIR@ setenv MPI_FORTRAN_MOD_DIR @FMODDIR@

View File

@ -18,18 +18,17 @@
#define _cc_name_suffix -gcc #define _cc_name_suffix -gcc
Name: openmpi%{?_cc_name_suffix} Name: openmpi%{?_cc_name_suffix}
Version: 1.4.1 Version: 1.5
Release: 7%{?dist} Release: 1%{?dist}
Summary: Open Message Passing Interface Summary: Open Message Passing Interface
Group: Development/Libraries Group: Development/Libraries
License: BSD, MIT and Romio License: BSD, MIT and Romio
URL: http://www.open-mpi.org/ URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix # We can't use %{name} here because of _cc_name_suffix
#Source0: http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-%{version}.tar.bz2 #Source0: http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-%{version}.tar.bz2
# openmpi-1.4.1-RH.tar.bz2 was generated by taking the upstream 1.4.1 tarball # openmpi-1.5-RH.tar.bz2 was generated by taking the upstream 1.5 tarball
# and removing license-incompatible (ras_loadleveler_module.c contained # and removing license-incompatible files
# usage requirements that we cannot make our users comply with, and # (MoreDebugging/* is AML but unused in our configuration),
# MoreDebugging/* is AML but unused in our configuration),
# and packaging-guidelines-incompatable (MUST use system versions of libltdl # and packaging-guidelines-incompatable (MUST use system versions of libltdl
# and libplpa, not the (formerly included ones), and also remove the generated # and libplpa, not the (formerly included ones), and also remove the generated
# Makefile.in and configure related files. # Makefile.in and configure related files.
@ -119,11 +118,6 @@ Contains development headers and libraries for openmpi
%setup -q -n openmpi-%{version} %setup -q -n openmpi-%{version}
./autogen.sh ./autogen.sh
# Workaround for rhbz#617766
sed -i \
's|ofc_type_alignment=`eval.*`|ofc_type_alignment=$ac_res|g' \
configure
%build %build
%ifarch x86_64 %ifarch x86_64
XFLAGS="-fPIC" XFLAGS="-fPIC"
@ -154,10 +148,12 @@ make %{?_smp_mflags}
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
rm -fr %{buildroot}%{_libdir}/%{name}/lib/pkgconfig
find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm find %{buildroot}%{_libdir}/%{name}/lib -name \*.la | xargs rm
find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9 find %{buildroot}%{_mandir}/%{namearch} -type f | xargs gzip -9
ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz ln -s mpicc.1.gz %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1.gz
rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1 rm -f %{buildroot}%{_mandir}/%{namearch}/man1/mpiCC.1
rm -f %{buildroot}%{_mandir}/%{namearch}/man1/orteCC.1*
rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz rm -f %{buildroot}%{_libdir}/%{name}/share/vampirtrace/doc/opari/lacsi01.ps.gz
mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n} mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n}
@ -206,8 +202,8 @@ rm -rf %{buildroot}
%dir %{_libdir}/%{name}/share/openmpi %dir %{_libdir}/%{name}/share/openmpi
%{_libdir}/%{name}/share/openmpi/doc %{_libdir}/%{name}/share/openmpi/doc
%{_libdir}/%{name}/share/openmpi/amca-param-sets %{_libdir}/%{name}/share/openmpi/amca-param-sets
%{_libdir}/%{name}/share/openmpi/help* %{_libdir}/%{name}/share/openmpi/help*.txt
%{_libdir}/%{name}/share/openmpi/mca* %{_libdir}/%{name}/share/openmpi/mca-btl-openib-device-params.ini
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
@ -225,11 +221,22 @@ rm -rf %{buildroot}
%{_mandir}/%{namearch}/man3/* %{_mandir}/%{namearch}/man3/*
%{_mandir}/%{namearch}/man7/opal* %{_mandir}/%{namearch}/man7/opal*
%{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp %{_libdir}/%{name}/share/openmpi/openmpi-valgrind.supp
%{_libdir}/%{name}/share/openmpi/mpi* %{_libdir}/%{name}/share/openmpi/mpi*.txt
%{_libdir}/%{name}/share/openmpi/orte*.txt
%{_libdir}/%{name}/share/vampirtrace/* %{_libdir}/%{name}/share/vampirtrace/*
%{_sysconfdir}/rpm/macros.%{namearch} %{_sysconfdir}/rpm/macros.%{namearch}
%changelog %changelog
* Mon Oct 18 2010 Jay Fenlason <fenlason@redhat.com> 1.5-1
- set MANPATH in openmpi module file
- Upgrade to 1.5
- Workaround for rhbz#617766 appears to no longer be needed for 1.5
- remove pkgconfig files in instal
- Remove orteCC.1 dangling symlink
- Adjust the files entries for share/openmpi/help* and share/openmpi/mca*
- Adjust the files entries for share/openmpi/mpi*
- Add files entry for share/openmpi/orte*.txt
* Sat Sep 05 2010 Dennis Gilmore <dennis@ausil.us> - 1.4.1-7 * Sat Sep 05 2010 Dennis Gilmore <dennis@ausil.us> - 1.4.1-7
- disable valgrind support on sparc arches - disable valgrind support on sparc arches

View File

@ -1 +1 @@
0a343ebe72050f6795a132a8d6df876e openmpi-1.4.1-RH.tar.bz2 40b9683299fb20630f2adb818db055b4 openmpi-1.5-RH.tar.bz2