[openmpi] Update to 1.7.5
Orion Poplawski
orion at fedoraproject.org
Thu Jul 17 20:35:28 UTC 2014
commit 86b118c39034c105186b1a0d43ceddb5963ed94c
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Thu Jul 17 14:35:52 2014 -0600
Update to 1.7.5
openmpi-wrapper.patch | 24 ++++++++++++++++++++++++
openmpi.spec | 9 ++++++++-
2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/openmpi-wrapper.patch b/openmpi-wrapper.patch
new file mode 100644
index 0000000..224e340
--- /dev/null
+++ b/openmpi-wrapper.patch
@@ -0,0 +1,24 @@
+diff -up openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in.wrapper openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in
+--- openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in.wrapper 2014-07-11 12:11:56.000000000 -0600
++++ openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in 2014-07-17 14:26:03.695430679 -0600
+@@ -29,7 +29,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS
+ # intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
+ # pulled in implicitly) because we intend MPI applications to only use
+ # the MPI API.
+-libs=-loshmem -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
++libs=-loshmem -lmpi
+ libs_static=-loshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+ dyn_lib_file=libsohmem. at OPAL_DYN_LIB_SUFFIX@
+ static_lib_file=liboshmem.a
+diff -up openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in.wrapper openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in
+--- openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in.wrapper 2014-07-11 12:11:56.000000000 -0600
++++ openmpi-1.8.2rc1/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in 2014-07-17 14:23:57.148841562 -0600
+@@ -28,7 +28,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS
+ # intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
+ # etc. are pulled in implicitly) because we intend MPI applications to
+ # only use the SHMEM and MPI APIs.
+-libs=-loshmem -lmpi_mpifh -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
++libs=-loshmem -lmpi_mpifh -lmpi
+ libs_static=-loshmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+ dyn_lib_file=liboshmem. at OPAL_DYN_LIB_SUFFIX@
+ static_lib_file=liboshmem.a
diff --git a/openmpi.spec b/openmpi.spec
index 262392f..9a3c0c2 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -22,7 +22,7 @@
Name: openmpi%{?_cc_name_suffix}
Version: 1.8.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Open Message Passing Interface
Group: Development/Libraries
License: BSD, MIT and Romio
@@ -34,6 +34,9 @@ Source1: openmpi.module.in
Source2: macros.openmpi
# Patch to use system ltdl for tests
Patch1: openmpi-ltdl.patch
+# Fix shmem wrappers from adding extra libs
+# https://svn.open-mpi.org/trac/ompi/ticket/4796
+Patch2: openmpi-wrapper.patch
BuildRequires: gcc-gfortran
#sparc64 and aarch64 don't have valgrind
@@ -112,6 +115,7 @@ Contains development wrapper for compiling Java with openmpi.
%prep
%setup -q -n openmpi-%{version}
%patch1 -p1 -b .ltdl
+%patch2 -p1 -b .wrapper
# Make sure we don't use the local libltdl library
rm -r opal/libltdl
@@ -238,6 +242,9 @@ make check
%changelog
+* Thu Jul 17 2014 Orion Poplawski <orion at cora.nwra.com> 1.8.1-3
+- Add patch to prevent shmem wrappers from adding extra libs
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list