Skip to content

Commit

Permalink
update of openmpi spec file
Browse files Browse the repository at this point in the history
- switched to newest version 2.1.1
- added --without-lsf configure flag
- added patch to disable lsf support without crashing
- removed invalid --disable-vt flag
  • Loading branch information
philipp committed May 22, 2017
1 parent f82e10c commit fce2afc
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
29 changes: 29 additions & 0 deletions openmpi-2.1.1-disable-lsf-support.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- a/config/orte_check_lsf.m4 2017-05-10 17:40:48.000000000 +0200
+++ b/config/orte_check_lsf.m4 2017-05-22 11:00:48.652372379 +0200
@@ -26,7 +26,7 @@
# ORTE_CHECK_LSF(prefix, [action-if-found], [action-if-not-found])
# --------------------------------------------------------
AC_DEFUN([ORTE_CHECK_LSF],[
- if test -z "$orte_check_lsf_happy" ; then
+ AS_IF([test -z "$orte_check_lsf_happy"],[
AC_ARG_WITH([lsf],
[AC_HELP_STRING([--with-lsf(=DIR)],
[Build LSF support])])
@@ -34,6 +34,7 @@
AC_ARG_WITH([lsf-libdir],
[AC_HELP_STRING([--with-lsf-libdir=DIR],
[Search for LSF libraries in DIR])])
+ AS_IF([test "$with_lsf" != "no"],[
OPAL_CHECK_WITHDIR([lsf-libdir], [$with_lsf_libdir], [libbat.*])

# Defaults
@@ -123,7 +124,8 @@
LIBS="$orte_check_lsf_$1_save_LIBS"

OPAL_SUMMARY_ADD([[Resource Managers]],[[LSF]],[$1],[$orte_check_lsf_happy])
- fi
+ ],[orte_check_lsf_happy=no])
+ ])

AS_IF([test "$orte_check_lsf_happy" = "yes"],
[$1_LIBS="[$]$1_LIBS $orte_check_lsf_LIBS"
8 changes: 5 additions & 3 deletions openmpi.spec
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
### RPM external openmpi 2.1.0
### RPM external openmpi 2.1.1
Source: http://www.open-mpi.org/software/ompi/v2.1/downloads/%{n}-%{realversion}.tar.gz
Patch1: openmpi-2.1.1-disable-lsf-support
BuildRequires: autotools
%prep
%setup -q -n %{n}-%{realversion}

%patch1 -p1
sed -i -e 's|#!/usr/bin/perl|#!/usr/bin/env/perl|' ./opal/asm/generate-asm.pl
sed -i -e 's|#!/usr/bin/perl|#!/usr/bin/env/perl|' opal/asm/generate-all-asm.pl
sed -i -e 's|/usr/bin/perl|/usr/bin/env/perl|' ./Doxyfile
sed -i -e 's|/usr/bin/perl|/usr/bin/env/perl|' ./orte/Doxyfile

./configure --prefix=%i --disable-vt
./configure --prefix=%i --without-lsf

%build
make %{makeprocesses}
Expand Down

0 comments on commit fce2afc

Please sign in to comment.