From 56b81fbd675ac5490f1cfafa173e77363afffb0b Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sat, 7 Feb 2015 12:01:36 -0800 Subject: [PATCH 1/8] Add munge security --- opal/mca/sec/munge/Makefile.am | 38 ++++++++ opal/mca/sec/munge/configure.m4 | 86 ++++++++++++++++++ opal/mca/sec/munge/sec_munge.c | 107 +++++++++++++++++++++++ opal/mca/sec/munge/sec_munge.h | 23 +++++ opal/mca/sec/munge/sec_munge_component.c | 64 ++++++++++++++ 5 files changed, 318 insertions(+) create mode 100644 opal/mca/sec/munge/Makefile.am create mode 100644 opal/mca/sec/munge/configure.m4 create mode 100644 opal/mca/sec/munge/sec_munge.c create mode 100644 opal/mca/sec/munge/sec_munge.h create mode 100644 opal/mca/sec/munge/sec_munge_component.c diff --git a/opal/mca/sec/munge/Makefile.am b/opal/mca/sec/munge/Makefile.am new file mode 100644 index 0000000000..77ee898395 --- /dev/null +++ b/opal/mca/sec/munge/Makefile.am @@ -0,0 +1,38 @@ +# +# Copyright (c) 2015 Intel, Inc. All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +sources = \ + sec_munge.h \ + sec_munge_component.c \ + sec_munge.c + +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). + +if MCA_BUILD_opal_sec_munge_DSO +component_noinst = +component_install = mca_sec_munge.la +else +component_noinst = libmca_sec_munge.la +component_install = +endif + +mcacomponentdir = $(opallibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_sec_munge_la_SOURCES = $(sources) +mca_sec_munge_la_CPPFLAGS = $(sec_munge_CPPFLAGS) +mca_sec_munge_la_LDFLAGS = -module -avoid-version $(sec_munge_LDFLAGS) +mca_sec_munge_la_LIBADD = $(sec_munge_LIBS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_sec_munge_la_SOURCES =$(sources) +libmca_sec_munge_la_CPPFLAGS = $(sec_munge_CPPFLAGS) +libmca_sec_munge_la_LDFLAGS = -module -avoid-version $(sec_munge_LDFLAGS) +libmca_sec_munge_la_LIBADD = $(sec_munge_LIBS) diff --git a/opal/mca/sec/munge/configure.m4 b/opal/mca/sec/munge/configure.m4 new file mode 100644 index 0000000000..ce7057aa54 --- /dev/null +++ b/opal/mca/sec/munge/configure.m4 @@ -0,0 +1,86 @@ +# -*- shell-script -*- +# +# Copyright (c) 2015 Intel, Inc. All rights reserved +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# MCA_sec_munge_CONFIG([action-if-found], [action-if-not-found]) +# -------------------------------------------------------------------- +AC_DEFUN([MCA_opal_sec_munge_CONFIG],[ + AC_CONFIG_FILES([opal/mca/sec/munge/Makefile]) + + OPAL_VAR_SCOPE_PUSH([sec_munge_support sec_munge_dir sec_munge_libdir save_cpp save_ld]) + + AC_ARG_WITH([munge], + [AC_HELP_STRING([--with-munge=DIR], + [Search for munge headers and libraries in DIR ])]) + + AC_ARG_WITH([munge-libdir], + [AC_HELP_STRING([--with-munge-libdir=DIR], + [Search for munge libraries in DIR ])]) + + sec_munge_support=0 + if test "$with_munge" != "no"; then + AC_MSG_CHECKING([for munge in]) + if test ! -z "$with_munge" -a "$with_munge" != "yes"; then + if test -d $with_munge/include/munge; then + sec_munge_dir=$with_munge/include/munge + else + sec_munge_dir=$with_munge + fi + if test -d $with_munge/lib; then + sec_munge_libdir=$with_munge/lib + elif -d $with_munge/lib64; then + sec_munge_libdir=$with_munge/lib64 + else + AC_MSG_RESULT([Could not find $with_munge/lib or $with_munge/lib64]) + AC_MSG_ERROR([Can not continue]) + fi + AC_MSG_RESULT([$sec_munge_dir and $sec_munge_libdir]) + else + AC_MSG_RESULT([(default search paths)]) + sec_munge_dir= + fi + AS_IF([test ! -z "$with_munge_libdir" && test "$with_munge_libdir" != "yes"], + [sec_munge_libdir="$with_munge_libdir"]) + + save_cpp=$CPPFLAGS + save_ld=$LDFLAGS + + OPAL_CHECK_PACKAGE([sec_munge], + [munge.h], + [munge], + [munge_encode], + [-lmunge], + [$sec_munge_dir], + [$sec_munge_libdir], + [sec_munge_support=1], + [sec_munge_support=0]) + + CPPFLAGS=$save_cpp + LDFLAGS=$save_ld + fi + + if test ! -z "$with_munge" && test "$with_munge" != "no" && test "$sec_munge_support" != "1"; then + AC_MSG_WARN([MUNGE SUPPORT REQUESTED AND NOT FOUND.]) + AC_MSG_ERROR([CANNOT CONTINUE]) + fi + + AC_MSG_CHECKING([will munge support be built]) + AS_IF([test "$sec_munge_support" != "1"], + [AC_MSG_RESULT([no]) + $2], + [AC_MSG_RESULT([yes]) + $1]) + + # set build flags to use in makefile + AC_SUBST([sec_munge_CPPFLAGS]) + AC_SUBST([sec_munge_LDFLAGS]) + AC_SUBST([sec_munge_LIBS]) + + OPAL_VAR_SCOPE_POP +])dnl diff --git a/opal/mca/sec/munge/sec_munge.c b/opal/mca/sec/munge/sec_munge.c new file mode 100644 index 0000000000..e97561be82 --- /dev/null +++ b/opal/mca/sec/munge/sec_munge.c @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2015 Intel, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + * + */ + +#include "opal_config.h" +#include "opal/constants.h" + +#ifdef HAVE_STRING_H +#include +#endif +#include + +#include "opal_stdint.h" +#include "opal/dss/dss_types.h" +#include "opal/util/error.h" +#include "opal/util/output.h" +#include "opal/util/show_help.h" +#include "opal/mca/dstore/dstore.h" + +#include "opal/mca/sec/base/base.h" +#include "sec_munge.h" + +static int init(void); +static void finalize(void); +static int get_my_cred(int dstorehandle, + opal_process_name_t *my_id, + opal_sec_cred_t **cred); +static int authenticate(opal_sec_cred_t *cred); + +opal_sec_base_module_t opal_sec_munge_module = { + init, + finalize, + get_my_cred, + authenticate +}; + +static opal_sec_cred_t my_cred; +static bool initialized = false; + +static int init(void) +{ + int rc; + + opal_output_verbose(2, opal_sec_base_framework.framework_output, + "sec: munge init"); + + /* attempt to get a credential as a way of checking that + * the munge server is available - cache the credential + * for later use */ + + if (EMUNGE_SUCCESS != (rc = munge_encode(&my_cred.credential, NULL, NULL, 0))) { + opal_output_verbose(2, opal_sec_base_framework.framework_output, + "sec: munge failed to create credential: %s", + munge_strerror(rc)); + return OPAL_ERR_SERVER_NOT_AVAIL; + } + initialized = true; + + return OPAL_SUCCESS; +} + +static void finalize(void) +{ + if (initialized) { + free(my_cred.credential); + } +} + +static int get_my_cred(int dstorehandle, + opal_process_name_t *my_id, + opal_sec_cred_t **cred) +{ + if (initialized) { + *cred = &my_cred; + } else { + *cred = NULL; + } + + return OPAL_SUCCESS; +} + +static int authenticate(opal_sec_cred_t *cred) +{ + munge_err_t rc; + + opal_output_verbose(2, opal_sec_base_framework.framework_output, + "sec: munge validate_cred %s", cred); + + /* parse the inbound string */ + if (EMUNGE_SUCCESS != (rc = munge_decode(cred->credential, NULL, NULL, NULL, NULL, NULL))) { + opal_output_verbose(2, opal_sec_base_framework.framework_output, + "sec: munge failed to decode credential: %s", + munge_strerror(rc)); + return OPAL_ERR_AUTHENTICATION_FAILED; + } + + opal_output_verbose(2, opal_sec_base_framework.framework_output, + "sec: munge credential valid"); + return OPAL_SUCCESS; +} + diff --git a/opal/mca/sec/munge/sec_munge.h b/opal/mca/sec/munge/sec_munge.h new file mode 100644 index 0000000000..6d3e103b9c --- /dev/null +++ b/opal/mca/sec/munge/sec_munge.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2015 Intel, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#ifndef OPAL_SEC_MUNGE_H +#define OPAL_SEC_MUNGE_H + +#include "opal/mca/sec/sec.h" + +BEGIN_C_DECLS + + +OPAL_MODULE_DECLSPEC extern opal_sec_base_component_t mca_sec_munge_component; +OPAL_DECLSPEC extern opal_sec_base_module_t opal_sec_munge_module; + +END_C_DECLS + +#endif /* OPAL_SEC_MUNGE_H */ diff --git a/opal/mca/sec/munge/sec_munge_component.c b/opal/mca/sec/munge/sec_munge_component.c new file mode 100644 index 0000000000..f29016b2ad --- /dev/null +++ b/opal/mca/sec/munge/sec_munge_component.c @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2015 Intel, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" +#include "opal/constants.h" + +#include "opal/mca/base/base.h" + +#include "opal/mca/sec/sec.h" +#include "sec_munge.h" + +static int sec_munge_component_open(void); +static int sec_munge_component_query(mca_base_module_t **module, int *priority); +static int sec_munge_component_close(void); + +/* + * Instantiate the public struct with all of our public information + * and pointers to our public functions in it + */ +opal_sec_base_component_t mca_sec_munge_component = { + { + OPAL_SEC_BASE_VERSION_1_0_0, + + /* Component name and version */ + "munge", + OPAL_MAJOR_VERSION, + OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION, + + /* Component open and close functions */ + sec_munge_component_open, + sec_munge_component_close, + sec_munge_component_query, + NULL + }, + { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + } +}; + +static int sec_munge_component_open(void) +{ + return OPAL_SUCCESS; +} + +static int sec_munge_component_query(mca_base_module_t **module, int *priority) +{ + *priority = 10; + *module = (mca_base_module_t*)&opal_sec_munge_module; + return OPAL_SUCCESS; +} + + +static int sec_munge_component_close(void) +{ + return OPAL_SUCCESS; +} From 26a828573b102d8d2ae440f923964514fd3c7f8e Mon Sep 17 00:00:00 2001 From: Mike Dubman Date: Sun, 8 Feb 2015 09:05:08 +0200 Subject: [PATCH 2/8] OSHMEM: fix warnings --- oshmem/mca/memheap/base/memheap_base_mkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oshmem/mca/memheap/base/memheap_base_mkey.c b/oshmem/mca/memheap/base/memheap_base_mkey.c index fd7de5aff3..6814f6cdb9 100644 --- a/oshmem/mca/memheap/base/memheap_base_mkey.c +++ b/oshmem/mca/memheap/base/memheap_base_mkey.c @@ -372,7 +372,7 @@ static int oshmem_mkey_recv_cb(void) n = 0; r = (oob_comm_request_t *)opal_list_get_first(&memheap_oob.req_list); assert(r); - while(r != opal_list_get_end(&memheap_oob.req_list)) { + while(r != (oob_comm_request_t *)opal_list_get_end(&memheap_oob.req_list)) { my_MPI_Test(&r->recv_req, &flag, &status); if (OPAL_LIKELY(0 == flag)) { return n; From 883a6e3fdd7d41cbabd9a099108108253dbed221 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Feb 2015 03:18:41 -0800 Subject: [PATCH 3/8] contrib: remove "hg" directory We no longer have the need to support Mercurial since we moved to git. --- contrib/hg/.hgignore | 2 - contrib/hg/build-hgignore.pl | 203 ------------------------------ contrib/hg/set-hg-share-perms.csh | 18 --- 3 files changed, 223 deletions(-) delete mode 100644 contrib/hg/.hgignore delete mode 100755 contrib/hg/build-hgignore.pl delete mode 100755 contrib/hg/set-hg-share-perms.csh diff --git a/contrib/hg/.hgignore b/contrib/hg/.hgignore deleted file mode 100644 index 48143290c5..0000000000 --- a/contrib/hg/.hgignore +++ /dev/null @@ -1,2 +0,0 @@ -syntax: glob -.svn diff --git a/contrib/hg/build-hgignore.pl b/contrib/hg/build-hgignore.pl deleted file mode 100755 index aa40277626..0000000000 --- a/contrib/hg/build-hgignore.pl +++ /dev/null @@ -1,203 +0,0 @@ -#!/usr/bin/env perl -# -# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2014 Intel, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Dumb script to run through all the svn:ignore's in the tree and build -# build a .hgignore file for Mercurial. Do a few trivial things to -# to try to have a few "global" files that don't need to be listed in -# every directory (i.e., reduce the total length of the .hgignore file). - -use strict; - -use Getopt::Long; - -my $verbose_arg = 0; -# Default to writing .hgignore -my $output_arg = ".hgignore"; -my $help_arg = 0; - -&Getopt::Long::Configure("bundling"); -my $ok = Getopt::Long::GetOptions("verbose|v!" => \$verbose_arg, - "output|o=s" => \$output_arg, - "help|h!" => \$help_arg); - -if (!$ok || $help_arg) { - print " -Usage: $0 [-v] [-o output] [-h]\n"; - exit($ok); -} - -print "Writing to: $output_arg\n" - if ($verbose_arg); - -############################################################################# - -print "Thinking...\n" - if (!$verbose_arg); - -my @hgignore; -my @globals; - -# if we are not in an svn repo, then just concatenate -# the .hgignore_global and any .hgignore_local files -# to make the new .hgignore -if (! -d "./.svn") { - print "Not in an svn repo - creating .hgignore from existing files\n" - if ($verbose_arg); - my @files = qw(.hgignore_global .hgignore_local); - - while (@files) { - local $_ = shift @files; - if (-f $_) { - open(IN, $_) || die "Can't open $_"; - print "Reading $_...\n" - if ($verbose_arg); - while () { - chomp; - push(@hgignore, $_); - } - close(IN); - } - } -} else { - # Put in some specials that we ignore everywhere - push(@hgignore, "# Automatically generated by build-hgignore.pl; edits may be lost! -syntax: glob"); - @globals = qw/.libs - .deps - .svn - *.la - *.lo - *.o - *.so - *.a - .dirstamp - *.dSYM - *.S - *.loT - *.orig - *.rej - *.class - *.xcscheme - *.plist - .git* - .mailmap - .DS_Store - stamp-h[1-9] - configure - config.guess - config.sub - config.log - config.status - libtool - ltmain.sh - missing - depcomp - install-sh - aclocal.m4 - autom4te.cache - Makefile - static-components.h - project_list.m4 - orte_wrapper_script - ompi_wrapper_script - make.out - config.out - auto.out - diff.out - *~ - *\\\#/; - - # Start at the top level - process("."); - - # See if there's an .hgignore_local file. If so, add its contents to the end. - if (-f ".hgignore_local") { - print "Reading .hgignore_local...\n" - if ($verbose_arg); - open(IN, ".hgignore_local") || die "Can't open .hgignore_local"; - while () { - chomp; - push(@globals, $_); - } - close(IN); - } -} - -# If there's an old $output_arg file, delete it -unlink($output_arg) - if (-f $output_arg); - -# Write the new one -open(FILE, ">$output_arg"); -print FILE join("\n", @hgignore) . "\n"; -print FILE join("\n", @globals) . "\n"; -close(FILE); - -print "Wrote to $output_arg\n" - if ($verbose_arg); - -# Done! -exit(0); - -####################################################################### - -# DFS-oriented recursive directory search -sub process { - my $dir = shift; - - # Look at the svn:ignore property for this directory - my $svn_ignore = `svn pg svn:ignore $dir 2> /dev/null`; - # If svn failed, bail on this directory. - return - if ($? != 0); - - chomp($svn_ignore); - if ($svn_ignore ne "") { - print "Found svn:ignore in $dir\n" - if ($verbose_arg); - foreach my $line (split(/\n/, $svn_ignore)) { - chomp($line); - $line =~ s/^\.\///; - next - if ($line eq ""); - - # Ensure not to ignore special hg files - next - if ($line eq ".hgignore" || $line eq ".hgrc" || - $line eq ".hg"); - # We're globally ignoring some specials already; we can - # skip those - my $skip = 0; - foreach my $g (@globals) { - if ($g eq $line) { - $skip = 1; - last; - } - } - next - if ($skip); - - push(@hgignore, "$dir/$line"); - } - } - - # Now find subdirectories in this directory - my @entries; - opendir(DIR, $dir) || die "Cannot open directory \"$dir\" for reading: $!"; - @entries = sort(readdir(DIR)); - closedir DIR; - - foreach my $e (@entries) { - # Skip special directories and sym links - next - if ($e eq "." || $e eq ".." || $e eq ".svn" || $e eq ".hg" || - -l "$dir/$e"); - - # If it's a directory, analyze it - process("$dir/$e") - if (-d "$dir/$e"); - } -} diff --git a/contrib/hg/set-hg-share-perms.csh b/contrib/hg/set-hg-share-perms.csh deleted file mode 100755 index 102a8710ab..0000000000 --- a/contrib/hg/set-hg-share-perms.csh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/csh -f - -if (! -d .hg) then - echo "Not in top-level HG repository dir" - exit 1 -endif - -echo Setting group to openmpi... -chgrp -R openmpi . - -echo Setting all files to be group read/writable.... -chmod -R g+rw . - -echo Setting group "rwsx" perms on directories... -find . -type d -exec chmod g=rwsx {} \; - -echo done -exit 0 From db123b357f3fdd080f846712800c737f2d22cd6a Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Feb 2015 08:31:50 -0800 Subject: [PATCH 4/8] distscript.csh: no need to get config.sub|guess from upstream It used to be important to get the latest config.sub and config.guess from upstream because architectures were changing rapidly, and the GNU Autotools released super-slowly. However, architectures have not been changing nearly as fast -- the versions of config.guess and config.sub that ship in the GNU Autotools are fine. So let's stop getting upstream config.guess|sub from upstream as part of "make dist". --- config/distscript.csh | 78 +------------------------------------------ 1 file changed, 1 insertion(+), 77 deletions(-) diff --git a/config/distscript.csh b/config/distscript.csh index daabb3894c..c34525bec2 100644 --- a/config/distscript.csh +++ b/config/distscript.csh @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -83,82 +83,6 @@ echo "*** Updated VERSION file with repo rev number" cd "$distdir" echo "*** Now in distdir: $distdir" -# -# Get the latest config.guess and config.sub from ftp.gnu.org -# - -echo "*** Downloading latest config.sub/config.guess from ftp.gnu.org..." -cd config -set configdir="`pwd`" -mkdir tmp.$$ -cd tmp.$$ -# Official HTTP git mirrors for config.guess / config.sub -wget -t 1 -T 10 -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=master' -wget -t 1 -T 10 -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=master' -chmod +x config.guess config.sub - -# Recently, ftp.gnu.org has had zero-legnth config.guess / config.sub -# files, which causes the automated nightly SVN snapshot tarball to -# fail to be made correctly. This is a primitive attempt to fix that. -# If we got zero-length files from wget, use a config.guess / -# config.sub from a known location that is more recent than what ships -# in the current generation of auto* tools. Also check to ensure that -# the resulting scripts are runnable (Jan 2009: there are un-runnable -# scripts available right now because of some git vulnerability). - -# Before you complain about this too loudly, remember that we're using -# unreleased software... - -set happy=0 -if (! -f config.guess || `test -s config.guess;echo $status`) then - echo " - WARNING: Got bad config.guess from ftp.gnu.org (non-existent or empty)" -else - ./config.guess >& /dev/null - if ($status != 0) then - echo " - WARNING: Got bad config.guess from ftp.gnu.org (not executable)" - else - if (! -f config.sub || `test -s config.sub;echo $status`) then - echo " - WARNING: Got bad config.sub from ftp.gnu.org (non-existent or empty)" - else - ./config.sub `./config.guess` >& /dev/null - if ($status != 0) then - echo " - WARNING: Got bad config.sub from ftp.gnu.org (not executable)" - else - echo " - Got good config.guess and config.sub from ftp.gnu.org" - cp -f config.sub config.guess .. - set happy=1 - endif - endif - endif -endif - -if ("$happy" == "0") then - echo " - WARNING: using included versions for both config.sub and config.guess" -endif -cd .. -rm -rf tmp.$$ -cd .. - - -# -# Find all the config.guess/config.sub files, and replace them with -# the ones that we've downloaded -# - -echo "*** Now in: `pwd`" -echo "*** Replacing config.sub/config.guess with latest from ftp.gnu.org..." -foreach file (config.guess config.sub) - foreach dir (opal orte ompi) - if (-d $dir) then - find $dir -name $file \ - -exec chmod +w {} \; \ - -exec cp -f $configdir/$file {} \; \ - -print - endif - end -end - - # # Put the release version number in the README and INSTALL files # From 139c17a5ef71d92ad6f555720b418ceab81880ee Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Mon, 9 Feb 2015 08:48:24 -0800 Subject: [PATCH 5/8] Fix debug output --- opal/mca/sec/munge/sec_munge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal/mca/sec/munge/sec_munge.c b/opal/mca/sec/munge/sec_munge.c index e97561be82..d54269f160 100644 --- a/opal/mca/sec/munge/sec_munge.c +++ b/opal/mca/sec/munge/sec_munge.c @@ -90,7 +90,7 @@ static int authenticate(opal_sec_cred_t *cred) munge_err_t rc; opal_output_verbose(2, opal_sec_base_framework.framework_output, - "sec: munge validate_cred %s", cred); + "sec: munge validate_cred %s", cred->credential); /* parse the inbound string */ if (EMUNGE_SUCCESS != (rc = munge_decode(cred->credential, NULL, NULL, NULL, NULL, NULL))) { From 98a6664d8a532f6eb48870ee4169a3c0da7ea191 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Feb 2015 11:44:00 -0800 Subject: [PATCH 6/8] configury: --enable-dist ceased being useful long ago The --enable-dist flag is a relic from a prior iteration of the build system. It isn't necessary any more. --- config/ompi_ext.m4 | 5 ++--- config/opal_functions.m4 | 14 +------------- config/opal_mca.m4 | 5 ++--- contrib/dist/make_dist_tarball | 4 ++-- ompi/mca/io/romio/configure.m4 | 5 +---- 5 files changed, 8 insertions(+), 25 deletions(-) mode change 100755 => 100644 contrib/dist/make_dist_tarball diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 8828a13fd5..17240c70a6 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -3,7 +3,7 @@ dnl dnl Copyright (c) 2004-2009 The Trustees of Indiana University and Indiana dnl University Research and Technology dnl Corporation. All rights reserved. -dnl Copyright (c) 2009-2013 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. @@ -361,8 +361,7 @@ AC_DEFUN([EXT_CONFIGURE_M4_CONFIG_COMPONENT],[ EXT_COMPONENT_BUILD_CHECK($1, [should_build=1], [should_build=0]) - # try to configure the component. pay no attention to - # --enable-dist, since we'll always have makefiles. + # try to configure the component m4_ifdef([OMPI_MPIEXT_$1_CONFIG], [], [m4_fatal([Could not find OMPI_MPIEXT_]$1[_CONFIG macro for ]$1[ component])]) diff --git a/config/opal_functions.m4 b/config/opal_functions.m4 index ab1c4dc463..0182a3459c 100644 --- a/config/opal_functions.m4 +++ b/config/opal_functions.m4 @@ -12,7 +12,7 @@ dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2009-2014 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2014 Intel, Inc. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. @@ -163,18 +163,6 @@ case "$prefix" in ;; esac -# Allow the --enable-dist flag to be passed in - -AC_ARG_ENABLE(dist, - AC_HELP_STRING([--enable-dist], - [guarantee that that the "dist" make target will be functional, although may not guarantee that any other make target will be functional.]), - OPAL_WANT_DIST=yes, OPAL_WANT_DIST=no) - -if test "$OPAL_WANT_DIST" = "yes"; then - AC_MSG_WARN([Configuring in 'make dist' mode]) - AC_MSG_WARN([Most make targets may be non-functional!]) -fi - # BEGIN: Derived from GASNet # Suggestion from Paul Hargrove to disable --program-prefix and diff --git a/config/opal_mca.m4 b/config/opal_mca.m4 index 01abaf3725..d1dd836b75 100644 --- a/config/opal_mca.m4 +++ b/config/opal_mca.m4 @@ -10,7 +10,7 @@ dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. -dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ dnl @@ -583,8 +583,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[ [MCA_$1_$2_$3_COMPILE_MODE($1, $2, $3, compile_mode)], [MCA_COMPONENT_COMPILE_MODE($1, $2, $3, compile_mode)]) - # try to configure the component. pay no attention to - # --enable-dist, since we'll always have makefiles. + # try to configure the component m4_ifdef([MCA_$1_$2_$3_CONFIG], [MCA_$1_$2_$3_CONFIG([should_build=$should_build], [should_build=0])], diff --git a/contrib/dist/make_dist_tarball b/contrib/dist/make_dist_tarball old mode 100755 new mode 100644 index 783709d4b3..3d04f42a71 --- a/contrib/dist/make_dist_tarball +++ b/contrib/dist/make_dist_tarball @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2008-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -269,7 +269,7 @@ make_tarball() { # echo "*** Running configure..." rm -f success - (./configure --enable-dist 2>&1 && touch success) | tee config.out + (./configure 2>&1 && touch success) | tee config.out if test ! -f success; then echo "Configure failed. Aborting" exit 1 diff --git a/ompi/mca/io/romio/configure.m4 b/ompi/mca/io/romio/configure.m4 index 7fe78304d0..7f964cdc50 100644 --- a/ompi/mca/io/romio/configure.m4 +++ b/ompi/mca/io/romio/configure.m4 @@ -10,7 +10,7 @@ # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ @@ -21,10 +21,7 @@ # AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [ - AS_IF([test $1 -eq 0 -a "$enable_dist" = "yes"], - [AC_MSG_ERROR([ROMIO disabled but --enable-dist specifed. This will result in a bad tarball. Aborting configure.])]) AM_CONDITIONAL([MCA_io_romio_SHOULD_BUILD], [test $1 -eq 1]) - ]) From 8511902d5c1c307f9ac472b6fae896ccf4ae0da6 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 9 Feb 2015 11:45:54 -0800 Subject: [PATCH 7/8] configury: whitespace cleanup No code changes. --- config/ompi_ext.m4 | 30 ++++++++-------- config/opal_functions.m4 | 22 ++++++------ config/opal_mca.m4 | 62 +++++++++++++++++----------------- configure.ac | 12 +++---- contrib/dist/make_dist_tarball | 14 ++++---- ompi/mca/io/romio/configure.m4 | 18 +++++----- 6 files changed, 79 insertions(+), 79 deletions(-) diff --git a/config/ompi_ext.m4 b/config/ompi_ext.m4 index 17240c70a6..aa798ab3f5 100644 --- a/config/ompi_ext.m4 +++ b/config/ompi_ext.m4 @@ -8,9 +8,9 @@ dnl Copyright (c) 2011-2012 Oak Ridge National Labs. All rights reserved. dnl Copyright (c) 2015 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ -dnl +dnl dnl Additional copyrights may follow -dnl +dnl dnl $HEADER$ dnl @@ -214,7 +214,7 @@ EOF test $OMPI_BUILD_FORTRAN_F08_SUBARRAYS -eq 0], [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=1], [OMPI_BUILD_FORTRAN_USEMPIF08_EXT=0]) - AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT, + AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPIF08_EXT, [test $OMPI_BUILD_FORTRAN_USEMPIF08_EXT -eq 1]) # Make an AM conditional to see whether we're building either the @@ -262,7 +262,7 @@ EOF ############### # Create the final mpif-ext.h file. cat >> $mpif_ext_h <> $mpiusempi_ext_h <> $mpiusempif08_ext_h <@:*) - echo installing to directory \"$prefix\" + echo installing to directory \"$prefix\" ;; - *) - AC_MSG_ERROR(prefix "$prefix" must be an absolute directory path) + *) + AC_MSG_ERROR(prefix "$prefix" must be an absolute directory path) ;; esac diff --git a/config/opal_mca.m4 b/config/opal_mca.m4 index d1dd836b75..1ec342c4ec 100644 --- a/config/opal_mca.m4 +++ b/config/opal_mca.m4 @@ -6,16 +6,16 @@ dnl Corporation. All rights reserved. dnl Copyright (c) 2004-2005 The University of Tennessee and The University dnl of Tennessee Research Foundation. All rights dnl reserved. -dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +dnl Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved. dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved. dnl $COPYRIGHT$ -dnl +dnl dnl Additional copyrights may follow -dnl +dnl dnl $HEADER$ dnl @@ -55,7 +55,7 @@ AC_DEFUN([OPAL_MCA],[ # AC_ARG_ENABLE([mca-no-build], [AC_HELP_STRING([--enable-mca-no-build=LIST], - [Comma-separated list of - pairs + [Comma-separated list of - pairs that will not be built. Example: "--enable-mca-no-build=maffinity,btl-portals" will disable building all maffinity components and the "portals" btl components.])]) AC_ARG_ENABLE(mca-dso, AC_HELP_STRING([--enable-mca-dso=LIST], @@ -221,7 +221,7 @@ AC_DEFUN([OPAL_MCA],[ # now configure all the projects, frameworks, and components. Most # of the hard stuff is in here MCA_PROJECT_SUBDIRS= - m4_foreach(mca_project, [mca_project_list], + m4_foreach(mca_project, [mca_project_list], [# BWB: Until projects have seperate configure scripts # and can skip running all of ORTE, just avoid recursing # into orte sub directory if orte disabled @@ -270,7 +270,7 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[ # MCA_project_FRAMEWORK_LIBS - list of libraries (or variables pointing # to more libraries) that must be included # in the project's main library - m4_ifdef([mca_$1_framework_list], [], + m4_ifdef([mca_$1_framework_list], [], [m4_fatal([Could not find mca_$1_framework_list - please rerun autogen.pl])]) MCA_$1_FRAMEWORKS= @@ -281,7 +281,7 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[ MCA_$1_FRAMEWORK_LIBS= m4_foreach(mca_framework, [mca_$1_framework_list], - [m4_ifval(mca_framework, + [m4_ifval(mca_framework, [dnl common has to go up front m4_if(mca_framework, [common], [MCA_$1_FRAMEWORKS="mca_framework $MCA_$1_FRAMEWORKS" @@ -318,9 +318,9 @@ AC_DEFUN([MCA_CONFIGURE_PROJECT],[ AC_DEFUN([MCA_ORDER_COMPONENT_LIST], [ m4_foreach(mca_component, [mca_$1_$2_m4_config_component_list], [m4_ifval(mca_component, - [m4_ifdef([MCA_]$1[_]$2[_]mca_component[_PRIORITY], [], + [m4_ifdef([MCA_]$1[_]$2[_]mca_component[_PRIORITY], [], [m4_fatal([MCA_$1_$2_]mca_component[_PRIORITY not found, but required.])])])]) - m4_define([component_list], + m4_define([component_list], [esyscmd([config/opal_mca_priority_sort.pl] m4_foreach([mca_component], [mca_$1_$2_m4_config_component_list], [m4_ifval(mca_component, [mca_component ]OPAL_EVAL_ARG([MCA_]$1[_]$2[_]mca_component[_PRIORITY ]))]))]) ]) @@ -352,9 +352,9 @@ AC_DEFUN([MCA_CHECK_IGNORED_PRIORITY], [ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[ opal_show_subsubtitle "Configuring MCA framework $2" - m4_ifdef([mca_$1_$2_no_config_component_list], [], + m4_ifdef([mca_$1_$2_no_config_component_list], [], [m4_fatal([Could not find mca_$1_$2_no_config_component_list - please rerun autogen.pl])]) - m4_ifdef([mca_$1_$2_m4_config_component_list], [], + m4_ifdef([mca_$1_$2_m4_config_component_list], [], [m4_fatal([Could not find mca_$1_$2_m4_config_component_list - please rerun autogen.pl])]) # setup for framework @@ -400,7 +400,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[ # run the configure logic for the no-config components m4_foreach(mca_component, [mca_$1_$2_no_config_component_list], [m4_ifval(mca_component, - [MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, $2, mca_component, + [MCA_CONFIGURE_NO_CONFIG_COMPONENT($1, $2, mca_component, [all_components], [static_components], [dso_components], @@ -421,7 +421,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[ [m4_ifval(mca_component, [m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [AS_IF([test $best_mca_component_priority -gt MCA_$1_$2_]mca_component[_PRIORITY], [components_looking_for_succeed=0])]) - MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component, + MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component, [all_components], [static_components], [dso_components], @@ -497,7 +497,7 @@ EOF rm -f $outfile fi fi - rm -f $outfile.struct $outfile.extern + rm -f $outfile.struct $outfile.extern unset all_components static_components dso_components outfile outfile_real ]) @@ -516,7 +516,7 @@ EOF # # USAGE: # MCA_CONFIGURE_PROJECT(project_name, framework_name, component_name -# all_components_variable, +# all_components_variable, # static_components_variable, # dso_components_variable, # static_ltlibs_variable, @@ -527,7 +527,7 @@ AC_DEFUN([MCA_CONFIGURE_NO_CONFIG_COMPONENT],[ opal_show_subsubsubtitle "MCA component $2:$3 (no configuration)" opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: before, should_build=$8" - MCA_COMPONENT_BUILD_CHECK($1, $2, $3, + MCA_COMPONENT_BUILD_CHECK($1, $2, $3, [should_build=$8], [should_build=0]) MCA_COMPONENT_COMPILE_MODE($1, $2, $3, compile_mode) opal_show_verbose "OPAL_MCA_NO_CONFIG_COMPONENT: after, should_build=$should_build" @@ -561,12 +561,12 @@ AC_DEFUN([MCA_CONFIGURE_NO_CONFIG_COMPONENT],[ # # USAGE: # MCA_CONFIGURE_PROJECT(project_name, framework_name, component_name -# all_components_variable, +# all_components_variable, # static_components_variable, # dso_components_variable, # static_ltlibs_variable, # allowed_to_succeed, -# [eval if should build], +# [eval if should build], # [eval if should not build]) # ###################################################################### @@ -585,7 +585,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[ # try to configure the component m4_ifdef([MCA_$1_$2_$3_CONFIG], - [MCA_$1_$2_$3_CONFIG([should_build=$should_build], + [MCA_$1_$2_$3_CONFIG([should_build=$should_build], [should_build=0])], [m4_fatal([MCA_$1_$2_$3_CONFIG macro not found])]) opal_show_verbose "OPAL_MCA_M4_CONFIG_COMPONENT: after, should_build=$should_build" @@ -600,7 +600,7 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[ [ MCA_$1_$2_$3_POST_CONFIG($should_build)]) # set the AM_CONDITIONAL on how we should build - AS_IF([test "$compile_mode" = "dso"], + AS_IF([test "$compile_mode" = "dso"], [BUILD_$1_$2_$3_DSO=1], [BUILD_$1_$2_$3_DSO=0]) AM_CONDITIONAL(MCA_BUILD_$1_$2_$3_DSO, test "$BUILD_$1_$2_$3_DSO" = "1") @@ -619,9 +619,9 @@ AC_DEFUN([MCA_CONFIGURE_M4_CONFIG_COMPONENT],[ # scripts and should be configured according to the usual rules... # # USAGE: -# MCA_CONFIGURE_ALL_CONFIG_COMPONENTS(project_name, +# MCA_CONFIGURE_ALL_CONFIG_COMPONENTS(project_name, # framework_name, -# all_components_variable, +# all_components_variable, # static_components_variable, # dso_components_variable, # static_ltlibs_variable) @@ -634,7 +634,7 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[ opal_show_subsubsubtitle "MCA component $2:$component (need to configure)" opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: before, should_build=$8" - MCA_COMPONENT_BUILD_CHECK($1, $2, $component, + MCA_COMPONENT_BUILD_CHECK($1, $2, $component, [should_build=1], [should_build=0]) MCA_COMPONENT_COMPILE_MODE($1, $2, $component, compile_mode) opal_show_verbose "OPAL_MCA_ALL_CONFIG_COMPONENTS: after, should_build=$should_build" @@ -735,7 +735,7 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[ AC_REQUIRE([AC_PROG_GREP]) # See if it dropped an output file for us to pick up some - # shell variables in. + # shell variables in. infile="$srcdir/$1/mca/$2/$3/post_configure.sh" # Add this subdir to the mast list of all MCA component subdirs @@ -762,7 +762,7 @@ AC_DEFUN([MCA_PROCESS_COMPONENT],[ # Output pretty results AC_MSG_CHECKING([if MCA component $2:$3 can compile]) AC_MSG_RESULT([yes]) - + dnl BWB: FIX ME: We still use the post_configure.sh for frameworks that use the direct call infrastructure. dnl All other uses we can ignore here, because config_components will have read it in and set all the dnl proper environment variables. At some point, we should handle the direct call stuff the same way we @@ -783,7 +783,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but fi fi else - # were we supposed to have found something in the + # were we supposed to have found something in the # post_configure.sh, but the file didn't exist? if test "$DIRECT_$2" = "$3" ; then AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but @@ -801,7 +801,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but # because it will link against these (without a dependency from # libmpi.so to these flags) if test "$8" = "static"; then - AS_LITERAL_IF([$3], + AS_LITERAL_IF([$3], [m4_foreach(flags, [LDFLAGS, LIBS], [AS_IF([test "$$2_$3_WRAPPER_EXTRA_]flags[" = ""], [OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_]m4_tolower(flags), [$$2_$3_]flags)], @@ -817,10 +817,10 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but # component can never be used in a STOP_AT_FIRST framework, we # don't have to implement the else clause in the literal check... AS_LITERAL_IF([$3], - [AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""], + [AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""], [m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0]) AS_IF([test "$8" = "static" && test "$stop_at_first" = "1"], - [AS_IF([test "$with_devel_headers" = "yes"], + [AS_IF([test "$with_devel_headers" = "yes"], [OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$2_$3_WRAPPER_EXTRA_CPPFLAGS])])], [AC_MSG_WARN([ignoring $2_$3_WRAPPER_EXTRA_CPPFLAGS ($$2_$3_WRAPPER_EXTRA_CPPFLAGS): component conditions not met])])])]) ]) @@ -856,11 +856,11 @@ AC_DEFUN([MCA_PROCESS_DEAD_COMPONENT],[ ]) -# MCA_COMPONENT_BUILD_CHECK(project_name (1), framework_name(2), +# MCA_COMPONENT_BUILD_CHECK(project_name (1), framework_name(2), # component_name (3), action-if-build (4) # action-if-not-build (5) # ----------------------------------------------------------------- -# checks the standard rules of component building to see if the +# checks the standard rules of component building to see if the # given component should be built. # # Note: component_name may not be determined until runtime.... diff --git a/configure.ac b/configure.ac index 305f5459d9..a1a3c4aa27 100644 --- a/configure.ac +++ b/configure.ac @@ -6,11 +6,11 @@ # Copyright (c) 2004-2014 The University of Tennessee and The University # of Tennessee Research Foundation. All rights # reserved. -# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, +# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. -# Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2006-2015 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2006-2011 Los Alamos National Security, LLC. All rights # reserved. @@ -23,9 +23,9 @@ # Copyright (c) 2014-2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ -# +# # Additional copyrights may follow -# +# # $HEADER$ # @@ -110,7 +110,7 @@ m4_ifdef([project_ompi], [ompi/include/ompi/version.h])]) m4_ifdef([project_orte], - [OPAL_SAVE_VERSION([ORTE], [Open MPI Run-Time Environment], + [OPAL_SAVE_VERSION([ORTE], [Open MPI Run-Time Environment], [$srcdir/VERSION], [orte/include/orte/version.h])]) @@ -1369,7 +1369,7 @@ fi # the following in opal_mca.m4 (when we're already m4 looping over the # project list): # -# m4_foreach(mca_project, [mca_project_list], +# m4_foreach(mca_project, [mca_project_list], # [m4_ifdef(mca_project[_CONFIG_LOCAL], mca_project[_CONFIG_LOCAL])]) # # Meaning that aclocal doesn't see that, for example, diff --git a/contrib/dist/make_dist_tarball b/contrib/dist/make_dist_tarball index 3d04f42a71..ad5de7d5a1 100644 --- a/contrib/dist/make_dist_tarball +++ b/contrib/dist/make_dist_tarball @@ -6,15 +6,15 @@ # Copyright (c) 2004-2005 The University of Tennessee and The University # of Tennessee Research Foundation. All rights # reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. # Copyright (c) 2008-2015 Cisco Systems, Inc. All rights reserved. # $COPYRIGHT$ -# +# # Additional copyrights may follow -# +# # $HEADER$ # @@ -132,7 +132,7 @@ check_gnu_version() { target_release=`echo $target_release | sed 's/[A-Za-z]//g'` result=same - if test "$ver" != "$target"; then + if test "$ver" != "$target"; then if test "$ver_major" -lt "$target_major"; then result=low elif test "$ver_major" = "$target_major" -a "$ver_minor" -lt "$target_minor"; then @@ -172,7 +172,7 @@ Either change this script to match the found version, or install the correct version of the tools. ---------------------------------------------------------------------- EOF - if test "$gnu_version_ignore" = "0"; then + if test "$gnu_version_ignore" = "0"; then exit 1 fi @@ -195,7 +195,7 @@ Either change this script to match the found version, or install the correct version of the tools. ---------------------------------------------------------------------- EOF - if test "$gnu_version_ignore" = "0"; then + if test "$gnu_version_ignore" = "0"; then exit 1 fi else @@ -237,7 +237,7 @@ Either change this script to match the found version, or install the correct version of the tools. ---------------------------------------------------------------------- EOF - if test "$gnu_version_ignore" = "0"; then + if test "$gnu_version_ignore" = "0"; then exit 1 fi fi diff --git a/ompi/mca/io/romio/configure.m4 b/ompi/mca/io/romio/configure.m4 index 7f964cdc50..1506addf52 100644 --- a/ompi/mca/io/romio/configure.m4 +++ b/ompi/mca/io/romio/configure.m4 @@ -6,7 +6,7 @@ # Copyright (c) 2004-2005 The University of Tennessee and The University # of Tennessee Research Foundation. All rights # reserved. -# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, # University of Stuttgart. All rights reserved. # Copyright (c) 2004-2005 The Regents of the University of California. # All rights reserved. @@ -14,9 +14,9 @@ # Copyright (c) 2015 Research Organization for Information Science # and Technology (RIST). All rights reserved. # $COPYRIGHT$ -# +# # Additional copyrights may follow -# +# # $HEADER$ # @@ -34,14 +34,14 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[ AC_ARG_ENABLE([io-romio], [AC_HELP_STRING([--disable-io-romio], [Disable the ROMIO MPI-IO component])]) - AC_ARG_WITH([io-romio-flags], + AC_ARG_WITH([io-romio-flags], [AC_HELP_STRING([--with-io-romio-flags=FLAGS], [Pass FLAGS to the ROMIO distribution configuration script])]) AC_DEFINE_UNQUOTED([MCA_io_romio_USER_CONFIGURE_FLAGS], ["$with_io_romio_flags"], [Set of user-defined configure flags given to ROMIOs configure script via --with-io-romio-flags]) AC_MSG_CHECKING([if want ROMIO component]) AS_IF([test "$enable_io_romio" = "no"], [AC_MSG_RESULT([no]) - $2], + $2], [AC_MSG_RESULT([yes]) AC_MSG_CHECKING([if MPI profiling is enabled]) AS_IF([test "$enable_mpi_profile" = "no"], @@ -66,11 +66,11 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[ [AS_IF([test "$enable_shared" = "yes"], [io_romio_shared=enable], [io_romio_shared=disable]) - AS_IF([test "$enable_static" = "yes"], + AS_IF([test "$enable_static" = "yes"], [io_romio_static=enable], [io_romio_static=disable])]) - AS_IF([test -n "$prefix" -a "$prefix" != "NONE"], - [io_romio_prefix_arg="--prefix=$prefix"], + AS_IF([test -n "$prefix" -a "$prefix" != "NONE"], + [io_romio_prefix_arg="--prefix=$prefix"], [io_romio_prefix_arg=]) AS_IF([test "$cross_compiling" = "yes"], @@ -83,7 +83,7 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[ io_romio_flags="$io_romio_flags FROM_OMPI=yes CC="'"'"$CC"'"'" CFLAGS="'"'"$CFLAGS -D__EXTENSIONS__"'"'" CPPFLAGS="'"'"$CPPFLAGS"'"'" FFLAGS="'"'"$FFLAGS"'"'" LDFLAGS="'"'"$LDFLAGS"'"'" --$io_romio_shared-shared --$io_romio_static-static $io_romio_flags $io_romio_prefix_arg --disable-aio --disable-weak-symbols --enable-strict" opal_show_subtitle "Configuring ROMIO distribution" - OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio], + OPAL_CONFIG_SUBDIR([ompi/mca/io/romio/romio], [$io_romio_flags], [io_romio_happy=1], [io_romio_happy=0]) From 7f037c1bca4d16bac44c9135af3623f58bc33ea8 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Mon, 9 Feb 2015 15:51:51 -0800 Subject: [PATCH 8/8] ess/alps: fix compile issue for pgi remote -fi-noident cflag option. Wasn't helping anyway and caused pgi compiles to break. --- orte/mca/ess/alps/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orte/mca/ess/alps/Makefile.am b/orte/mca/ess/alps/Makefile.am index 36d32fd900..9a7720500e 100644 --- a/orte/mca/ess/alps/Makefile.am +++ b/orte/mca/ess/alps/Makefile.am @@ -38,7 +38,7 @@ endif mcacomponentdir = $(ompilibdir) mcacomponent_LTLIBRARIES = $(component_install) mca_ess_alps_la_SOURCES = $(sources) -mca_ess_alps_la_CPPFLAGS = $(ess_alps_CPPFLAGS) -fno-ident +mca_ess_alps_la_CPPFLAGS = $(ess_alps_CPPFLAGS) mca_ess_alps_la_LDFLAGS = -module -avoid-version $(ess_alps_LDFLAGS) mca_ess_alps_la_LIBADD = $(ess_alps_LDFLAGS) \ $(ORTE_TOP_BUILDDIR)/orte/mca/common/alps/lib@ORTE_LIB_PREFIX@mca_common_alps.la