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

Drop wrapper patch applied upstream

Browse Source
This commit is contained in:
Orion Poplawski 2014-08-26 10:11:36 -06:00
parent d4f746dfc9
commit d8aa7ad4db
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
openmpi-wrapper.patch
View File

@ -1,24 +0,0 @@
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.@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.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=liboshmem.a

4
openmpi.spec
View File

@ -34,9 +34,6 @@ 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 ppc64le don't have valgrind
@ -115,7 +112,6 @@ 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