Update to 1.6.0
Drop arm patch, appears to be addressed upstream
This commit is contained in:
parent
cb941ef23f
commit
ee90b8dae5
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ openmpi-1.4.1-RH.tar.bz2
|
|||||||
/openmpi-1.5-RH.tar.bz2
|
/openmpi-1.5-RH.tar.bz2
|
||||||
/openmpi-1.5.4-clean.tar.bz2
|
/openmpi-1.5.4-clean.tar.bz2
|
||||||
/openmpi-1.5.5-clean.tar.bz2
|
/openmpi-1.5.5-clean.tar.bz2
|
||||||
|
/openmpi-1.6.tar.bz2
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
## Description: add some description
|
|
||||||
## Origin/Author: add some origin or author
|
|
||||||
## Bug: bug URL
|
|
||||||
Index: openmpi-1.5.4/configure
|
|
||||||
===================================================================
|
|
||||||
--- openmpi-1.5.4.orig/configure 2011-08-18 16:49:03.000000000 +0300
|
|
||||||
+++ openmpi-1.5.4/configure 2012-01-20 18:12:48.959184193 +0200
|
|
||||||
@@ -26943,7 +26943,7 @@
|
|
||||||
OMPI_GCC_INLINE_ASSIGN='"bis $31,$31,%0" : "=&r"(ret)'
|
|
||||||
;;
|
|
||||||
|
|
||||||
- armv7*)
|
|
||||||
+ arm*)
|
|
||||||
ompi_cv_asm_arch="ARM"
|
|
||||||
OPAL_ASM_SUPPORT_64BIT=1
|
|
||||||
OMPI_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
|
|
12
openmpi.spec
12
openmpi.spec
@ -18,7 +18,7 @@
|
|||||||
#define _cc_name_suffix -gcc
|
#define _cc_name_suffix -gcc
|
||||||
|
|
||||||
Name: openmpi%{?_cc_name_suffix}
|
Name: openmpi%{?_cc_name_suffix}
|
||||||
Version: 1.5.5
|
Version: 1.6
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Open Message Passing Interface
|
Summary: Open Message Passing Interface
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -26,16 +26,15 @@ 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.5/downloads/openmpi-%{version}.tar.bz2
|
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.bz2 was generated by taking the upstream tarball
|
||||||
# and removing license-incompatible files:
|
# and removing license-incompatible files:
|
||||||
# rm -r opal/mca/backtrace/darwin/MoreBacktrace
|
# rm -r opal/mca/backtrace/darwin/MoreBacktrace
|
||||||
Source0: openmpi-%{version}-clean.tar.bz2
|
#Source0: openmpi-%{version}-clean.tar.bz2
|
||||||
Source1: openmpi.module.in
|
Source1: openmpi.module.in
|
||||||
Source2: macros.openmpi
|
Source2: macros.openmpi
|
||||||
# Patch to handle removed items
|
# Patch to handle removed items
|
||||||
Patch0: openmpi-removed.patch
|
Patch0: openmpi-removed.patch
|
||||||
Patch1: configure_arm_fix.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc-gfortran, libtool
|
BuildRequires: gcc-gfortran, libtool
|
||||||
# ARM HW doesn't support NUMA
|
# ARM HW doesn't support NUMA
|
||||||
@ -116,7 +115,6 @@ Contains development headers and libraries for openmpi
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n openmpi-%{version}
|
%setup -q -n openmpi-%{version}
|
||||||
%patch0 -p1 -b .removed
|
%patch0 -p1 -b .removed
|
||||||
%patch1 -p1 -b .arm
|
|
||||||
# Make sure we don't use the local libltdl library
|
# Make sure we don't use the local libltdl library
|
||||||
rm -r opal/libltdl
|
rm -r opal/libltdl
|
||||||
|
|
||||||
@ -233,6 +231,10 @@ mkdir -p %{buildroot}/%{python_sitearch}/openmpi%{?_cc_name_suffix}
|
|||||||
%{_sysconfdir}/rpm/macros.%{namearch}
|
%{_sysconfdir}/rpm/macros.%{namearch}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> 1.6.0-1
|
||||||
|
- Update to 1.6.0
|
||||||
|
- Drop arm patch, appears to be addressed upstream
|
||||||
|
|
||||||
* Tue Apr 3 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.5.5-1
|
* Tue Apr 3 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.5.5-1
|
||||||
- Update to 1.5.5
|
- Update to 1.5.5
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user