- Update to 1.2.4 upstream version

- Build against libtorque
- Pass a valid mode to open
- Resolves: bz189441, bz265141
This commit is contained in:
Doug Ledford 2007-10-17 19:25:14 +00:00
parent ec35c692ff
commit 9f66e543b3
2 changed files with 20 additions and 2 deletions

11
openmpi-1.2.4-open.patch Normal file
View File

@ -0,0 +1,11 @@
--- openmpi-1.2.4/orte/runtime/orte_abort.c.open 2007-10-17 14:47:28.000000000 -0400
+++ openmpi-1.2.4/orte/runtime/orte_abort.c 2007-10-17 14:53:23.000000000 -0400
@@ -88,7 +88,7 @@ int orte_abort(int status, bool report)
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
goto CLEANUP;
}
- fd = open(abort_file, O_CREAT);
+ fd = open(abort_file, O_WRONLY, O_CREAT);
if (0 < fd) close(fd);
}

View File

@ -9,8 +9,9 @@ URL: http://www.open-mpi.org/
Source0: http://www.open-mpi.org/software/ompi/v1.2/downloads/%{name}-%{version}.tar.bz2 Source0: http://www.open-mpi.org/software/ompi/v1.2/downloads/%{name}-%{version}.tar.bz2
Source1: openmpi.pc.in Source1: openmpi.pc.in
Source2: openmpi.module.in Source2: openmpi.module.in
Patch0: openmpi-1.2.4-open.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gcc-gfortran, libtool, numactl-devel, libsysfs-devel BuildRequires: gcc-gfortran, libtool, numactl-devel, libtorque-devel
#BuildRequires: libibverbs-devel, opensm-devel #BuildRequires: libibverbs-devel, opensm-devel
#%ifnarch ppc #%ifnarch ppc
#BuildRequires: dapl-devel #BuildRequires: dapl-devel
@ -28,7 +29,7 @@ Requires(preun): /usr/sbin/alternatives
%package devel %package devel
Summary: Development files for openmpi Summary: Development files for openmpi
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
Provides: mpi-devel Provides: mpi-devel
Requires(post): /usr/sbin/alternatives Requires(post): /usr/sbin/alternatives
Requires(preun): /usr/sbin/alternatives Requires(preun): /usr/sbin/alternatives
@ -107,6 +108,7 @@ Contains development headers and libraries for openmpi
# Kill the stack protection and fortify source stuff...it slows things down # Kill the stack protection and fortify source stuff...it slows things down
# and openmpi hasn't been audited for it yet # and openmpi hasn't been audited for it yet
#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//' | sed -e 's/-fstack-protector//'` #RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=.//' | sed -e 's/-fstack-protector//'`
%patch0 -p1
%ifarch x86_64 %ifarch x86_64
XFLAGS="-fPIC" XFLAGS="-fPIC"
@ -117,6 +119,8 @@ XFLAGS="-fPIC"
--datadir=%{_datadir}/%{mpidir}/help%{mode} \ --datadir=%{_datadir}/%{mpidir}/help%{mode} \
--mandir=%{_datadir}/%{mpidir}/man \ --mandir=%{_datadir}/%{mpidir}/man \
--with-libnuma=%{_libdir} \ --with-libnuma=%{_libdir} \
--with-threads=posix \
--with-tm \
CC=%{opt_cc} \ CC=%{opt_cc} \
LDFLAGS='-Wl,-z,noexecstack' \ LDFLAGS='-Wl,-z,noexecstack' \
CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \ CFLAGS="%{?opt_cc_cflags} $RPM_OPT_FLAGS $XFLAGS" \
@ -265,6 +269,9 @@ alternatives --remove mpicc %{_bindir}/opal_wrapper-%{version}-%{opt_cc}-%{mode}
%changelog %changelog
* Wed Oct 17 2007 Doug Ledford <dledford@redhat.com> - 1.2.4-1 * Wed Oct 17 2007 Doug Ledford <dledford@redhat.com> - 1.2.4-1
- Update to 1.2.4 upstream version - Update to 1.2.4 upstream version
- Build against libtorque
- Pass a valid mode to open
- Resolves: bz189441, bz265141
* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.3-5 * Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.2.3-5
- Rebuild for selinux ppc32 issue. - Rebuild for selinux ppc32 issue.