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

Update to 1.6.1

Browse Source 
Drop hostfile patch applied upstream
This commit is contained in:
Orion Poplawski 2012-08-23 11:00:20 -06:00
parent 80be2406c1
commit db514c3c5f
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ openmpi-1.4.1-RH.tar.bz2
/openmpi-1.5.5-clean.tar.bz2
/openmpi-1.6.tar.bz2
/openmpi-1.6-clean.tar.bz2
/openmpi-1.6.1-clean.tar.xz

12
openmpi-hostfile.patch
View File

@ -1,12 +0,0 @@
diff -up openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile openmpi-1.6/orte/runtime/orte_mca_params.c
--- openmpi-1.6/orte/runtime/orte_mca_params.c.hostfile 2012-04-24 13:18:21.000000000 -0600
+++ openmpi-1.6/orte/runtime/orte_mca_params.c 2012-05-15 16:35:24.769565442 -0600
@@ -225,7 +225,7 @@ int orte_register_params(void)
false, false, 1000, &orte_timeout_usec_per_proc);
/* default hostfile */
- asprintf(&orte_default_hostfile, "%s/etc/openmpi-default-hostfile", opal_install_dirs.prefix);
+ asprintf(&orte_default_hostfile, "%s/openmpi-default-hostfile", opal_install_dirs.sysconfdir);
mca_base_param_reg_string_name("orte", "default_hostfile",
"Name of the default hostfile (relative or absolute path, \"none\" to ignore environmental or default MCA param setting)",
false, false, orte_default_hostfile, &orte_default_hostfile);

21
openmpi.spec
View File

@ -18,8 +18,8 @@
#define _cc_name_suffix -gcc
Name: openmpi%{?_cc_name_suffix}
Version: 1.6
Release: 3%{?dist}
Version: 1.6.1
Release: 1%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD, MIT and Romio
@ -27,16 +27,14 @@ URL: http://www.open-mpi.org/
# We can't use %{name} here because of _cc_name_suffix
#Source0: http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-%{version}.tar.bz2
# openmpi-%{version}-clean.tar.bz2 was generated by taking the upstream tarball
# openmpi-%{version}-clean.tar.xz was generated by taking the upstream tarball
# and removing license-incompatible files:
# rm -r opal/mca/backtrace/darwin/MoreBacktrace
Source0: openmpi-%{version}-clean.tar.bz2
Source0: openmpi-%{version}-clean.tar.xz
Source1: openmpi.module.in
Source2: macros.openmpi
# Patch to handle removed items
Patch0: openmpi-removed.patch
# Patch from upstream svn to fix default hostfile location
Patch1: openmpi-hostfile.patch
BuildRequires: gcc-gfortran, libtool
# ARM HW doesn't support NUMA
@ -117,7 +115,6 @@ Contains development headers and libraries for openmpi
%prep
%setup -q -n openmpi-%{version}
%patch0 -p1 -b .removed
%patch1 -p1 -b .hostfile
# Make sure we don't use the local libltdl library
rm -r opal/libltdl
@ -239,14 +236,18 @@ sed -i -e s/-ldl// -e s/-lhwloc// \
%{_sysconfdir}/rpm/macros.%{namearch}
%changelog
* Thu Aug 23 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.1-1
- Update to 1.6.1
- Drop hostfile patch applied upstream
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.0-2
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6-2
- Add patch from upstream to fix default hostfile location
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.0-1
- Update to 1.6.0
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6-1
- Update to 1.6
- Drop arm patch, appears to be addressed upstream
- Remove extraneous wrapper link libraries (bug 814798)

2
sources
View File

@ -1 +1 @@
ed7575c6f85bb66034831a4756924aa0 openmpi-1.6-clean.tar.bz2
74702e0693ee5b4ba697a04f42db02b1 openmpi-1.6.1-clean.tar.xz