diff -Nru opari2-2.0.5/aclocal.m4 opari2-2.0.6/aclocal.m4 --- opari2-2.0.5/aclocal.m4 2019-07-26 09:16:13.969177055 +0000 +++ opari2-2.0.6/aclocal.m4 2021-02-25 12:51:11.315919773 +0000 @@ -812,15 +812,15 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([vendor/common/build-config/m4/ac_common_package.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_doxygen.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_svn_controlled.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_sys_detection.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_toplevel_args.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_uncrustify.m4]) -m4_include([vendor/common/build-config/m4/ac_scorep_version_and_revision.m4]) -m4_include([vendor/common/build-config/m4/afs_compiler_backend.m4]) -m4_include([vendor/common/build-config/m4/afs_maintainer_mode.m4]) -m4_include([vendor/common/build-config/m4/afs_summary.m4]) -m4_include([vendor/common/build-config/m4/ax_config_subdir.m4]) +m4_include([build-config/common/m4/ac_common_package.m4]) +m4_include([build-config/common/m4/ac_scorep_doxygen.m4]) +m4_include([build-config/common/m4/ac_scorep_git_controlled.m4]) +m4_include([build-config/common/m4/ac_scorep_sys_detection.m4]) +m4_include([build-config/common/m4/ac_scorep_toplevel_args.m4]) +m4_include([build-config/common/m4/ac_scorep_uncrustify.m4]) +m4_include([build-config/common/m4/ac_scorep_version_and_revision.m4]) +m4_include([build-config/common/m4/afs_compiler_backend.m4]) +m4_include([build-config/common/m4/afs_maintainer_mode.m4]) +m4_include([build-config/common/m4/afs_summary.m4]) +m4_include([build-config/common/m4/ax_config_subdir.m4]) m4_include([build-config/m4/opari2_compiler_and_flags.m4]) diff -Nru opari2-2.0.5/build-config/common/common.am opari2-2.0.6/build-config/common/common.am --- opari2-2.0.5/build-config/common/common.am 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/common.am 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,129 @@ +## -*- mode: makefile -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2012, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2012, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2012, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2012, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2012, 2014, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2012, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2012, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file build-config/common/common.am +## Intended to be included by the component's +## build-includes/common.am. Defines "common" entities that all +## components rely on. + + +## AM_CPPFLAGS: The contents of this variable are passed to every compilation +## that invokes the C preprocessor; it is a list of arguments to the +## preprocessor. For instance, -I and -D options should be listed here. +## +## Automake already provides some -I options automatically, in a separate +## variable that is also passed to every compilation that invokes the C +## preprocessor. In particular it generates -I., -I$(srcdir), and a -I +## pointing to the directory holding config.h (if you've used +## AC_CONFIG_HEADERS or AM_CONFIG_HEADER). You can disable the default -I +## options using the nostdinc option. +## +## AM_CPPFLAGS is ignored in preference to a per-executable (or per-library) +## _CPPFLAGS variable if it is defined. So add it if necessary. +## +## -I$(srcdir)/../src: path to config.h; is this really necessary? +AM_CPPFLAGS = -I$(srcdir)/../src + +## Convenience variable, use for referencing sources, e.g. +## foo_SOURCES = $(SRC_ROOT)src/foo/foo.c. For CPPFLAGS use SRC_ROOT_* +## See the note below +SRC_ROOT = ../ + +## Convenience variables, use for referencing include directories, +## e.g. foo_CPPFLAGS = $(AM_CPPFLAGS) -I$(INC_ROOT)src/bar +## Note: we need different convenience variable for SRC and INC +## because they are evaluated at different times. The SRC_ROOT +## variable is evaluated at autoreconf time where it is not +## recommended to use $(srcdir). On the other hand the INC_ROOT +## variable is evaluated during configure. +INC_ROOT = $(srcdir)/../ +PUBLIC_INC_DIR = $(INC_ROOT)include + +# The include path to the common utils headers. +INC_DIR_COMMON_UTILS = $(INC_ROOT)common/utils/include + +## Where to find the Jenkins' hash headers. +INC_DIR_COMMON_HASH = $(INC_ROOT)common/hash + +## Where to find the Jenkins' hash headers. +INC_DIR_COMMON_CUTEST = $(INC_ROOT)common/utils/test/cutest + +## Not really needed but already in use. +LIB_ROOT = + +## Add entities using += to the following primaries/variables in +## local Makefile.inc.ams +bin_PROGRAMS = +noinst_PROGRAMS = +pkglibexec_PROGRAMS = +lib_LTLIBRARIES = +noinst_LTLIBRARIES = +BUILT_SOURCES = +CLEANFILES = +DISTCLEANFILES = +EXTRA_DIST = +check_PROGRAMS = +check_LTLIBRARIES = +PHONY_TARGETS = +INSTALL_DATA_LOCAL_TARGETS = +INSTALL_DATA_HOOK_TARGETS = +UNINSTALL_LOCAL_TARGETS = +dist_bin_SCRIPTS = +pkgdata_DATA = + +## TESTS are handlend differently because of cross-, mpi- and openmp +## environments, see the component specific common.am or Makefile.am +## resp. But we need to define TESTS or else am__tty_colors will not +## get defined which leads to an syntax error in our tests. +TESTS = +XFAIL_TESTS = +# TESTS_ENVIRONMENT = + +.PHONY: $(PHONY_TARGETS) + +## Automatically update the libtool script if it becomes out-of-date. +BUILT_SOURCES += libtool +libtool: $(LIBTOOL_DEPS) + $(SHELL) ./config.status libtool + +## need to have an empty rule here in order to stop recursion. +beautify: + + +## just build all targets specified by check_PROGRAMS and +## check_LTLIBRARIES here, don't traverse into subdirectories +check-build: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) + +DISTCLEANFILES += $(builddir)/config.summary + +# this propagates changes to build-config/common/config-common.h +../src/config-common.h: $(srcdir)/../build-config/common/config-common.h + @$(am__cd) .. && $(MAKE) $(AM_MAKEFLAGS) src/config-common.h diff -Nru opari2-2.0.5/build-config/common/config-common.h opari2-2.0.6/build-config/common/config-common.h --- opari2-2.0.5/build-config/common/config-common.h 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/config-common.h 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,117 @@ +/* + * This file is part of the Score-P software (http://www.score-p.org) + * + * Copyright (c) 2009-2012, + * RWTH Aachen University, Germany + * + * Copyright (c) 2009-2012, + * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + * + * Copyright (c) 2009-2012, 2014, + * Technische Universitaet Dresden, Germany + * + * Copyright (c) 2009-2012, + * University of Oregon, Eugene, USA + * + * Copyright (c) 2009-2012, + * Forschungszentrum Juelich GmbH, Germany + * + * Copyright (c) 2009-2012, + * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + * + * Copyright (c) 2009-2012, + * Technische Universitaet Muenchen, Germany + * + * This software may be modified and distributed under the terms of + * a BSD-style license. See the COPYING file in the package base + * directory for details. + * + */ + +#ifndef CONFIG_COMMON_H +#define CONFIG_COMMON_H + + +/** + * @file config-common.h + * + * @brief This file gets included by config.h (resp. config-frontend.h and + * config-backend.h) and contains supplementary macros to be used with the + * macros in config.h. + * + */ + + +/** + * Conditionally compile on macro values that are either 0 or 1. + * + * E.g. if you have the macro @c HAVE_DECL_MPI_ACCUMULATE that is either 0 or + * 1, you should use #if HAVE(DECL_MPI_ACCUMULATE) in your code + * to conditionally compile if @c HAVE_DECL_MPI_ACCUMULATE is defined to 1. + */ +#define HAVE( H ) ( defined( HAVE_ ## H ) && HAVE_ ## H ) + + +/** + * Use these macros in internal headers to mark symbols as extern "C" + * + * @{ + */ + +#ifdef __cplusplus +# define UTILS_BEGIN_C_DECLS extern "C" { +# define UTILS_END_C_DECLS } +#else +# define UTILS_BEGIN_C_DECLS +# define UTILS_END_C_DECLS +#endif + +/** + * @} + */ + + +/* Macros used by utilities under vendor/common */ + +#define UTILS_STRINGIFY_( x ) #x +#define UTILS_STRINGIFY( x ) UTILS_STRINGIFY_( x ) + +#define UTILS_JOIN_SYMS_( x, y ) x ## y +#define UTILS_JOIN_SYMS( x, y ) UTILS_JOIN_SYMS_( x, y ) + +#define UTILS_JOIN_3SYMS_( x, y, z ) x ## y ## z +#define UTILS_JOIN_3SYMS( x, y, z ) UTILS_JOIN_3SYMS_( x, y, z ) + +#define PACKAGE_MANGLE_name( name ) UTILS_JOIN_SYMS( AFS_PACKAGE_name, _ ## name ) +#define PACKAGE_MANGLE_NAME( name ) UTILS_JOIN_SYMS( AFS_PACKAGE_NAME, _ ## name ) + + +/** + * Macros to fool the linker, so that the named compilation unit will always be + * linked into the library/binary + * @ingroup fool_linker @{ + */ + +/** Use this macro in the top level scope of the compilation unit, which + * should always be linked into the library/binary. + * @param name A unique name of this compilation unit, must be a valid C symbol. + */ +#define UTILS_FOOL_LINKER_DECLARE( name ) \ + bool name ## _fool_linker = false + +/** Use this macro in a function from a compilation unit, which is guaranteed + * to be always linked into an library/binary, so that the named compilation + * unit is also always linked into the library/binary. + * + * @param name The unique name of the compilation unit, must be a valid C symbol. + */ +#define UTILS_FOOL_LINKER( name ) \ + extern bool name ## _fool_linker; \ + name ## _fool_linker = true + +/** + * @} + */ + + +#endif /* CONFIG_COMMON_H */ diff -Nru opari2-2.0.5/build-config/common/generate-config-backend-for-frontend.sh opari2-2.0.6/build-config/common/generate-config-backend-for-frontend.sh --- opari2-2.0.5/build-config/common/generate-config-backend-for-frontend.sh 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/generate-config-backend-for-frontend.sh 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,10 @@ +#! /bin/sh + +# +# Extracts all config header templates from the backend config.h intended +# for the frontend +# + +echo "/* Generated from $1 by $0. */" +echo +LC_ALL=C sed -e '/./{H;$'\!'d;}' -e 'x;/#undef HAVE_BACKEND_/'\!'d' "$1" diff -Nru opari2-2.0.5/build-config/common/generate-library-dependencies-la-object.hpp opari2-2.0.6/build-config/common/generate-library-dependencies-la-object.hpp --- opari2-2.0.5/build-config/common/generate-library-dependencies-la-object.hpp 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/generate-library-dependencies-la-object.hpp 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,114 @@ +#ifndef COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP +#define COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP + +/* + * This file is part of the Score-P software (http://www.score-p.org) + * + * Copyright (c) 2009-2013, + * RWTH Aachen University, Germany + * + * Copyright (c) 2009-2013, + * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + * + * Copyright (c) 2009-2014, + * Technische Universitaet Dresden, Germany + * + * Copyright (c) 2009-2013, + * University of Oregon, Eugene, USA + * + * Copyright (c) 2009-2013, 2017, + * Forschungszentrum Juelich GmbH, Germany + * + * Copyright (c) 2009-2013, + * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + * + * Copyright (c) 2009-2013, + * Technische Universitaet Muenchen, Germany + * + * This software may be modified and distributed under the terms of + * a BSD-style license. See the COPYING file in the package base + * directory for details. + * + */ + + +/** + * @file + */ + +#include +#include + +/** + * Helper struct to represent the content of one .la file. Used in code + * generated by generate-library-dependencies.sh. To make usage easier + * everything is public. + */ +struct la_object +{ + /** + * Empty contructor. Needed to allow copies of STL containers containing this + * class + */ + la_object( void ) + { + } + + /** + * Copy constructor. + */ + la_object( const la_object& source ) + : + m_lib_name( source.m_lib_name ), + m_build_dir( source.m_build_dir ), + m_install_dir( source.m_install_dir ), + m_libs( source.m_libs ), + m_ldflags( source.m_ldflags ), + m_rpath( source.m_rpath ), + m_dependency_las( source.m_dependency_las ) + { + } + + + /** + * Regular constructor. + */ + la_object( const std::string& lib_name, + const std::string& build_dir, + const std::string& install_dir, + const std::deque& libs, + const std::deque& ldflags, + const std::deque& rpaths, + const std::deque& dependency_las ) + : + m_lib_name( lib_name ), + m_build_dir( build_dir ), + m_install_dir( install_dir ), + m_libs( libs ), + m_ldflags( ldflags ), + m_rpath( rpaths ), + m_dependency_las( dependency_las ) + { + } + + /** + * Destructor. + */ + virtual + ~la_object() + { + } + + /** + * Member. + */ + std::string m_lib_name; + std::string m_build_dir; + std::string m_install_dir; + std::deque m_libs; + std::deque m_ldflags; + std::deque m_rpath; + std::deque m_dependency_las; +}; + +#endif /* COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP */ diff -Nru opari2-2.0.5/build-config/common/generate-library-dependencies.sh opari2-2.0.6/build-config/common/generate-library-dependencies.sh --- opari2-2.0.5/build-config/common/generate-library-dependencies.sh 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/generate-library-dependencies.sh 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,211 @@ +#!/bin/sh + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2013, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2013, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2014, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2013, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2013, 2017, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2013, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2013, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file generate_library_dependencies.sh +## +## usage: ./generate_library_dependencies.sh .la [.la] > +## +## see also build-config/generate-library-dependencies-la-object.hpp +## +## Parse given *.la files and recursively all *.la files listed +## in dependency_libs of the given *.la files. Generate a C++ +## representation of the library dependencies and write it +## to stdout. To be used with the -config tools. +## Specify a to distinguish functions generated by +## different script invocations. +## +## Generates a function +## void add_library_dependencies_( std::deque& libs, +## std::deque& ldflags, +## std::deque& rpaths, +## std::deque& dependency_las, +## std::map< std::string, la_object>* la_objects ) +## { +## _dependency_1( libs, ldflags, rpaths, dependency_las, la_objects ); +## _dependency_2( libs, ldflags, rpaths, dependency_las, la_objects ); +## ... +## _dependency_n( libs, ldflags, rpaths, dependency_las, la_objects ); +## } +## to be called by the beneficiary of this generator. +## +## The functions _dependency_ are also generated and work +## on the temporary libs, ldflags, rpaths, and dependency_las to +## fill the provided la_objects map, which will contain the +## entire dependency information indexed by the library +## name. Uses the struct la_object defined in +## generate-library-dependencies-la-object.hpp +## +## An example _dependency_ would look like: +## +## libs.clear(); +## ldflags.clear(); +## rpaths.clear(); +## dependency_las.clear(); +## libs.push_back( "-lbfd" ); +## libs.push_back( "-lpapi" ); +## libs.push_back( "-lm" ); +## ldflags.push_back( "-L/opt/packages/papi/4.1.2.1/lib" ); +## if ( la_objects.find( "libscorep_mpi" ) != la_objects.end() ) +## { +## la_objects[ "libscorep_mpi" ] = +## la_object( "libscorep_mpi", +## "/home/roessel/silc/build/trunk/gcc_openmpi_static_x86-32/build-backend", +## "/home/roessel/silc/build/trunk/gcc_openmpi_static_x86-32/install/lib", +## libs, +## ldflags, +## rpaths, +## dependency_las ); +## } + +set -e + +parse_la () +{ + IFS=${default_ifs} + la_file="$1" + + lib_name=`basename $la_file` + lib_name=${lib_name%.la} + + # change to .la directory + old_pwd=`pwd` + build_dir=`dirname $la_file` + cd "${build_dir}" + build_dir=`pwd` + + # extract information from .la"s libdir (=install_dir) + # later, use @EGREP@ + eval `GREP_OPTIONS= grep -E "^libdir=" "${la_file}"` + install_dir="${libdir}" + + # ignore convenience libraries + if test "x${libdir}" = "x"; then + return + fi + + # extract information from .la"s dependency_libs + eval `GREP_OPTIONS= grep -E "^dependency_libs=" "${la_file}"` + # use @AWK@ + eval `echo ${dependency_libs} | awk ' + { + for (i=1; i<= NF; i++) + { + if (index($i, "-L") == 1) {ldflags = ldflags $i ":"} + else if (index($i, "-R") == 1) {rpath = rpath $i ":"} + else if (index($i, "-l") == 1) {libs = libs $i ":"} + else {dependency_la = dependency_la $i ":"} + } + } + END { + gsub(/:$/, "", ldflags) + gsub(/:$/, "", rpath) + gsub(/:$/, "", libs) + gsub(/:$/, "", dependency_la) + print "ldflags=\"" ldflags "\"; " "rpath=\"" rpath "\"; " "libs=\"" libs "\"; " "dependency_la=\"" dependency_la "\"" + }'` + + # generate output + fct_counter=$(($fct_counter+1)) + fct_name="${tag}_dependency_${fct_counter}" + echo "static" + echo "void ${fct_name}( std::deque& libs, std::deque& ldflags, std::deque& rpaths, std::deque& dependency_las, map< std::string, la_object>* la_objects )" + echo "{" + echo " libs.clear();" + echo " ldflags.clear();" + echo " rpaths.clear();" + echo " dependency_las.clear();" + + IFS=${colon_ifs} + for i in ${libs}; do + printf ' libs.push_back( "%s" );\n' "${i}" + done + + for i in ${ldflags}; do + printf ' ldflags.push_back( "%s" );\n' "${i}" + done + + for i in ${rpath}; do + printf ' rpaths.push_back( "%s" );\n' "${i}" + done + + for i in ${dependency_la}; do + dependency_la_name=`basename ${i}` + dependency_la_name=${dependency_la_name%.la} + printf ' dependency_las.push_back( "%s" );\n' "${dependency_la_name}" + done + + printf ' if ( la_objects->find( "%s" ) == la_objects->end() )\n' "${lib_name}" + echo " {" + printf ' (*la_objects)[ "%s" ] =\n' "${lib_name}" + printf ' la_object( "%s",\n' "${lib_name}" + printf ' "%s",\n' "${build_dir}" + printf ' "%s",\n' "${install_dir}" + echo " libs," + echo " ldflags," + echo " rpaths," + echo " dependency_las );" + echo " }" + echo "}" + echo + + cd "${old_pwd}" + + # call parse_la recursively on all libs in $dependency_la + for i in ${dependency_la}; do + parse_la ${i} + done + + IFS="${default_ifs}" +} + +echo "#include " +echo + +tag=$1 +shift + +fct_counter=0 +default_ifs="${IFS}" +colon_ifs=":" +for i; do + parse_la ${i} +done + +echo "static" +echo "void add_library_dependencies_${tag}( std::deque& libs, std::deque& ldflags, std::deque& rpaths, std::deque& dependency_las, std::map< std::string, la_object>* la_objects )" +echo "{" +# do not use the single-printf trick, if ${fct_counter} == 0, than printf still +# prints the format-specifier once with 0 as the default value for not specified +# arguments +for i in $(seq ${fct_counter}); do + printf " ${tag}_dependency_%d( libs, ldflags, rpaths, dependency_las, la_objects );\n" $i +done +echo "}" diff -Nru opari2-2.0.5/build-config/common/generate-library-version.sh opari2-2.0.6/build-config/common/generate-library-version.sh --- opari2-2.0.5/build-config/common/generate-library-version.sh 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/generate-library-version.sh 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,39 @@ +#! /bin/sh + +# this script expects an input that contains at least three lines specifying +# the library interface version, e.g. +# library.current=1 +# library.revision=2 +# library.age=4 + +format="${2-}" + +current=0 +revision=0 +age=0 + +errormsg= +atexit_error() +{ + if test -n "$errormsg" + then + printf "%s\n" "$errormsg" + fi +} +trap atexit_error EXIT + +errormsg="$(printf "Malformed VERSION file: %s" "$1")" +set -e +eval "$(sed -n -e 's/^library\.// p' "$1")" +errormsg= + +if test -z "$format" +then + printf "%d:%d:%d" "$current" "$revision" "$age" + if test -t 1 + then + printf "\n" + fi +else + eval "$format" +fi diff -Nru opari2-2.0.5/build-config/common/generate-package-version.sh opari2-2.0.6/build-config/common/generate-package-version.sh --- opari2-2.0.5/build-config/common/generate-package-version.sh 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/generate-package-version.sh 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,62 @@ +#! /bin/sh + +# this script expects an input that contains at least these lines specifying +# the package version, e.g. +# package.major=0 +# package.bugfix=0 +# package.suffix= +# The following line is optional: +# package.minor=9 +# Note that these variable definitions must not be preceeded by whitespace. +# If package.minor is omitted, the output will be +# major.bugfix-suffix +# Otherwise, if bugfix != 0, the script outputs +# major.minor.bugfix-suffix +# If bugfix == 0, teh output will be +# major.minor-suffix +# If suffix is not given, the trailing '-' will be omitted. + +format="${2-}" + +major=0 +# if minor is not set in $1, than its the major.bugfix-suffix version scheme +minor= +bugfix=0 +suffix= + +errormsg= +atexit_error() +{ + if test -n "$errormsg" + then + printf "%s\n" "$errormsg" + fi +} +trap atexit_error EXIT + +errormsg="$(printf "Malformed VERSION file: %s" "$1")" +set -e +eval "$(sed -n -e 's/^package\.// p' "$1")" +errormsg= + +if test -z "$format" +then + suffix="${suffix:+-}${suffix}" + if test -z "$minor" + then # major.bugfix scheme, use $bugfix, even if 0 + printf "%d.%d%s" "$major" "$bugfix" "$suffix" + else # major.minor.bugfix scheme, use $bugfix if different from 0 only + if test "$bugfix" -eq 0 + then + printf "%d.%d%s" "$major" "$minor" "$suffix" + else + printf "%d.%d.%d%s" "$major" "$minor" "$bugfix" "$suffix" + fi + fi + if test -t 1 + then + printf "\n" + fi +else + eval "$format" +fi diff -Nru opari2-2.0.5/build-config/common/m4/ac_common_package.m4 opari2-2.0.6/build-config/common/m4/ac_common_package.m4 --- opari2-2.0.5/build-config/common/m4/ac_common_package.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_common_package.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,195 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2012, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2012, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2014, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2012, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2012, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2012, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2012, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file ac_common_package.m4 + +# AFS_PACKAGE_INIT +# ---------------- +# Common AC_DEFINE's and AC_SUBST's for the package based on its name. +# Call this only in the top-level configure.ac, sub-builds should call +# `AFS_PACKAGE_BUILD_INIT`. +# +# List of defined autoconf macros: +# `AFS_PACKAGE_name`:: The tarname of the package in lower case and +# runs of non-alphanumeric characters are converted +# to a single underscore +# `AFS_PACKAGE_NAME`:: The value of AFS_PACKAGE_name in upper case +# `AFS_PACKAGE_TO_TOP`:: Empty +# List of provided automake substitutions: +# `AFS_PACKAGE_name`:: The value of AFS_PACKAGE_name +# `AFS_PACKAGE_NAME`:: The value of AFS_PACKAGE_NAME +# 'afs_srcdir':: Same as $srcdir +# +AC_DEFUN_ONCE([AFS_PACKAGE_INIT], [ + +m4_case([$#], + [0], [], + [1], [m4_ifnblank($1, [m4_fatal([$0: too many arguments: $@])])], + [m4_fatal([$0: too many arguments: $@])])dnl + +m4_pushdef([_afs_package_tmp], + m4_bpatsubst(m4_tolower(AC_PACKAGE_TARNAME), [[^a-z0-9]+], [_]))dnl +AC_SUBST([AFS_PACKAGE_name], _afs_package_tmp) +m4_define([AFS_PACKAGE_name], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +m4_pushdef([_afs_package_tmp], m4_toupper(AC_PACKAGE_TARNAME))dnl +AC_SUBST([AFS_PACKAGE_NAME], _afs_package_tmp) +m4_define([AFS_PACKAGE_NAME], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +dnl May be redefined by AFS_PACKAGE_BUILD_INIT +m4_define([AFS_PACKAGE_TO_TOP], [])dnl + +afs_srcdir=$srcdir +AC_SUBST([afs_srcdir]) +]) + +# AFS_PACKAGE_BUILD_INIT(BUILD-NAME, [TO-TOP]) +# -------------------------------------------- +# Initializes an sub-build configure. It is sufficient to call +# `AFS_PACKAGE_BUILD_INIT`, `AFS_PACKAGE_INIT` will be called automatically. +# +# The relative path to the top-level configure from this configure +# can be specified with TO-TOP, it must contain a trailing slash, +# defaulting to `../`. +# +# List of defined autoconf macros: +# `AFS_PACKAGE_BUILD`:: The normalized name of the build (e.g., 'backend', +# 'MPI backend') +# `AFS_PACKAGE_BUILD_name`:: The build name usable as a symbol in lower case +# (i.e., only alphanumeric characters and underscore, +# e.g., backend, mpi_backend) +# `AFS_PACKAGE_BUILD_NAME`:: The value of AFS_PACKAGE_BUILD_name in upper case +# (e.g., BACKEND, MPI_BACKEND) +# List of provided automake substitutions: +# 'AFS_PACKAGE_BUILD_name' The value of AFS_PACKAGE_BUILD_name +# 'AFS_PACKAGE_BUILD_NAME' The value of AFS_PACKAGE_BUILD_NAME +# `AFS_PACKAGE_TO_TOP`:: The value of TO-TOP +# 'afs_srcdir':: $srcdir joined with AFS_PACKAGE_TO_TOP without +# trailing slash (i.e., full path to the top-level +# source) +# List of provided config header defines: +# `AFS_PACKAGE_BUILD`:: The value of AFS_PACKAGE_BUILD as a string +# constant +# `AFS_PACKAGE_BUILD_name`:: The value of AFS_PACKAGE_BUILD_name +# `AFS_PACKAGE_BUILD_NAME`:: The value of AFS_PACKAGE_BUILD_NAME +# `AFS_PACKAGE_SRCDIR`:: The relative path to the source directory as +# string constant including a trailing slash +# `AFS_PACKAGE_name`:: The value of AFS_PACKAGE_name +# `AFS_PACKAGE_NAME`:: The value of AFS_PACKAGE_NAME +# +AC_DEFUN_ONCE([AFS_PACKAGE_BUILD_INIT], [ +AC_REQUIRE([AFS_PACKAGE_INIT])dnl + +m4_case([$#], + [0], [m4_fatal([$0: missing arguments])], + [1], [m4_ifblank(m4_normalize($1), [m4_fatal([$0: empty BUILD-NAME argument])])], + [2], [m4_ifblank(m4_normalize($1), [m4_fatal([$0: empty BUILD-NAME argument])])], + [m4_fatal([$0: too many arguments: $@])])dnl + +m4_pushdef([_afs_package_tmp], m4_normalize($1))dnl +AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD], "_afs_package_tmp", + [Name of the sub-build.]) +m4_define([AFS_PACKAGE_BUILD], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +dnl Overwrites AFS_PACKAGE_TO_TOP defined in AFS_PACKAGE_INIT. +m4_pushdef([_afs_package_tmp], + m4_bpatsubst(m4_default([$2], [../]), [/+], [/]))dnl +m4_if(m4_substr(_afs_package_tmp, decr(len(_afs_package_tmp))), [/], + [], [m4_fatal([$0: no trailing slash in TO-TOP argument: ]$2)]) +dnl undefine previously defined by AFS_PACKAGE_INIT +m4_undefine([AFS_PACKAGE_TO_TOP]) +AC_SUBST([AFS_PACKAGE_TO_TOP], _afs_package_tmp) +m4_define([AFS_PACKAGE_TO_TOP], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +dnl when building inplace, $srcdir equals ., ignore $srcdir than +dnl AC_SUBST already in AFS_PACKAGE_INIT +AS_CASE([$srcdir], + [.], [afs_srcdir="]AFS_PACKAGE_TO_TOP["], + [afs_srcdir="${srcdir}/]AFS_PACKAGE_TO_TOP["]) +dnl AFS_PACKAGE_SRCDIR still has the trailing slash +AC_DEFINE_UNQUOTED([[AFS_PACKAGE_SRCDIR]], + ["${afs_srcdir}"], [Relative path to the top-level source directory.]) +dnl Now remove the trailing slash +afs_srcdir=${afs_srcdir%/} + +m4_pushdef([_afs_package_tmp], + m4_bpatsubst(m4_tolower(m4_normalize($1)), [[^a-z0-9]+], [_]))dnl +AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD_name], _afs_package_tmp, + [Symbol name of the sub-build in lower case.]) +AC_SUBST([AFS_PACKAGE_BUILD_name], _afs_package_tmp) +m4_define([AFS_PACKAGE_BUILD_name], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +m4_pushdef([_afs_package_tmp], + m4_toupper(AFS_PACKAGE_BUILD_name))dnl +AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp, + [Symbol name of the sub-build in upper case.]) +AC_SUBST([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp) +m4_define([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp)dnl +m4_popdef([_afs_package_tmp])dnl + +AC_DEFINE_UNQUOTED([[AFS_PACKAGE_name]], AFS_PACKAGE_name, + [The package name usable as a symbol in lower case.]) + +AC_DEFINE_UNQUOTED([[AFS_PACKAGE_NAME]], AFS_PACKAGE_NAME, + [The package name usable as a symbol in upper case.]) +]) + +# AC_SCOREP_DEFINE_HAVE(VARIABLE, VALUE[, DESCRIPTION]) +# ------------------------------------------------------ +# Like AC_DEFINE, but prepends the HAVE_ prefix and also defines the +# HAVE_'PACKAGE_BUILD'_ variant, if in a sub configure by utilizing the +# AFS_PACKAGE_BUILD_NAME macro. +# +AC_DEFUN([AC_SCOREP_DEFINE_HAVE], [ +AC_DEFINE([HAVE_]$1, [$2], [$3]) +m4_ifdef([AFS_PACKAGE_BUILD], [ + AC_DEFINE([HAVE_]AFS_PACKAGE_BUILD_NAME[_]$1, [$2], [$3]) +]) +]) + +# AC_SCOREP_COND_HAVE(VARIABLE, CONDITION[, DESCRIPTION[, COND_TRUE[, COND_FALSE]]]) +# -------------------------------------------------- +# Convenience macro to define a AM_CONDITIONAL and always a +# AC_SCOREP_DEFINE_HAVE at once. VARIABLE will be prefixed with HAVE_ +# +AC_DEFUN([AC_SCOREP_COND_HAVE], [ +AM_CONDITIONAL(HAVE_[]$1, [$2]) +AM_COND_IF(HAVE_[]$1, + [AC_SCOREP_DEFINE_HAVE([$1], [1], [$3]) + $4], + [AC_SCOREP_DEFINE_HAVE([$1], [0], [$3]) + $5]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_recursive_eval.m4 opari2-2.0.6/build-config/common/m4/ac_recursive_eval.m4 --- opari2-2.0.5/build-config/common/m4/ac_recursive_eval.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_recursive_eval.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,21 @@ +dnl copied from http://ac-archive.sourceforge.net/adl/relpaths.m4 +dnl @category Misc +dnl @author Alexandre Duret-Lutz +dnl @version 2001-05-25 +dnl @license GPLWithACException + +dnl adl_RECURSIVE_EVAL(VALUE, RESULT) +dnl ================================= +dnl Interpolate the VALUE in loop until it doesn't change, +dnl and set the result to $RESULT. +dnl WARNING: It's easy to get an infinite loop with some unsane input. +AC_DEFUN([adl_RECURSIVE_EVAL], +[_lcl_receval="$1" +$2=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" + _lcl_receval_old='' + while test "[$]_lcl_receval_old" != "[$]_lcl_receval"; do + _lcl_receval_old="[$]_lcl_receval" + eval _lcl_receval="\"[$]_lcl_receval\"" + done + echo "[$]_lcl_receval")`]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_c99.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_c99.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_c99.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_c99.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,248 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2011, 2014, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + + +## file ac_scorep_c99.m4 +## This file contains a modified versions of the following +## autoconf's 2.69 macros: +## +## AC_PROG_CC_C99 (renamed to AC_SCOREP_PROG_CC_C99): +## In SCOREP we don't want to use the GNU option -std=gnu99 +## (but -std=c99 instead) as this prevents some warnings that +## may cause portability issues. +## +## Please find the autoconf licence below. +## +## + + +# This file is part of Autoconf. -*- Autoconf -*- +# Programming languages support. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. + +# This file is part of Autoconf. This program is free +# software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# Under Section 7 of GPL version 3, you are granted additional +# permissions described in the Autoconf Configure Script Exception, +# version 3.0, as published by the Free Software Foundation. +# +# You should have received a copy of the GNU General Public License +# and a copy of the Autoconf Configure Script Exception along with +# this program; see the files COPYINGv3 and COPYING.EXCEPTION +# respectively. If not, see . + +# Written by David MacKenzie, with help from +# Akim Demaille, Paul Eggert, +# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, +# Roland McGrath, Noah Friedman, david d zuhn, and many others. + + +# AC_SCOREP_PROG_CC_C99 +# -------------- +AC_DEFUN([AC_SCOREP_PROG_CC_C99], +[ AC_REQUIRE([AC_PROG_CC])dnl + _AC_SCOREP_PROG_CC_C99([$1], [$2]) +]) + + +# _AC_SCOREP_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) +# ---------------------------------------------------------------- +# If the C compiler is not in ISO C99 mode by default, try to add an +# option to output variable CC to make it so. This macro tries +# various options that select ISO C99 on some system or another. It +# considers the compiler to be in ISO C99 mode if it handles _Bool, +# // comments, flexible array members, inline, long long int, mixed +# code and declarations, named initialization of structs, restrict, +# va_copy, varargs macros, variable declarations in for loops and +# variable length arrays. +AC_DEFUN([_AC_SCOREP_PROG_CC_C99], +[_AC_C_STD_TRY([c99], +[[#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} +]], +[[ + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); +]], +dnl Try +dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) +dnl AIX -qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99) +dnl HP cc -AC99 +dnl Intel ICC -std=c99, -c99 (deprecated) +dnl IRIX -c99 +dnl Solaris -D_STDC_C99= +dnl cc's -xc99 option uses linker magic to define the external +dnl symbol __xpg4 as if by "int __xpg4 = 1;", which enables C99 +dnl behavior for C library functions. This is not wanted here, +dnl because it means that a single module compiled with -xc99 +dnl alters C runtime behavior for the entire program, not for +dnl just the module. Instead, define the (private) symbol +dnl _STDC_C99, which suppresses a bogus failure in . +dnl The resulting compiler passes the test case here, and that's +dnl good enough. For more, please see the thread starting at: +dnl http://lists.gnu.org/archive/html/autoconf/2010-12/msg00059.html +dnl Tru64 -c99 +dnl NEC SX -Kc99 +dnl with extended modes being tried first. +[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -Kc99]], [$1], [$2])[]dnl +])# _AC_SCOREP_PROG_CC_C99 diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_compiler_and_flags.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_compiler_and_flags.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_compiler_and_flags.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_compiler_and_flags.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,319 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2011, 2014, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2014, 2017, 2020, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file ac_scorep_compiler_and_flags.m4 + + +AC_DEFUN([AC_SCOREP_CONVERT_FOR_BUILD_FLAGS], +[ +if test "x${ac_cv_env_[$1]_FOR_BUILD_set}" != "xset"; then + # don't use the default flags if nothing is specified for the frontend + unset [$1] +else + # use the FOR_BUILD flags + [$1]="$ac_cv_env_[$1]_FOR_BUILD_value" +fi +]) + +AC_DEFUN([AC_SCOREP_CONVERT_MPI_FLAGS], +[ +if test "x${ac_cv_env_MPI_[$1]_set}" != "xset"; then + # don't use the default flags if nothing is specified for MPI + unset [$1] +else + # use the MPI flags + [$1]="$ac_cv_env_MPI_[$1]_value" +fi +]) + +AC_DEFUN([AC_SCOREP_CHECK_COMPILER_VAR_SET], +[ +if test "x${ac_cv_env_[$1]_set}" != "xset"; then + AC_MSG_ERROR([argument $1 not provided in configure call.], [1]) +fi +]) + + +AC_DEFUN([AC_SCOREP_CONVERT_FOR_BUILD_COMPILER], +[ +if test "x${ac_cv_env_[$1]_FOR_BUILD_set}" != "xset"; then + # don't use the default compiler if nothing is specified for the frontend + unset [$1] +else + [$1]="$ac_cv_env_[$1]_FOR_BUILD_value" +fi +]) + +AC_DEFUN([AC_SCOREP_CONVERT_MPI_COMPILER], +[ +if test "x${ac_cv_env_MPI[$1]_set}" != "xset"; then + # don't use the default compiler if nothing is specified for MPI + unset [$1] +else + [$1]="$ac_cv_env_MPI[$1]_value" +fi +]) + + +dnl do not use together with AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE +AC_DEFUN([AC_SCOREP_WITH_COMPILER_SUITE], +[ +AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) + +ac_scorep_compilers_frontend="platform-frontend-${ac_scorep_platform}" +ac_scorep_compilers_backend="platform-backend-${ac_scorep_platform}" +# ac_scorep_compilers_mpi set in AC_SCOREP_WITH_MPI_COMPILER_SUITE + +m4_pattern_allow([AC_SCOREP_WITH_COMPILER_SUITE]) +m4_pattern_allow([AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE]) +AS_IF([test "x${ac_scorep_compiler_suite_called}" != "x"], + [AC_MSG_ERROR([cannot use [AC_SCOREP_WITH_COMPILER_SUITE] and [AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE] in one configure.ac.])], + [ac_scorep_compiler_suite_called="yes"]) + +AC_ARG_WITH([nocross-compiler-suite], + [AS_HELP_STRING([--with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio|clang|aocc)], + [The compiler suite used to build this package in non cross-compiling environments. Needs to be in $PATH [gcc].])], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno"], + [ac_scorep_compilers_backend="compiler-nocross-gcc" # default + AS_CASE([$withval], + ["gcc"], [ac_scorep_compilers_backend="compiler-nocross-gcc"], + ["ibm"], [ac_scorep_compilers_backend="compiler-nocross-ibm"], + ["intel"], [ac_scorep_compilers_backend="compiler-nocross-intel"], + ["pgi"], [ac_scorep_compilers_backend="compiler-nocross-pgi"], + ["studio"], [ac_scorep_compilers_backend="compiler-nocross-studio"], + ["clang"], [ac_scorep_compilers_backend="compiler-nocross-clang"], + ["aocc"], [ac_scorep_compilers_backend="compiler-nocross-aocc"], + ["no"], [AC_MSG_ERROR([option --without-nocross-compiler-suite makes no sense.])], + [AC_MSG_ERROR([compiler suite "${withval}" not supported by --with-nocross-compiler-suite.])])], + [AC_MSG_WARN([option --with-nocross-compiler-suite ignored in cross-compiling mode. You may use --with-frontend-compiler-suite to customize the frontend compiler.])])]) +AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_backend}"], + [ac_scorep_compilers_backend="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_backend}"], + [ac_scorep_compilers_backend="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_backend}"]) + + +AC_ARG_WITH([frontend-compiler-suite], + [AS_HELP_STRING([--with-frontend-compiler-suite=(gcc|ibm|intel|pgi|studio|clang|aocc)], + [The compiler suite used to build the frontend parts of this package in cross-compiling environments. Needs to be in $PATH [gcc].])], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes"], + [ac_scorep_compilers_frontend="compiler-frontend-gcc" + AS_CASE([$withval], + ["gcc"], [ac_scorep_compilers_frontend="compiler-frontend-gcc"], + ["ibm"], [ac_scorep_compilers_frontend="compiler-frontend-ibm"], + ["intel"], [ac_scorep_compilers_frontend="compiler-frontend-intel"], + ["pgi"], [ac_scorep_compilers_frontend="compiler-frontend-pgi"], + ["studio"], [ac_scorep_compilers_frontend="compiler-frontend-studio"], + ["clang"], [ac_scorep_compilers_frontend="compiler-frontend-clang"], + ["aocc"], [ac_scorep_compilers_frontend="compiler-frontend-aocc"], + ["no"], [AC_MSG_ERROR([option --without-frontend-compiler-suite makes no sense.])], + [AC_MSG_ERROR([compiler suite "${withval}" not supported by --with-frontend-compiler-suite.])])], + [AC_MSG_ERROR([Option --with-frontend-compiler-suite not supported in non cross-compiling mode. Please use --with-nocross-compiler-suite instead.])])]) +AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_frontend}"], + [ac_scorep_compilers_frontend="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_frontend}"], + [ac_scorep_compilers_frontend="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_frontend}"]) +])# AC_SCOREP_WITH_COMPILER_SUITE + + +AC_DEFUN([AC_SCOREP_WITH_MPI_COMPILER_SUITE], +[ +AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) + +scorep_mpi_user_disabled="no" +AC_ARG_WITH([mpi], + [AS_HELP_STRING([--with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intel3|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|openmpi3|platform|scali|sgimpt|sgimptwrapper|spectrum|sun)], + [The MPI compiler suite to build this package in non cross-compiling mode. Usually autodetected. Needs to be in $PATH.])], + [AS_IF([test "x${withval}" = xno], + [scorep_mpi_user_disabled=yes + ac_scorep_compilers_mpi="compiler-mpi-without" + ], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], + [AS_CASE([$withval], + ["bullxmpi"], [ac_scorep_compilers_mpi="compiler-mpi-bullxmpi"], + ["hp"], [ac_scorep_compilers_mpi="compiler-mpi-hp"], + ["ibmpoe"], [ac_scorep_compilers_mpi="compiler-mpi-ibmpoe"], + ["intel"], [ac_scorep_compilers_mpi="compiler-mpi-intel"], + ["intel2"], [ac_scorep_compilers_mpi="compiler-mpi-intel2"], + ["intel3"], [ac_scorep_compilers_mpi="compiler-mpi-intel3"], + ["impi"], [AC_MSG_WARN([option 'impi' to --with-mpi deprecated, use 'intel2' instead.]) + ac_scorep_compilers_mpi="compiler-mpi-intel2"], + ["intelpoe"], [ac_scorep_compilers_mpi="compiler-mpi-intelpoe"], + ["lam"], [ac_scorep_compilers_mpi="compiler-mpi-lam"], + ["mpibull2"], [ac_scorep_compilers_mpi="compiler-mpi-mpibull2"], + ["mpich"], [ac_scorep_compilers_mpi="compiler-mpi-mpich"], + ["mpich2"], [ac_scorep_compilers_mpi="compiler-mpi-mpich2"], + ["mpich3"], [ac_scorep_compilers_mpi="compiler-mpi-mpich3"], + ["openmpi"], [ac_scorep_compilers_mpi="compiler-mpi-openmpi"], + ["openmpi3"], [ac_scorep_compilers_mpi="compiler-mpi-openmpi3"], + ["platform"], [ac_scorep_compilers_mpi="compiler-mpi-platform"], + ["scali"], [ac_scorep_compilers_mpi="compiler-mpi-scali"], + ["sgimpt"], [ac_scorep_compilers_mpi="compiler-mpi-sgimpt"], + ["sgimptwrapper"], [ac_scorep_compilers_mpi="compiler-mpi-sgimptwrapper"], + ["spectrum"], [ac_scorep_compilers_mpi="compiler-mpi-spectrum"], + ["sun"], [ac_scorep_compilers_mpi="compiler-mpi-sun"], + [AC_MSG_ERROR([MPI compiler suite "${withval}" not supported by --with-mpi.])]) + ], + [AC_MSG_ERROR([Option --with-mpi ignored on cross-compiling platforms. MPI compiler suite automatically selected.]) + ]) + ]) + # omit check "if in PATH" for now. Will fail in build-mpi configure. + ], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], + [AFS_COMPILER_MPI + ac_scorep_compilers_mpi="compiler-mpi-${afs_compiler_mpi}"]) + ]) + +AS_IF([test "x${scorep_mpi_user_disabled}" = xno], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes" || test "x${ac_scorep_platform}" = "xaix"], + [ac_scorep_compilers_mpi="platform-mpi-${ac_scorep_platform}"])]) + +AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_mpi}"], + [ac_scorep_compilers_mpi="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_mpi}"], + [ac_scorep_compilers_mpi="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_mpi}"]) +# sanity checks missing +])# AC_SCOREP_WITH_MPI_COMPILER_SUITE + + +AC_DEFUN([AC_SCOREP_PRECIOUS_VARS_MPI], +[ +AC_ARG_VAR(MPICC,[MPI C compiler command]) +AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) +AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command]) +AC_ARG_VAR(MPIFC,[MPI Fortran compiler command]) +AC_ARG_VAR(MPI_CPPFLAGS, [MPI (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) +AC_ARG_VAR(MPI_CFLAGS, [MPI C compiler flags]) +AC_ARG_VAR(MPI_CXXFLAGS, [MPI C++ compiler flags]) +AC_ARG_VAR(MPI_FFLAGS, [MPI Fortran 77 compiler flags]) +AC_ARG_VAR(MPI_FCFLAGS, [MPI Fortran compiler flags]) +AC_ARG_VAR(MPI_LDFLAGS, [MPI linker flags, e.g. -L if you have libraries in a nonstandard directory ]) +AC_ARG_VAR(MPI_LIBS, [MPI libraries to pass to the linker, e.g. -l]) +]) + +AC_DEFUN([AC_SCOREP_PRECIOUS_VARS_FOR_BUILD], +[ +AC_ARG_VAR(CC_FOR_BUILD, [C compiler command for the frontend build]) +AC_ARG_VAR(CXX_FOR_BUILD, [C++ compiler command for the frontend build]) +AC_ARG_VAR(F77_FOR_BUILD, [Fortran 77 compiler command for the frontend build]) +AC_ARG_VAR(FC_FOR_BUILD, [Fortran compiler command for the frontend build]) +AC_ARG_VAR(CPPFLAGS_FOR_BUILD, [(Objective) C/C++ preprocessor flags for the frontend build, e.g. -I if you have headers in a nonstandard directory ]) +AC_ARG_VAR(CFLAGS_FOR_BUILD, [C compiler flags for the frontend build]) +AC_ARG_VAR(CXXFLAGS_FOR_BUILD, [C++ compiler flags for the frontend build]) +AC_ARG_VAR(FFLAGS_FOR_BUILD, [Fortran 77 compiler flags for the frontend build]) +AC_ARG_VAR(FCFLAGS_FOR_BUILD, [Fortran compiler flags for the frontend build]) +AC_ARG_VAR(LDFLAGS_FOR_BUILD, [linker flags for the frontend build, e.g. -L if you have libraries in a nonstandard directory ]) +AC_ARG_VAR(LIBS_FOR_BUILD, [libraries to pass to the linker for the frontend build, e.g. -l]) +]) + + +dnl -------------------------------------------------------------------- + + +AC_DEFUN([AFS_WITH_SHMEM_COMPILER_SUITE], +[ +AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) + +scorep_shmem_user_disabled="no" +AC_ARG_WITH([shmem], + [AS_HELP_STRING([--with-shmem=(openshmem|openmpi|openmpi3|sgimpt|sgimptwrapper|spectrum)], + [The SHMEM compiler suite to build this package in non cross-compiling mode. Usually autodetected. Needs to be in $PATH.])], + [AS_IF([test "x${withval}" = xno], + [scorep_shmem_user_disabled=yes + ac_scorep_compilers_shmem="compiler-shmem-without" + ], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], + [AS_CASE([$withval], + ["openshmem"], [ac_scorep_compilers_shmem="compiler-shmem-openshmem"], + ["openmpi"], [ac_scorep_compilers_shmem="compiler-shmem-openmpi"], + ["openmpi3"], [ac_scorep_compilers_shmem="compiler-shmem-openmpi3"], + ["sgimpt"], [ac_scorep_compilers_shmem="compiler-shmem-sgimpt"], + ["sgimptwrapper"], [ac_scorep_compilers_shmem="compiler-shmem-sgimptwrapper"], + ["spectrum"], [ac_scorep_compilers_shmem="compiler-shmem-spectrum"], + [AC_MSG_ERROR([SHMEM compiler suite "${withval}" not supported by --with-shmem.])]) + ], + [AC_MSG_ERROR([Option --with-shmem ignored on cross-compiling platforms. SHMEM compiler suite automatically selected.]) + ]) + ]) + # omit check "if in PATH" for now. + ], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], + [AFS_COMPILER_SHMEM + ac_scorep_compilers_shmem="compiler-shmem-${afs_compiler_shmem}"]) + ]) + +AS_IF([test "x${scorep_shmem_user_disabled}" = xno], + [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes"], + [AS_CASE([${ac_scorep_platform}], + [cray*], + [ac_scorep_compilers_shmem="platform-shmem-${ac_scorep_platform}"], + [ac_scorep_compilers_shmem=""])])]) + +AS_IF([test "x${ac_scorep_compilers_shmem}" != "x" && test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_shmem}"], + [ac_scorep_compilers_shmem="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_shmem}"], + [ac_scorep_compilers_shmem="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_shmem}"]) +# sanity checks missing +])# AFS_WITH_SHMEM_COMPILER_SUITE + + +AC_DEFUN([AFS_PRECIOUS_VARS_SHMEM], +[ +AC_ARG_VAR(SHMEMCC,[SHMEM C compiler command]) +AC_ARG_VAR(SHMEMCXX,[SHMEM C++ compiler command]) +AC_ARG_VAR(SHMEMF77,[SHMEM Fortran 77 compiler command]) +AC_ARG_VAR(SHMEMFC,[SHMEM Fortran compiler command]) +AC_ARG_VAR(SHMEM_CPPFLAGS, [SHMEM (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) +AC_ARG_VAR(SHMEM_CFLAGS, [SHMEM C compiler flags]) +AC_ARG_VAR(SHMEM_CXXFLAGS, [SHMEM C++ compiler flags]) +AC_ARG_VAR(SHMEM_FFLAGS, [SHMEM Fortran 77 compiler flags]) +AC_ARG_VAR(SHMEM_FCFLAGS, [SHMEM Fortran compiler flags]) +AC_ARG_VAR(SHMEM_LDFLAGS, [SHMEM linker flags, e.g. -L if you have libraries in a nonstandard directory ]) +AC_ARG_VAR(SHMEM_LIBS, [SHMEM libraries to pass to the linker, e.g. -l]) +AC_ARG_VAR(SHMEM_LIB_NAME, [name of the SHMEM library]) +AC_ARG_VAR(SHMEM_NAME, [name of the implemented SHMEM specification]) +]) + +AC_DEFUN([AFS_CONVERT_SHMEM_COMPILER], +[ +if test "x${ac_cv_env_SHMEM[$1]_set}" != "xset"; then + # don't use the default compiler if nothing is specified for SHMEM + unset [$1] +else + [$1]="$ac_cv_env_SHMEM[$1]_value" +fi +]) + +AC_DEFUN([AFS_CONVERT_SHMEM_FLAGS], +[ +if test "x${ac_cv_env_SHMEM_[$1]_set}" != "xset"; then + # don't use the default flags if nothing is specified for SHMEM + unset [$1] +else + # use the SHMEM flags + [$1]="$ac_cv_env_SHMEM_[$1]_value" +fi +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_compiler_checks.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_compiler_checks.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_compiler_checks.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_compiler_checks.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,124 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2012, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2012, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2012, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2012, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2013, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2012, 2014 +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2012, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file build-config/m4/ac_scorep_compiler_checks.m4 + +dnl ------------------------------------------------------------------ + +# used for pomp_tpd in scorep and opari2 +AC_DEFUN([AC_SCOREP_ATTRIBUTE_ALIGNMENT],[ +AC_LANG_PUSH([C]) +AC_MSG_CHECKING([for alignment attribute]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], +[[int __attribute__((aligned (16))) tpd;]])], + [ac_scorep_has_alignment_attribute="yes"], + [ac_scorep_has_alignment_attribute="no"] +) + +if test "x${ac_scorep_has_alignment_attribute}" = "xyes"; then + AC_DEFINE([FORTRAN_ALIGNED],[__attribute__((aligned (16)))],[Makes C variable alignment consistent with Fortran]) +else + AC_DEFINE([FORTRAN_ALIGNED],[],[Alignment attribute not supported]) +fi + +AC_MSG_RESULT([$ac_scorep_has_alignment_attribute]) +AC_LANG_POP([C]) +]) + +dnl ------------------------------------------------------------------ + +AC_DEFUN([AC_SCOREP_COMPILER_CHECKS],[ +AC_LANG_PUSH([C]) +AX_COMPILER_VENDOR +AX_COMPILER_VERSION +AC_LANG_POP([C]) + +# Disable default OpenMP support for the Cray compilers +AS_IF([test "x${ax_cv_c_compiler_vendor}" = xcray], + [CC="${CC} -hnoomp -O2" + CXX="${CXX} -hnoomp -O2" + F77="${F77} -hnoomp -O2" + FC="${FC} -hnoomp -O2"])dnl + +AS_CASE([${ax_cv_c_compiler_vendor%/*}], + [intel], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_INTEL], [test 1 -eq 1], [false])], + [sun], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_SUN], [test 1 -eq 1], [false])], + [ibm], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_IBM], [test 1 -eq 1], [false])], + [portland], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_PGI], [test 1 -eq 1], [false])], + [gnu], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_GNU], [test 1 -eq 1], [false])], + [clang], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_CLANG], [test 1 -eq 1], [false])], + [cray], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_CRAY], [test 1 -eq 1], [false])], + [fujitsu], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_FUJITSU], [test 1 -eq 1], [false])], + [unknown], [AC_MSG_WARN([Could not determine compiler vendor. AC_PACKAGE_NAME might not function properly.])], + [AC_MSG_WARN([Compiler vendor '${ax_cv_c_compiler_vendor}' unsupported. AC_PACKAGE_NAME might not function properly.])])dnl + +afs_compiler_intel=0 +afs_compiler_sun=0 +afs_compiler_ibm=0 +afs_compiler_portland=0 +afs_compiler_gnu=0 +afs_compiler_clang=0 +afs_compiler_cray=0 +afs_compiler_fujitsu=0 +AS_CASE([${ax_cv_c_compiler_vendor%/*}], + [intel], [afs_compiler_intel=1], + [sun], [afs_compiler_sun=1], + [ibm], [afs_compiler_ibm=1], + [portland], [afs_compiler_portland=1], + [gnu], [afs_compiler_gnu=1], + [clang], [afs_compiler_clang=1], + [cray], [afs_compiler_cray=1], + [fujitsu], [afs_compiler_fujitsu=1], + []) +AC_SUBST([SCOREP_COMPILER_INTEL], [${afs_compiler_intel}])dnl +AC_SUBST([SCOREP_COMPILER_SUN], [${afs_compiler_sun}])dnl +AC_SUBST([SCOREP_COMPILER_IBM], [${afs_compiler_ibm}])dnl +AC_SUBST([SCOREP_COMPILER_PGI], [${afs_compiler_portland}])dnl +AC_SUBST([SCOREP_COMPILER_GNU], [${afs_compiler_gnu}])dnl +AC_SUBST([SCOREP_COMPILER_CLANG], [${afs_compiler_clang}])dnl +AC_SUBST([SCOREP_COMPILER_CRAY], [${afs_compiler_cray}])dnl +AC_SUBST([SCOREP_COMPILER_FUJITSU], [${afs_compiler_fujitsu}])dnl + +dnl strip epoch (Borland only) +_scorep_compiler_version=${ax_cv_c_compiler_version##*:} +dnl extract major +afs_compiler_version_major=${_scorep_compiler_version%%.*} +dnl fallback to 0 +: ${afs_compiler_version_major:=0} +_scorep_compiler_version=${_scorep_compiler_version#*.} +dnl extract minor +afs_compiler_version_minor=${_scorep_compiler_version%%.*} +dnl fallback to 0 +: ${afs_compiler_version_minor:=0} +AS_UNSET([_scorep_compiler_version]) +AC_SUBST([SCOREP_COMPILER_VERSION_MAJOR], [${afs_compiler_version_major}])dnl +AC_SUBST([SCOREP_COMPILER_VERSION_MINOR], [${afs_compiler_version_minor}])dnl +])dnl diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_doxygen.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_doxygen.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_doxygen.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_doxygen.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,51 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## Technische Universitaet Dresden, Germany +## University of Oregon, Eugene, USA +## Forschungszentrum Juelich GmbH, Germany +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## Technische Universitaet Muenchen, Germany +## +## See the COPYING file in the package base directory for details. +## + + +# AC_SCOREP_DOXYGEN +#---------------- +# Check doxygen related stuff, sets some output variables and the +# AM_CONDITIONALs HAVE_DOXYGEN and HAVE_DOXYGEN_LATEX. +# +AC_DEFUN([AC_SCOREP_DOXYGEN], +[ +#if test -z "$have_svnversion"; then +# AC_CHECK_PROG([have_svnversion], [svnversion], [yes], [no],,) +#fi +AC_PATH_PROG([DOXYGEN], [doxygen]) +AM_CONDITIONAL(HAVE_DOXYGEN, test "x${DOXYGEN}" != "x") + +have_doxygen_latex="no" +AM_COND_IF([HAVE_DOXYGEN],[ + AC_CHECK_PROG([have_dot], [dot], [yes], [no],,) + AC_CHECK_PROG([have_pdflatex], [pdflatex], [yes], [no],,) + AC_CHECK_PROG([have_makeindex], [makeindex], [yes], [no],,) + if test "x${have_pdflatex}" = xyes && test "x${have_makeindex}" = xyes; then + have_doxygen_latex="yes" + fi +]) +AC_SUBST([have_doxygen_latex]) +AM_CONDITIONAL(HAVE_DOXYGEN_LATEX, test "x${have_doxygen_latex}" = xyes) + +# ac_scorep_doxygen_distdir may be passed in from upper level configure +# will end up in 'USER_DOC_DIR = $(top_distdir)$(ac_scorep_doxygen_distdir)/doc' +if test ! -n "$ac_scorep_doxygen_distdir"; then + ac_scorep_doxygen_distdir="" +fi +AC_SUBST([ac_scorep_doxygen_distdir]) + +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_fortran_checks.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_fortran_checks.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_fortran_checks.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_fortran_checks.m4 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,35 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## Technische Universitaet Dresden, Germany +## University of Oregon, Eugene, USA +## Forschungszentrum Juelich GmbH, Germany +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## Technische Universitaet Muenchen, Germany +## +## See the COPYING file in the package base directory for details. +## + + +## file ac_scorep_fortran_checks.m4 + +AC_DEFUN([AC_SCOREP_FORTRAN_SUPPORT_ALLOCATABLE],[ +AC_LANG_PUSH(Fortran) +AC_MSG_CHECKING([whether double precision, allocatable arrays are supported]) +AC_COMPILE_IFELSE([ + PROGRAM test + TYPE mydata + double precision, allocatable :: afF(:,:) + END TYPE mydata + END PROGRAM test +], [scorep_support_allocatable="yes"], [scorep_support_allocatable="no"] +) #AC_COMPILE_IFELSE +AC_LANG_POP(Fortran) +AC_MSG_RESULT($scorep_support_allocatable) +AM_CONDITIONAL(FORTRAN_SUPPORT_ALLOCATABLE, test "x$scorep_support_allocatable" = "xyes") +]) #AC_DEFUN diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_git_controlled.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_git_controlled.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_git_controlled.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_git_controlled.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,59 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2011, 2019-2020, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2011, 2015, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +AC_DEFUN([_AC_SCOREP_GIT_CONTROLLED], +[ +AC_MSG_CHECKING([Git controlled]) +ac_scorep_git_controlled="no" + +# test if ${afs_srcdir} is a git top-level, not any parent directory: +# * if ${afs_srcdir} is a top-level, than the prefix is empty (e.g., we are git controlled) +# * if ${afs_srcdir} is below a top-level, than it wont be empty (e.g., we operate in a +# tarball, which was extracted below a top-level) +# * if git could not find any top-level, it prints an error to stderr and stop, +# we catch this error, which makes the test also fail (e.g., we operate in a +# tarball which is *not* below any top-level) +AS_IF([test -z "$( + unset $(git rev-parse --local-env-vars 2>/dev/null) && + cd ${afs_srcdir} && + git rev-parse --show-prefix 2>&1)"], + [ac_scorep_git_controlled="yes" + AC_DEFINE([SCOREP_IN_DEVELOPEMENT], [], [Defined if we are working from git.])], + [AC_DEFINE([SCOREP_IN_PRODUCTION], [], [Defined if we are working from a make dist generated tarball.])]) +AC_MSG_RESULT([$ac_scorep_git_controlled]) +]) + +AC_DEFUN([AC_SCOREP_GIT_CONTROLLED], +[ +AC_REQUIRE([_AC_SCOREP_GIT_CONTROLLED]) +AM_CONDITIONAL([GIT_CONTROLLED], [test "x${ac_scorep_git_controlled}" = xyes]) +AFS_SUMMARY_VERBOSE([Git controlled], [$ac_scorep_git_controlled]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_sys_detection.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_sys_detection.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_sys_detection.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_sys_detection.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,273 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2013, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2017, 2019-2021, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file ac_scorep_sys_detection.m4 + +# The purpose of platform detection is to provide reasonable default +# compilers, MPI implementations, etc. The user always has the +# possibility to override the defaults by setting environment +# variables, see section "Some influential environment variables" in +# configure --help. On some systems there may be no reasonable +# defaults for the MPI implementation, so specify them using +# --with-mpi=... Also, on some systems there are different +# compiler-suites available which can be choosen via +# --with-compiler=(gcc|intel|sun|ibm|...) + + +# intended to be called by toplevel configure +AC_DEFUN_ONCE([AC_SCOREP_DETECT_PLATFORMS], [ +AC_REQUIRE([AC_CANONICAL_BUILD])dnl + +# Notes about platform detection on Cray systems: +# First, we check for x86-64 CPU type and an existing /opt/cray/pmi/default link. +# This test should succeed for all supported Cray systems (Cray XT, XE, XK, XC). +# In the second step we will classify the systems depending on their network. +# Therefore, we use the link /opt/cray/pmi/default. We determine the link target +# and select the network. For example, /opt/cray/pmi/default points to +# /opt/cray/pmi/4.0.1-1.0000.9421.73.3.gem. 'gem' signifies the Gemini network. +# As a result we can classify the following systems: +# ss (SeaStar) Cray XT +# gem (Gemini) Cray XE, XK +# ari (Aries) Cray XC +# To distinguish Cray XE and XK systems we determine whether the system uses GPU +# accelerators (Cray XK) or not (Cray XE). +# +# Newer software stacks do not encode the network name in their files, e.g., +# /opt/cray/pmi/5.0.11 +# Therefore, we need a fall-back solution. We will test for several directories +# including the network name. +# +# Even newer software stacks on Cray XC systems (Cori, Piz Daint) +# don't provide the /opt/cray/pmi/default link but instead +# /opt/cray/pe/pmi/default. They still provide the network via +# /opt/cray/ari/modulefiles. +# +AC_ARG_ENABLE([platform-mic], + [AS_HELP_STRING([--enable-platform-mic], + [Force build for Intel Xeon Phi co-processors [no]. + This option is only needed for Xeon Phi + co-processors, like the Knights Corner (KNC). It + is not needed for self-hosted Xeon Phis, like the + Knights Landing (KNL); for these chips no special + treatment is required.])], + + [AS_CASE([${enableval}], + [yes], + [ac_scorep_platform=mic], + [no], + [], + [AC_MSG_ERROR([value '$enableval' unsupported for '--enable-platform-mic'])]) + ]) + +AS_IF([test "x${ac_scorep_platform}" = "x"], + [AS_CASE([${build_os}], + [linux*], + [AS_IF([test "x${build_cpu}" = "xia64" && test -f /etc/sgi-release], + [ac_scorep_platform="altix"], + [test "x${build_cpu}" = "xpowerpc64" && test -d /bgl/BlueLight], + [ac_scorep_platform="bgl"], + [test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys/drivers/ppcfloor/hwi], + [ac_scorep_platform="bgq"], + [test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys], + [ac_scorep_platform="bgp"], + [(test "x${build_cpu}" = "xx86_64" || test "x${build_cpu}" = "xaarch64") && test -d /opt/cray], + [ac_scorep_platform="crayunknown" + AS_IF([test -L /opt/cray/pmi/default], + [AS_IF([test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ss && echo TRUE`" = "xTRUE"], + [ac_scorep_platform="crayxt"], + [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q gem && echo TRUE`" = "xTRUE" && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x1"], + [ac_scorep_platform="crayxe"], + [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q gem && echo TRUE`" = "xTRUE" && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x0"], + [ac_scorep_platform="crayxk"], + [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ari && echo TRUE`" = "xTRUE"], + [ac_scorep_platform="crayxc"], + [test -d /opt/cray/ari/modulefiles], + [ac_scorep_platform="crayxc"], + [test -d /opt/cray/gem/modulefiles && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x0"], + [ac_scorep_platform="crayxk"], + [test -d /opt/cray/gem/modulefiles && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x1"], + [ac_scorep_platform="crayxe"])], + [test -L /opt/cray/pe/pmi/default], + [AS_IF([test -d /opt/cray/ari/modulefiles], + [ac_scorep_platform="crayxc"])]) + AS_IF([test "x${ac_scorep_platform}" = "xcrayunknown"], + [AC_CHECK_PROG([has_cc], [cc], [yes], [no]) + AC_CHECK_PROG([has_CC], [CC], [yes], [no]) + AC_CHECK_PROG([has_ftn], [ftn], [yes], [no]) + AS_IF([test "${has_cc}${has_CC}${has_ftn}" != yesyesyes], + [# System seems to be a Cray, but doensn't provide + # compiler wrappers cc, CC, ftn. Try 'linux' as fallback. + ac_scorep_platform=linux + AC_MSG_WARN([Unknown Cray platform, no compiler wrappers provided, assume linux. Please contact .])], + [AC_MSG_WARN([Unknown Cray platform, please contact .])])])], + [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVtclang], + [ac_scorep_platform="k"], + [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVfxlang], + [ac_scorep_platform="fx10"], + [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVmxlang], + [ac_scorep_platform="fx100"], + [ac_scorep_platform=linux])], + [sunos* | solaris*], + [ac_scorep_platform="solaris"], + [darwin*], + [ac_scorep_platform="mac"], + [aix*], + [ac_scorep_platform="aix"], + [superux*], + [ac_scorep_platform="necsx"], + [mingw*], + [ac_scorep_platform="mingw"], + [ac_scorep_platform="unknown"]) + + # Keep 'checking' and 'result' close to each other in oder to not interfere with CICD platform check + AC_MSG_CHECKING([for platform]) + AS_IF([test "x${ac_scorep_platform}" = "xunknown"], + [AC_MSG_RESULT([$ac_scorep_platform, please contact if you encounter any problems.])], + [AC_MSG_RESULT([$ac_scorep_platform (auto detected)]) + AFS_SUMMARY([Platform], [$ac_scorep_platform (auto detected)])]) + ], + [AC_MSG_CHECKING([for platform]) + AC_MSG_RESULT([$ac_scorep_platform (provided)]) + AFS_SUMMARY([Platform], [$ac_scorep_platform (provided)])]) +])# AC_SCOREP_DETECT_PLATFORMS + + +# intended to be called by toplevel configure +AC_DEFUN_ONCE([AFS_CROSSCOMPILING], +[ +AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS])dnl + +AS_IF([test "x${ac_scorep_cross_compiling}" = "x"], + [AS_CASE([${ac_scorep_platform}], + [altix], [ac_scorep_cross_compiling="no"], + [bgl], [ac_scorep_cross_compiling="yes"], + [bgp], [ac_scorep_cross_compiling="yes"], + [bgq], [ac_scorep_cross_compiling="yes"], + [crayxt], [ac_scorep_cross_compiling="yes"], + [crayxe], [ac_scorep_cross_compiling="yes"], + [crayxk], [ac_scorep_cross_compiling="yes"], + [crayxc], [ac_scorep_cross_compiling="yes"], + [crayunknown], [ac_scorep_cross_compiling="yes"], + [k], [ac_scorep_cross_compiling="yes"], + [fx10], [ac_scorep_cross_compiling="yes"], + [fx100], [ac_scorep_cross_compiling="yes"], + [linux], [ac_scorep_cross_compiling="no"], + [solaris], [ac_scorep_cross_compiling="no"], + [mac], [ac_scorep_cross_compiling="no"], + [mic], [ac_scorep_cross_compiling="yes"], + [mingw], [ac_scorep_cross_compiling="no"], + [aix], [ac_scorep_cross_compiling="no"], + [necsx], [ac_scorep_cross_compiling="yes"], + [unknown], [ac_scorep_cross_compiling="no"], + [AC_MSG_ERROR([provided platform '${ac_scorep_platform}' unknown.])]) + AFS_SUMMARY([Cross compiling], [$ac_scorep_cross_compiling (auto detected)]) + ], + [# honor ac_scorep_cross_compiling from the commandline + AS_IF([test ${ac_scorep_cross_compiling} != "yes" && \ + test ${ac_scorep_cross_compiling} != "no" ], + [AC_MSG_ERROR([invalid value '${ac_scorep_cross_compiling}' for provided 'ac_scorep_cross_compiling'])]) + AFS_SUMMARY([Cross compiling], [$ac_scorep_cross_compiling (provided)]) + ]) + +AC_MSG_CHECKING([for cross compilation]) +AC_MSG_RESULT([$ac_scorep_cross_compiling]) +])# AFS_CROSSCOMPILING + + +# This macro is called by the build-backend/frontend/mpi configures only. +AC_DEFUN([AC_SCOREP_PLATFORM_SETTINGS], +[ + AM_CONDITIONAL([PLATFORM_ALTIX], [test "x${ac_scorep_platform}" = "xaltix"]) + AM_CONDITIONAL([PLATFORM_AIX], [test "x${ac_scorep_platform}" = "xaix"]) + AM_CONDITIONAL([PLATFORM_BGL], [test "x${ac_scorep_platform}" = "xbgl"]) + AM_CONDITIONAL([PLATFORM_BGP], [test "x${ac_scorep_platform}" = "xbgp"]) + AM_CONDITIONAL([PLATFORM_BGQ], [test "x${ac_scorep_platform}" = "xbgq"]) + AM_CONDITIONAL([PLATFORM_CRAYXT], [test "x${ac_scorep_platform}" = "xcrayxt"]) + AM_CONDITIONAL([PLATFORM_CRAYXE], [test "x${ac_scorep_platform}" = "xcrayxe"]) + AM_CONDITIONAL([PLATFORM_CRAYXK], [test "x${ac_scorep_platform}" = "xcrayxk"]) + AM_CONDITIONAL([PLATFORM_CRAYXC], [test "x${ac_scorep_platform}" = "xcrayxc"]) + AM_CONDITIONAL([PLATFORM_CRAYUNKNOWN], [test "x${ac_scorep_platform}" = "xcrayunknown"]) + AM_CONDITIONAL([PLATFORM_LINUX], [test "x${ac_scorep_platform}" = "xlinux"]) + AM_CONDITIONAL([PLATFORM_SOLARIS], [test "x${ac_scorep_platform}" = "xsolaris"]) + AM_CONDITIONAL([PLATFORM_MAC], [test "x${ac_scorep_platform}" = "xmac"]) + AM_CONDITIONAL([PLATFORM_MIC], [test "x${ac_scorep_platform}" = "xmic"]) + AM_CONDITIONAL([PLATFORM_NECSX], [test "x${ac_scorep_platform}" = "xnecsx"]) + AM_CONDITIONAL([PLATFORM_MINGW], [test "x${ac_scorep_platform}" = "xmingw"]) + AM_CONDITIONAL([PLATFORM_K], [test "x${ac_scorep_platform}" = "xk"]) + AM_CONDITIONAL([PLATFORM_FX10], [test "x${ac_scorep_platform}" = "xfx10"]) + AM_CONDITIONAL([PLATFORM_FX100], [test "x${ac_scorep_platform}" = "xfx100"]) + + AS_CASE([${ac_scorep_platform}], + [cray*], [afs_platform_cray="yes"], + [afs_platform_cray="no"]) + AM_CONDITIONAL([PLATFORM_CRAY],[ test "x${afs_platform_cray}" = "xyes" ]) + + AM_COND_IF([PLATFORM_ALTIX], + [AC_DEFINE([HAVE_PLATFORM_ALTIX], [1], [Set if we are building for the ALTIX platform])]) + AM_COND_IF([PLATFORM_AIX], + [AC_DEFINE([HAVE_PLATFORM_AIX], [1], [Set if we are building for the AIX platform])]) + AM_COND_IF([PLATFORM_BGL], + [AC_DEFINE([HAVE_PLATFORM_BGL], [1], [Set if we are building for the BG/L platform])]) + AM_COND_IF([PLATFORM_BGP], + [AC_DEFINE([HAVE_PLATFORM_BGP], [1], [Set if we are building for the BG/P platform])]) + AM_COND_IF([PLATFORM_BGQ], + [AC_DEFINE([HAVE_PLATFORM_BGQ], [1], [Set if we are building for the BG/Q platform])]) + AM_COND_IF([PLATFORM_CRAY], + [AC_DEFINE([HAVE_PLATFORM_CRAY], [1], [Set if we are building for the Cray platform])]) + AM_COND_IF([PLATFORM_CRAYXT], + [AC_DEFINE([HAVE_PLATFORM_CRAYXT], [1], [Set if we are building for the Cray XT platform])]) + AM_COND_IF([PLATFORM_CRAYXE], + [AC_DEFINE([HAVE_PLATFORM_CRAYXE], [1], [Set if we are building for the Cray XE platform])]) + AM_COND_IF([PLATFORM_CRAYXK], + [AC_DEFINE([HAVE_PLATFORM_CRAYXK], [1], [Set if we are building for the Cray XK platform])]) + AM_COND_IF([PLATFORM_CRAYXC], + [AC_DEFINE([HAVE_PLATFORM_CRAYXC], [1], [Set if we are building for the Cray XC platform])]) + AM_COND_IF([PLATFORM_CRAYUNKNOWN], + [AC_DEFINE([HAVE_PLATFORM_CRAYUNKNOWN], [1], [Set if we are building for an unknown Cray])]) + AM_COND_IF([PLATFORM_LINUX], + [AC_DEFINE([HAVE_PLATFORM_LINUX], [1], [Set if we are building for the Linux platform])]) + AM_COND_IF([PLATFORM_SOLARIS], + [AC_DEFINE([HAVE_PLATFORM_SOLARIS], [1], [Set if we are building for the Solaris platform])]) + AM_COND_IF([PLATFORM_MAC], + [AC_DEFINE([HAVE_PLATFORM_MAC], [1], [Set if we are building for the macOS platform])]) + AM_COND_IF([PLATFORM_MIC], + [AC_DEFINE([HAVE_PLATFORM_MIC], [1], [Set if we are building for the Intel MIC platform])]) + AM_COND_IF([PLATFORM_NECSX], + [AC_DEFINE([HAVE_PLATFORM_NECSX], [1], [Set if we are building for the NEC SX platform])]) + AM_COND_IF([PLATFORM_MINGW], + [AC_DEFINE([HAVE_PLATFORM_MINGW], [1], [Set if we are building for the MinGW platform])]) + AM_COND_IF([PLATFORM_K], + [AC_DEFINE([HAVE_PLATFORM_K], [1], [Set if we are building for the K platform])]) + AM_COND_IF([PLATFORM_FX10], + [AC_DEFINE([HAVE_PLATFORM_FX10], [1], [Set if we are building for the FX10 platform])]) + AM_COND_IF([PLATFORM_FX100], + [AC_DEFINE([HAVE_PLATFORM_FX100], [1], [Set if we are building for the FX100 platform])]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_toplevel_args.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_toplevel_args.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_toplevel_args.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_toplevel_args.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,54 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2011, 2016, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + + +# Save user provided arguments for use by sub-configures. +AC_DEFUN([AC_SCOREP_TOPLEVEL_ARGS], +[ +# Quote arguments with shell meta characters. +TOPLEVEL_CONFIGURE_ARGUMENTS= +set -- "$progname" "$[@]" +for ac_arg +do + AS_CASE(["$ac_arg"], + [*" "*|*" "*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*], + [ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + # if the argument is of the form -foo=baz, quote the baz part only + ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"`]) + # Add the quoted argument to the list. + TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS +$ac_arg" +done +# Remove the initial space we just introduced. +TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//'` + +echo "$TOPLEVEL_CONFIGURE_ARGUMENTS" > ./user_provided_configure_args +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_uncrustify.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_uncrustify.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_uncrustify.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_uncrustify.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,23 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## Technische Universitaet Dresden, Germany +## University of Oregon, Eugene, USA +## Forschungszentrum Juelich GmbH, Germany +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## Technische Universitaet Muenchen, Germany +## +## See the COPYING file in the package base directory for details. +## + + +AC_DEFUN([AC_SCOREP_UNCRUSTIFY], +[ +AC_CHECK_PROG([ac_scorep_have_uncrustify], [uncrustify], [yes], [no],,) +AM_CONDITIONAL([HAVE_UNCRUSTIFY], [test "x${ac_scorep_have_uncrustify}" = "xyes"]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ac_scorep_version_and_revision.m4 opari2-2.0.6/build-config/common/m4/ac_scorep_version_and_revision.m4 --- opari2-2.0.5/build-config/common/m4/ac_scorep_version_and_revision.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ac_scorep_version_and_revision.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,90 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2014, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2013, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + + +AC_DEFUN([AC_SCOREP_REVISION], +[ +AC_REQUIRE([_AC_SCOREP_GIT_CONTROLLED]) +AC_REQUIRE([AC_SCOREP_PACKAGE_AND_LIBRARY_VERSION]) + +# When in a working copy, write REVISION* files. The REVISION* files +# are updated during each configure call and also at make +# doxygen-user. + +# When working with a make-dist-generated tarball, the REVISION* files +# are provided. + +component_revision="invalid" +AS_IF([test "x${ac_scorep_git_controlled}" = xyes && + component_revision=$( + unset $(git rev-parse --local-env-vars 2>/dev/null) && + cd ${afs_srcdir} && + git describe --always --dirty 2>/dev/null)], + [echo "$component_revision" >${afs_srcdir}/build-config/REVISION], + [component_revision=external]) + +# Warn if the REVISION files contain -dirty prefix or is external. +AS_CASE([`cat ${afs_srcdir}/build-config/REVISION`], + [*-dirty|external|invalid], + [component_revision=`cat ${afs_srcdir}/build-config/REVISION` + AC_MSG_WARN([distribution does not match a single, unmodified revision, but $component_revision.])]) +]) + +AC_DEFUN([AC_SCOREP_PACKAGE_AND_LIBRARY_VERSION], +[ + AC_SUBST([PACKAGE_MAJOR], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$major"])) + AC_SUBST([PACKAGE_MINOR], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$minor"])) + AC_SUBST([PACKAGE_BUGFIX], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$bugfix"])) + AC_SUBST([PACKAGE_SUFFIX], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$suffix"])) + + AC_SUBST([LIBRARY_CURRENT], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$current"])) + AC_SUBST([LIBRARY_REVISION], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$revision"])) + AC_SUBST([LIBRARY_AGE], + m4_esyscmd(AFS_PACKAGE_TO_TOP[build-config/common/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$age"])) +]) + + + + +AC_DEFUN([AC_SCOREP_DEFINE_REVISIONS], +[ + AS_IF([test ! -e ${afs_srcdir}/build-config/REVISION], + [AC_MSG_ERROR([File ${afs_srcdir}/build-config/REVISION must exist.])]) + + component_revision=`cat ${afs_srcdir}/build-config/REVISION` + AC_DEFINE_UNQUOTED([SCOREP_COMPONENT_REVISION], ["${component_revision}"], [Revision of ]AC_PACKAGE_NAME) +]) diff -Nru opari2-2.0.5/build-config/common/m4/afs_am_conditional.m4 opari2-2.0.6/build-config/common/m4/afs_am_conditional.m4 --- opari2-2.0.5/build-config/common/m4/afs_am_conditional.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/afs_am_conditional.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,35 @@ +dnl -*- mode: autoconf -*- + +dnl +dnl This file is part of the Score-P software (http://www.score-p.org) +dnl +dnl Copyright (c) 2013 +dnl Forschungszentrum Juelich GmbH, Germany +dnl +dnl This software may be modified and distributed under the terms of +dnl a BSD-style license. See the COPYING file in the package base +dnl directory for details. +dnl + +dnl file afs_am_conditional.m4 + + +# AFS_AM_CONDITIONAL(NAME, SHELL-CONDITION, BOOLEAN-VALUE) +# ------------------------------------- +# Define an automake conditional as in AM_CONDITIONAL, but let it +# default to BOOLEAN-VALUE (true|false) if this macro is not +# encountered during configure. This allows you to define automake +# conditionals conditionally. +AC_DEFUN([AFS_AM_CONDITIONAL], +[m4_case([$3], [true], [], + [false], [], + [m4_fatal([AFS_AM_CONDITIONAL requires the third parameter to be either 'true' or 'false'.])])dnl +m4_divert_text([DEFAULTS], +[m4_if([$3], [true], [dnl +$1_TRUE= +$1_FALSE='#'],[dnl +$1_TRUE='#' +$1_FALSE=]) +])dnl +AM_CONDITIONAL($1, [$2])dnl +])dnl diff -Nru opari2-2.0.5/build-config/common/m4/afs_compiler_backend.m4 opari2-2.0.6/build-config/common/m4/afs_compiler_backend.m4 --- opari2-2.0.5/build-config/common/m4/afs_compiler_backend.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/afs_compiler_backend.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,148 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2013, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2014, 2019, +## Technische Universitaet Dresden, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file build-config/m4/afs_compiler_backend.m4 + + +# AFS_CUSTOM_COMPILERS +# -------------------- +# Provide --with-custom-compiler configure option; if given sets +# ac_scorep_compilers_backend +# ac_scorep_compilers_frontend +# ac_scorep_compilers_mpi +# to AFS_COMPILER_FILES_COMMON/platform-*-user-provided files. +# Provides afs_custom_compilers_given=(yes|no) to be used by other +# macros setting ac_scorep_compilers_*. +AC_DEFUN([AFS_CUSTOM_COMPILERS], +[ + AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) + + AC_ARG_WITH([custom-compilers], + [AS_HELP_STRING([--with-custom-compilers], + [Customize compiler settings by 1. copying the files /build-config/common/platforms/platform-*-user-provided to the directory where you run configure , 2. editing those files to your needs, and 3. running configure. Alternatively, edit the files under directly. Files in take precedence. You are entering unsupported terrain. Namaste, and good luck!]) + ], + [afs_custom_compilers_given="yes" + AS_CASE([${withval}], + ["yes"], [AS_IF([test -f ./platform-backend-user-provided && \ + test -f ./platform-frontend-user-provided && \ + test -f ./platform-mpi-user-provided && \ + test -f ./platform-shmem-user-provided], + [AC_MSG_NOTICE([Using compiler specification from ./platform-*-user-provided files.]) + ac_scorep_compilers_backend="./platform-backend-user-provided" + ac_scorep_compilers_frontend="./platform-frontend-user-provided" + ac_scorep_compilers_mpi="./platform-mpi-user-provided" + ac_scorep_compilers_shmem="./platform-shmem-user-provided"], + [AC_MSG_NOTICE([Using compiler specification from AFS_COMPILER_FILES_COMMON/platform-*-user-provided files.]) + ac_scorep_compilers_backend="AFS_COMPILER_FILES_COMMON/platform-backend-user-provided" + ac_scorep_compilers_frontend="AFS_COMPILER_FILES_COMMON/platform-frontend-user-provided" + ac_scorep_compilers_mpi="AFS_COMPILER_FILES_COMMON/platform-mpi-user-provided" + ac_scorep_compilers_shmem="AFS_COMPILER_FILES_COMMON/platform-shmem-user-provided"]) + ], + [AC_MSG_ERROR(['${withval}' not supported by --with-custom-compilers.])]) + ], + [afs_custom_compilers_given="no" + ]) +]) + +dnl ---------------------------------------------------------------------------- + +# AFS_COMPILER_FILES_(COMMON|PACKAGE) +# ----------------------------------- +# Use AFS_COMPILER_FILES_* as alias for $srcdir/[vendor/common/]build-config/platforms +# for setting paths to compiler files. +m4_define([AFS_COMPILER_FILES_COMMON], [$srcdir/build-config/common/platforms]) +m4_define([AFS_COMPILER_FILES_PACKAGE], [$srcdir/build-config/platforms]) + +dnl ---------------------------------------------------------------------------- + +# Following two macros copied from +# /share/aclocal/libtool.m4. I don't wont to call +# LT_INIT from the toplevel configure but want to use +# _LT_CC_BASENAME(CC) as in libtool. +# Should be moved into a separate file with license=GPL + +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +m4_defun([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +]) + + +# _LT_PROG_ECHO_BACKSLASH +# ----------------------- +# Find how we can fake an echo command that does not interpret backslash. +# In particular, with Autoconf 2.60 or later we add some code to the start +# of the generated configure script which will find a shell with a builtin +# printf (which we can use as an echo command). +m4_defun([_LT_PROG_ECHO_BACKSLASH], +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + +AC_MSG_CHECKING([how to print strings]) +# Test print first, because it will be a builtin if present. +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ + test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='print -r --' +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then + ECHO='printf %s\n' +else + # Use this function as a fallback that always works. + func_fallback_echo () + { + eval 'cat <<_LTECHO_EOF +$[]1 +_LTECHO_EOF' + } + ECHO='func_fallback_echo' +fi + +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + +case "$ECHO" in + printf*) AC_MSG_RESULT([printf]) ;; + print*) AC_MSG_RESULT([print -r]) ;; + *) AC_MSG_RESULT([cat]) ;; +esac + +m4_ifdef([_AS_DETECT_SUGGESTED], +[_AS_DETECT_SUGGESTED([ + test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( + ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO + ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO + PATH=/empty FPATH=/empty; export PATH FPATH + test "X`printf %s $ECHO`" = "X$ECHO" \ + || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) + +dnl Don't declare libtool variables, we are just interested in ECHO here. +dnl _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) +dnl _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) +])# _LT_PROG_ECHO_BACKSLASH diff -Nru opari2-2.0.5/build-config/common/m4/afs_maintainer_mode.m4 opari2-2.0.6/build-config/common/m4/afs_maintainer_mode.m4 --- opari2-2.0.5/build-config/common/m4/afs_maintainer_mode.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/afs_maintainer_mode.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,31 @@ +dnl -*- mode: autoconf -*- + +dnl +dnl This file is part of the Score-P software (http://www.score-p.org) +dnl +dnl Copyright (c) 2018, +dnl Forschungszentrum Juelich GmbH, Germany +dnl +dnl Copyright (c) 2019, +dnl Technische Universitaet Dresden, Germany +dnl +dnl This software may be modified and distributed under the terms of +dnl a BSD-style license. See the COPYING file in the package base +dnl directory for details. +dnl + +dnl file afs_maintainer_mode.m4 + +# AFS_MAINTAINER_MODE +# ------------------- +# Enable maintainer mode only when building from repository sources. +# We want automatic regeneration of files when our build environemnt +# is available, i.e., when correct and patched versions of autotools +# are available. Otherwise we want to prevent automatic regeneration +# of files. +AC_DEFUN([AFS_MAINTAINER_MODE], +[AC_REQUIRE([AC_SCOREP_GIT_CONTROLLED]) +AS_IF([test "x${ac_scorep_git_controlled}" = xyes], + [AM_MAINTAINER_MODE([enable])], + [AM_MAINTAINER_MODE([])])dnl +]) # AFS_MAINTAINER_MODE diff -Nru opari2-2.0.5/build-config/common/m4/afs_summary.m4 opari2-2.0.6/build-config/common/m4/afs_summary.m4 --- opari2-2.0.5/build-config/common/m4/afs_summary.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/afs_summary.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,394 @@ +## -*- mode: autoconf -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2015, 2020, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2013, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file afs_summary.m4 + +# _AFS_SUMMARY_DEFINE_FN +# ---------------------- +# Internal initialization +m4_define([_AFS_SUMMARY_DEFINE_FN], +[AC_REQUIRE_SHELL_FN([afs_fn_summary], + [AS_FUNCTION_DESCRIBE([afs_fn_summary], [DESCR VALUE INDENT [WRAP-MARGIN=_AFS_SUMMARY_WRAP_MARGIN]], + [Produces a line-wrapped summary line with DESCR and VALUE, indented by INDENT +and wrapped at WRAP-MARGIN.])], +[dnl function body + _afs_summary_wrap_width=${4-_AFS_SUMMARY_WRAP_MARGIN} + _afs_summary_column_width=_AFS_SUMMARY_COLUMN_WIDTH + _afs_summary_prefix="${3-} ${1-}:" + printf "%s" "${_afs_summary_prefix}" + _afs_summary_padding="$(printf "%-${_afs_summary_column_width}s" "")" + _afs_summary_value="$(echo "${2-}" | $SED -e 's/ */ /g' -e 's/^ //' -e 's/ $//')" + AS_IF([test ${#_afs_summary_prefix} -ge ${#_afs_summary_padding}], [ + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" + ], [ + as_fn_arith ${#_afs_summary_padding} - ${#_afs_summary_prefix} && + _afs_summary_nl="$(printf "%-${as_val}s" "")" + ]) + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + while test -n "${_afs_summary_value}" + do + _afs_summary_entry="${_afs_summary_value%% *}" + printf "%s" "${_afs_summary_nl}${_afs_summary_sep}${_afs_summary_entry}" + + case "${_afs_summary_value}" in + (*" "*) _afs_summary_value="${_afs_summary_value#* }" ;; + (*) _afs_summary_value="" ;; + esac + + as_fn_arith ${_afs_summary_column} + ${#_afs_summary_entry} + ${#_afs_summary_sep} && + _afs_summary_column=$as_val + AS_IF([test ${_afs_summary_column} -ge ${_afs_summary_wrap_width}], [ + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + ], [ + _afs_summary_sep=" " + _afs_summary_nl="" + ]) + done + echo +AS_UNSET([_afs_summary_column_width]) +AS_UNSET([_afs_summary_wrap_width]) +AS_UNSET([_afs_summary_prefix]) +AS_UNSET([_afs_summary_padding]) +AS_UNSET([_afs_summary_value]) +AS_UNSET([_afs_summary_nl]) +AS_UNSET([_afs_summary_sep]) +AS_UNSET([_afs_summary_column]) +AS_UNSET([_afs_summary_entry]) +AS_UNSET([_afs_summary_tag]) +AS_UNSET([_afs_summary_tag_final]) +])]dnl +) #_AFS_SUMMARY_DEFINE_FN + +# _AFS_SUMMARY_INIT +# ----------------- +AC_DEFUN_ONCE([_AFS_SUMMARY_INIT], +[AC_REQUIRE([AC_PROG_SED])] +[m4_define_default([_AFS_SUMMARY_COLUMN_WIDTH], 32)]dnl +[m4_define_default([_AFS_SUMMARY_WRAP_MARGIN], 128)]dnl +_AFS_SUMMARY_DEFINE_FN +)# _AFS_SUMMARY_INIT + +# AFS_SUMMARY_INIT( [BUILD-MASTER] ) +# ---------------------------------- +# Initializes the summary system and adds the package header (possibly +# including the sub-build name) to it. It removes config.summary files +# from previous configure runs recursively, therefore you need to call +# AFS_SUMMARY_INIT before any sub-configures. +# The sub-build name is used from the `AFS_PACKAGE_BUILD` variable +# set by the AFS_PACKAGE_INIT macro. +# +# Provide BUILD-MASTER, if this config.summary should be cleaned up +# from duplicate lines the BUILD-MASTER/config.summary file has too. +# +# Autoconf variables: +# `_AFS_SUMMARY_COLUMN_WIDTH`:: The width of the description column. +# Defaults to 32. +# `_AFS_SUMMARY_WRAP_MARGIN`:: The wrap margin. Defaults to 128. +AC_DEFUN([AFS_SUMMARY_INIT], +[AC_REQUIRE([_AFS_SUMMARY_INIT])]dnl +[rm -f AC_PACKAGE_TARNAME.summary +LC_ALL=C find . -name 'config.summary*' -exec rm -f '{}' \; +m4_ifnblank(m4_normalize($1), AS_LN_S(m4_normalize($1)[/config.summary], [config.summary-master])) +m4_define([_AFS_SUMMARY_INDENT], [m4_ifndef([AFS_PACKAGE_BUILD], [], [ ])])dnl +m4_define([_AFS_SUMMARY_FILE], [config.summary])dnl +afs_fn_summary \ + "AC_PACKAGE_NAME m4_ifndef([AFS_PACKAGE_BUILD], AC_PACKAGE_VERSION, [(]AFS_PACKAGE_BUILD[)])" \ + "" \ + "_AFS_SUMMARY_INDENT" \ + >_AFS_SUMMARY_FILE +m4_pushdef([_AFS_SUMMARY_INDENT], _AFS_SUMMARY_INDENT[ ])dnl +]) + + +# AFS_SUMMARY_SECTION_BEGIN( [DESCR, [VALUE]] ) +# --------------------------------------------- +# Starts a new section, optionally with the given description. +# All summary lines after this call will be indented by 2 spaces. +# Close the section with 'AFS_SUMMARY_SECTION_END'. +AC_DEFUN([AFS_SUMMARY_SECTION_BEGIN], [ +AC_REQUIRE([AFS_SUMMARY_INIT])dnl + +m4_ifnblank($1, AFS_SUMMARY([$1], [$2])) +m4_pushdef([_AFS_SUMMARY_INDENT], _AFS_SUMMARY_INDENT[ ])dnl +]) + + +# AFS_SUMMARY_SECTION_END +# ----------------------- +# Close a previously opened section with 'AFS_SUMMARY_SECTION_BEGIN'. +AC_DEFUN([AFS_SUMMARY_SECTION_END], [ +AC_REQUIRE([AFS_SUMMARY_INIT])dnl + +m4_popdef([_AFS_SUMMARY_INDENT])dnl +]) + + +# AFS_SUMMARY_PUSH +# ---------------- +# Starts a new section (see 'AFS_SUMMARY_SECTION_BEGIN'), but without a +# section heading and it collects all subsequent summaries and sections in +# a hold space. +# All summary lines after this call will be indented by 2 spaces. +# Output the hold space with 'AFS_SUMMARY_POP'. +AC_DEFUN([AFS_SUMMARY_PUSH], [ +AC_REQUIRE([AFS_SUMMARY_INIT])dnl + +AFS_SUMMARY_SECTION_BEGIN +m4_pushdef([_AFS_SUMMARY_FILE], _AFS_SUMMARY_FILE[.x])dnl +: >_AFS_SUMMARY_FILE +]) + + +# AFS_SUMMARY_POP( DESCR, VALUE ) +# ------------------------------- +# Close a previously opened section with 'AFS_SUMMARY_PUSH'. Outputs the +# section header with DESCR and VALUE, and than outputs the summary from the +# hold space. +AC_DEFUN([AFS_SUMMARY_POP], [ +AC_REQUIRE([AFS_SUMMARY_INIT])dnl + +m4_define([_afs_summary_tmp], _AFS_SUMMARY_FILE)dnl +m4_popdef([_AFS_SUMMARY_FILE])dnl +AFS_SUMMARY_SECTION_END + +AFS_SUMMARY([$1], [$2]) +cat _afs_summary_tmp >>_AFS_SUMMARY_FILE +rm _afs_summary_tmp +m4_undefine([_afs_summary_tmp]) +]) + +# AFS_SUMMARY( DESCR, VALUE, [WRAP-MARGIN] ) +# ------------------------------------------ +# Generates a summary line with the given description and value. +# DESCR needs to be colon-free. DESCR and VALUE will be expanded in double quotes. +AC_DEFUN([AFS_SUMMARY], [ +AC_REQUIRE([AFS_SUMMARY_INIT])dnl +m4_if(m4_index([$1], [:]), [-1], +[afs_fn_summary "_AS_QUOTE([$1])" "_AS_QUOTE([$2])" "_AFS_SUMMARY_INDENT" $3 >>_AFS_SUMMARY_FILE], +[m4_fatal([$0: description should not have a colon (:): ]$1)])]) + +# AFS_SUMMARY_VERBOSE( DESCR, VALUE ) +# ----------------------------------- +# Generates a summary line with the given description and value, but only +# if ./configure was called with --verbose +AC_DEFUN([AFS_SUMMARY_VERBOSE], [ + +AS_IF([test "x${verbose}" = "xyes"], [ + AFS_SUMMARY([$1], [$2]) +]) +]) + + +# internal +AC_DEFUN([_AFS_SUMMARY_SHOW], [ + +AS_ECHO([""]) +if test ${as__color-no} = yes || + { { test "${CLICOLOR-1}" != "0" && test -t 1; } || test "${CLICOLOR_FORCE:-0}" != "0"; }; then + cat +else + $SED -e 's/'"$(printf "\033")"'\@<:@@<:@0-9;@:>@*m//g' +fi $summary.sub + $SED -e :a -e '/\\$/N; s/\n/'"$_afs_summary_sub"'/; ta' <$summary-master >$summary-master.sub + LC_ALL=C $AWK ' +function printsummary(ps_summary, ps_descr_pre, ps_descr_post) { + match(ps_summary, ": *") + ps_descr = substr(ps_summary, 1, RSTART) + ps_gap = substr(ps_summary, RSTART+1, RLENGTH-1) + ps_value = substr(ps_summary, RSTART+RLENGTH) + match(ps_descr, "^ *") + ps_indent = substr(ps_descr, 1, RLENGTH) + ps_descr = substr(ps_descr, RLENGTH+1) + ps_value_res = "" + ps_pre = "" + ps_post = "" + ps_firstword = 0 + while (ps_value != "") { + ps_start = 1 + if (0 != match(ps_value, " *\\\\\032 *")) { + ps_chunk = substr(ps_value, 1, RSTART - 1) + ps_sep = substr(ps_value, RSTART, RLENGTH) + ps_value = substr(ps_value, RSTART + RLENGTH) + } else { + # last chunk + ps_chunk = ps_value + ps_sep = "" + ps_value = "" + } + if (!ps_firstword && length(ps_chunk) > 0) { + if (match(ps_chunk, "^@<:@a-z@:>@*")) + ps_word = substr(ps_chunk, RSTART, RLENGTH) + else + ps_word = ps_chunk + if (ps_word == "yes") + ps_pre = "\033@<:@0;32m" + else if (ps_word == "no") + ps_pre = "\033@<:@0;31m" + else + ps_pre = "\033@<:@1;34m" + ps_post = "\033@<:@m" + ps_firstword = 1 + } + ps_value_res = ps_value_res "" ps_pre "" ps_chunk "" ps_post "" ps_sep + } + print ps_indent "" ps_descr_pre "" ps_descr "" ps_descr_post "" ps_gap "" ps_value_res +} + +BEGIN { + sectionstack@<:@0@:>@ = "" + sectionstackprinted@<:@0@:>@ = 0 + sectionestacklen = 0 + sectionoffset = -1 +} + +{ + if (ARGV@<:@1@:>@ == FILENAME) { + colon = in@&t@dex($[]0, ":") + refsections@<:@substr($[]0, 1, colon)@:>@ = substr($[]0, colon+1) + next + } + match($[]0, "^ *") + depth = RLENGTH / 2 + if (sectionoffset == -1) { + sectionoffset = depth; + } + depth -= sectionoffset + while (sectionestacklen < depth) { + sectionstack@<:@sectionestacklen@:>@ = "" + sectionstackprinted@<:@sectionestacklen@:>@ = 1 + sectionestacklen++ + } + sectionstack@<:@depth@:>@ = $[]0 + sectionstackprinted@<:@depth@:>@ = 0 + sectionestacklen = depth + 1 + colon = in@&t@dex($[]0, ":") + descr = substr($[]0, 1, colon) + value = substr($[]0, colon+1) + if (!(descr in refsections) || refsections@<:@descr@:>@ != value) { + for (i = 1; i < sectionestacklen; i++) { + if (!sectionstackprinted@<:@i-1@:>@) { + printsummary(sectionstack@<:@i-1@:>@, "", "") + sectionstackprinted@<:@i-1@:>@ = 1 + } + } + descr_pre = "" + descr_post = "" + if (descr in refsections) { + # we are here, because the values differ + descr_pre = "\033@<:@0;31m" + descr_post = "\033@<:@m" + } + printsummary(descr "" value, descr_pre, descr_post) + sectionstackprinted@<:@depth@:>@ = 1 + } +} +' \ + $summary-master.sub $summary.sub | $SED -e 's/'"$_afs_summary_sub"'/'"\\$as_nl"'/g' + rm -f $summary.sub $summary-master $summary-master.sub + _afs_summary_sep="" + done +) >AC_PACKAGE_TARNAME.summary + +m4_ifblank($1, + [_AFS_SUMMARY_SHOW], + [AS_IF([$1], [_AFS_SUMMARY_SHOW])]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ax_compiler_vendor.m4 opari2-2.0.6/build-config/common/m4/ax_compiler_vendor.m4 --- opari2-2.0.5/build-config/common/m4/ax_compiler_vendor.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ax_compiler_vendor.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,141 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VENDOR +# +# DESCRIPTION +# +# Determine the vendor of the C, C++ or Fortran compiler. The vendor is +# returned in the cache variable $ax_cv_c_compiler_vendor for C, +# $ax_cv_cxx_compiler_vendor for C++ or $ax_cv_fc_compiler_vendor for +# (modern) Fortran. The value is one of "intel", "ibm", "pathscale", +# "clang" (LLVM), "cray", "fujitsu", "sdcc", "sx", "portland" (PGI), "gnu" +# (GCC), "sun" (Oracle Developer Studio), "hp", "dec", "borland", +# "comeau", "kai", "lcc", "sgi", "microsoft", "metrowerks", "watcom", +# "tcc" (Tiny CC) or "unknown" (if the compiler cannot be determined). +# +# To check for a Fortran compiler, you must first call AC_FC_PP_SRCEXT +# with an appropriate preprocessor-enabled extension. For example: +# +# AC_LANG_PUSH([Fortran]) +# AC_PROG_FC +# AC_FC_PP_SRCEXT([F]) +# AX_COMPILER_VENDOR +# AC_LANG_POP([Fortran]) +# +# Try also to determine the variant of a compiler (e.g. Portland ships pgcc +# and pgcc-llvm). If there is a variant detected, / is +# returned. Use ${ax_cv_c_compiler_vendor%/*} to test only for the . +# +# LICENSE +# +# Copyright (c) 2008 Steven G. Johnson +# Copyright (c) 2008 Matteo Frigo +# Copyright (c) 2018-19 John Zaitseff +# +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 30 + +AC_DEFUN([AX_COMPILER_VENDOR], [dnl + AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, [dnl + dnl If you modify this list of vendors, please add similar support + dnl to ax_compiler_version.m4 if at all possible. + dnl + dnl Note: Do NOT check for GCC first since some other compilers + dnl define __GNUC__ to remain compatible with it. Compilers that + dnl are very slow to start (such as Intel) are listed first. + + vendors=" + intel: __ICC,__ECC,__INTEL_COMPILER + ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__ + pathscale: __PATHCC__,__PATHSCALE__ + clang: __clang__ + cray: _CRAYC,_CRAYFTN + fujitsu: __FUJITSU + sdcc: SDCC,__SDCC + sx: _SX + portland: __PGI + gnu: __GNUC__ + sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95 + hp: __HP_cc,__HP_aCC + dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER + borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ + comeau: __COMO__ + kai: __KCC + lcc: __LCC__ + sgi: __sgi,sgi + microsoft: _MSC_VER + metrowerks: __MWERKS__ + watcom: __WATCOMC__ + tcc: __TINYC__ + unknown: UNKNOWN + " + for ventest in $vendors; do + case $ventest in #( + *:) + vendor=${ventest%:*} + continue + ;; #( + *) + vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" + ;; + esac + + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ +#if !($vencpp) + thisisanerror; +#endif + ]])], [break]) + done + + ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=$vendor + + portland_variants="llvm: __PGLLVM__" + eval variants=\"\$${ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor}_variants : NONE\" + for vartest in $variants; do + case $vartest in #( + *:) + variant=${vartest%:*}; + continue + ;; #( + *) + varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")" + ;; + esac + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[ +#if !($varcpp) + thisisanerror; +#endif + ]])], [break]) + done + AS_VAR_APPEND([ax_cv_]_AC_LANG_ABBREV[_compiler_vendor], [${variant:+/$variant}]) + ]) +])dnl diff -Nru opari2-2.0.5/build-config/common/m4/ax_compiler_version.m4 opari2-2.0.6/build-config/common/m4/ax_compiler_version.m4 --- opari2-2.0.5/build-config/common/m4/ax_compiler_version.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ax_compiler_version.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,552 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_COMPILER_VERSION +# +# DESCRIPTION +# +# This macro retrieves the compiler version and returns it in the cache +# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version +# for C++. +# +# Version is returned as epoch:major.minor.patchversion +# +# Epoch is used in order to have an increasing version number in case of +# marketing change. +# +# Epoch use: * borland compiler use chronologically 0turboc for turboc +# era, +# +# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, +# 3borlancpp for return of BORLANDC++ (after version 5.5), +# 4cppbuilder for cppbuilder with year version, +# and 5xe for XE era. +# +# An empty string is returned otherwise. +# +# LICENSE +# +# Copyright (c) 2014 Bastien ROUCARIES +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 12 + +# for intel +AC_DEFUN([_AX_COMPILER_VERSION_INTEL], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__INTEL_COMPILER/100],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__INTEL_COMPILER%100)/10],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [(__INTEL_COMPILER%10)],, + AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for IBM +AC_DEFUN([_AX_COMPILER_VERSION_IBM], + [ dnl + dnl check between z/OS C/C++ and XL C/C++ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([], + [ + #if defined(__COMPILER_VER__) + choke me; + #endif + ])], + [ + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([], + [ + #if defined(__ibmxl_version__) + choke me; + #endif + ])], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__xlC__/100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__xlC__%100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC_ver__/0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + [__xlC_ver__%0x100],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ], + [ + dnl its maybe __ibmxl_ptf_fix_level__ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__ibmxl_modification__],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__ibmxl_release__],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [__ibmxl_version__],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + ], + [ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__xlC__%1000],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__xlC__/10000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__xlC__/100000)%10],, + AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +# for pathscale +AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PATHCC__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PATHCC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PATHCC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for clang +AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __clang_major__,, + AC_MSG_FAILURE([[[$0]] unknown clang major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __clang_minor__,, + AC_MSG_FAILURE([[[$0]] unknown clang minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__clang_patchlevel__],,0) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for crayc +AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + _RELEASE,, + AC_MSG_FAILURE([[[$0]] unknown crayc release])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _RELEASE_MINOR,, + AC_MSG_FAILURE([[[$0]] unknown crayc minor])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for fujitsu +AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ + AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + __FCC_VERSION,, + AC_MSG_WARN([[[$0]] unknown fujitsu release]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="") + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __GNUC__,, + AC_MSG_FAILURE([[[$0]] unknown gcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __GNUC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown gcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__GNUC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# For sun +AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ + m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], + [ + #if defined(__SUNPRO_CC) + __SUNPRO_CC + #else + __SUNPRO_C + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, + !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, + AC_MSG_FAILURE([[[$0]] unknown sun patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown sun minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, + AC_MSG_FAILURE([[[$0]] unknown sun major version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" +]) + +AC_DEFUN([_AX_COMPILER_VERSION_HP],[ + m4_define([_AX_COMPILER_VERSION_HP_NUMBER], + [ + #if defined(__HP_cc) + __HP_cc + #else + __HP_aCC + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, + !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], + [dnl By default output last version with this behavior. + dnl it is so old + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" + ], + [dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_HP_NUMBER % 100),, + AC_MSG_FAILURE([[[$0]] unknown hp release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, + AC_MSG_FAILURE([[[$0]] unknown hp major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) +]) + +AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl + m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], + [ + #if defined(__DECC_VER) + __DECC_VER + #else + __DECCXX_VER + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, + AC_MSG_FAILURE([[[$0]] unknown dec release version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, + AC_MSG_FAILURE([[[$0]] unknown dec major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# borland +AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl + m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], + [ + #if defined(__TURBOC__) + __TURBOC__ + #else + choke me + #endif + ]) + m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], + [ + #if defined(__BORLANDC__) + __BORLANDC__ + #else + __CODEGEARC__ + #endif + ]) + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM(, + _AX_COMPILER_VERSION_TURBOC_NUMBER)], + [dnl TURBOC + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, + _AX_COMPILER_VERSION_TURBOC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown turboc version])) + AS_IF( + [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], + [dnl compute normal version + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, + AC_MSG_FAILURE([[[$0]] unknown turboc major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], + [dnl special version + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], + [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], + [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], + [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], + [ + AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" + ]) + ]) + ], + # borlandc + [ + AC_COMPUTE_INT( + _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, + _AX_COMPILER_VERSION_BORLANDC_NUMBER,, + AC_MSG_FAILURE([[[$0]] unknown borlandc version])) + AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], + dnl BORLANDC++ before 5.5 + [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], + [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], + [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], + [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], + [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], + dnl C++ Builder era + [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], + [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], + dnl BORLANDC++ after 5.5 + [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], + [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], + [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], + dnl C++ Builder with year number + [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], + [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], + [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], + [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], + dnl XE version + [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], + [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], + [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], + [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], + [ + AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) + ]) + ]) + ]) + +# COMO +AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], + [ dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [__COMO_VERSION__%100],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__COMO_VERSION__/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# KAI +AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__KCC_VERSION%100],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(__KCC_VERSION/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(__KCC_VERSION/1000)%10],, + AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +dnl LCC +dnl LCC does not output version... + +# SGI +AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ + m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], + [ + #if defined(_COMPILER_VERSION) + _COMPILER_VERSION + #else + _SGI_COMPILER_VERSION + #endif + ]) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [_AX_COMPILER_VERSION_SGI_NUMBER%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, + AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# microsoft +AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + _MSC_VER%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (_MSC_VER/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) + dnl could be overridden + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 + _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 + # special case for version 6 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) + # for version 7 + AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%1000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + # for version > 8 + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + _MSC_FULL_VER%10000,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) + ]) + AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], + [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, + _MSC_BUILD,, + AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) + ]) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" + ]) + +# for metrowerks +AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + __MWERKS__%0x100,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + (__MWERKS__/0x100)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__MWERKS__/0x1000)%0x10,, + AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# for watcom +AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __WATCOMC__%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + (__WATCOMC__/100)%100,, + AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" + ]) + +# for PGI +AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + __PGIC__,, + AC_MSG_FAILURE([[[$0]] unknown pgi major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + __PGIC_MINOR__,, + AC_MSG_FAILURE([[[$0]] unknown pgi minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [__PGIC_PATCHLEVEL__],, + AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# tcc +AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+\([0-9.]\+\).*/\1/g'`] + ]) + +# for GNU +AC_DEFUN([_AX_COMPILER_VERSION_SDCC],[ + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MAJOR)) + __SDCC_VERSION_MAJOR + #else + SDCC/100 + #endif + ,, + AC_MSG_FAILURE([[[$0]] unknown sdcc major])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_MINOR)) + __SDCC_VERSION_MINOR + #else + (SDCC%100)/10 + #endif + ,, + AC_MSG_FAILURE([[[$0]] unknown sdcc minor])) + AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, + [ + /* avoid parse error with comments */ + #if(defined(__SDCC_VERSION_PATCH)) + __SDCC_VERSION_PATCH + #elsif(defined(_SDCC_VERSION_PATCHLEVEL)) + __SDCC_VERSION_PATCHLEVEL + #else + SDCC%10 + #endif + ],, + AC_MSG_FAILURE([[[$0]] unknown sdcc patch level])) + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" + ]) + +# main entry point +AC_DEFUN([AX_COMPILER_VERSION],[dnl + AC_REQUIRE([AX_COMPILER_VENDOR]) + AC_REQUIRE([AC_PROG_SED]) + AC_CACHE_CHECK([for _AC_LANG compiler version], + ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, + [ dnl + AS_CASE([${ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor%/*}], + [intel],[_AX_COMPILER_VERSION_INTEL], + [ibm],[_AX_COMPILER_VERSION_IBM], + [pathscale],[_AX_COMPILER_VERSION_PATHSCALE], + [clang],[_AX_COMPILER_VERSION_CLANG], + [cray],[_AX_COMPILER_VERSION_CRAY], + [fujitsu],[_AX_COMPILER_VERSION_FUJITSU], + [gnu],[_AX_COMPILER_VERSION_GNU], + [sun],[_AX_COMPILER_VERSION_SUN], + [hp],[_AX_COMPILER_VERSION_HP], + [dec],[_AX_COMPILER_VERSION_DEC], + [borland],[_AX_COMPILER_VERSION_BORLAND], + [comeau],[_AX_COMPILER_VERSION_COMEAU], + [kai],[_AX_COMPILER_VERSION_KAI], + [sgi],[_AX_COMPILER_VERSION_SGI], + [microsoft],[_AX_COMPILER_VERSION_MICROSOFT], + [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], + [watcom],[_AX_COMPILER_VERSION_WATCOM], + [portland],[_AX_COMPILER_VERSION_PORTLAND], + [tcc],[_AX_COMPILER_VERSION_TCC], + [sdcc],[_AX_COMPILER_VERSION_SDCC], + [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) + ]) +]) diff -Nru opari2-2.0.5/build-config/common/m4/ax_config_subdir.m4 opari2-2.0.6/build-config/common/m4/ax_config_subdir.m4 --- opari2-2.0.5/build-config/common/m4/ax_config_subdir.m4 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/m4/ax_config_subdir.m4 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,287 @@ +# +# SYNOPSIS +# +# AX_CONFIG_SUBDIR(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) +# AX_CONFIG_SUBDIR_IMMEDIATE(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) +# +# +# DESCRIPTION +# +# These macros allow to configure packages in subdirectories using +# custom arguments. They are intended as a replacement of +# AC_CUSTOM_SUBDIRS if custom arguments need to be provided to the +# sub-configures. They build on AC_CUSTOM_SUBDIRS code that was +# copy-pasted from autoconf's status.m4 and slightly modified. In +# contrast to AC_CUSTOM_SUBDIRS you call this macros with a single +# directory DIR-ARGUMENTS tuple at a time. Ensures that DIR is +# unique. As in AC_CUSTOM_SUBDIRS, ARGUMENTS are adjusted (relative +# name for the cache file, relative name for the source directory), +# the current value of $prefix is propagated, including if it was +# defaulted, and --disable-option-checking is prepended to silence +# warnings, since different subdirs can have different --enable and +# --with options. Use this macros inside a conditional to control +# the execution of the nested configure at runtime. A list of +# runtime directories ax_config_subdirs is provided via AC_SUBST. +# DIR should be a literal to allow for proper execution of +# 'configure --help=recursive'. By default, 'configure +# --help=recursive' will recurse into DIR. To prevent this, pass +# DISABLE_HELP_RECURSIVE as third parameter. +# +# AX_CONFIG_SUBDIR emits code that might invoke a nested configure +# at AC_CONFIG_COMMANDS_POST time in directory DIR (if existent) +# with arguments ARGUMENTS. +# +# AX_CONFIG_SUBDIR_IMMEDIATE emits code that might invoke a nested +# configure immediatly in directory DIR (if existent) with +# arguments ARGUMENTS. +# +# +# LICENSE +# +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (c) 2016-2017, Christian Feld +# +# This file is based on parts of autoconf's (version 2.69) +# status.m4. This program is free software; you can redistribute it +# and/or modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# + + +# AX_CONFIG_SUBDIR(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) +# ----------------------------------------------------------- +# +AC_DEFUN([AX_CONFIG_SUBDIR], +dnl +_AX_CONFIG_SUBDIR_COMMON($1, $2, $3)dnl +dnl +dnl increment macro-invocation counter +[m4_pushdef([_AX_CONFIG_SUBDIR_COUNT], m4_incr(_AX_CONFIG_SUBDIR_COUNT))]dnl +dnl +dnl Add empty ax_config_subdir_dir/args_ variables to DEFAULTS section +[m4_divert_text([DEFAULTS], +[ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]= +ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]=])]dnl +dnl +dnl Assign runtime values to ax_config_subdir_dir/args_ variables. +[ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]="$1"] +[ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]="$2"] +dnl +dnl Append code to _AX_CONFIG_SUBDIRS_RUN to execute configure script +dnl in $1 if AX_CONFIG_SUBDIR was called at runtime. +[m4_append([_AX_CONFIG_SUBDIRS_RUN], +AS_IF([test "x${no_recursion}" != xyes && + test "x${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}" != x && + test -d "${srcdir}/${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}"], + [ax_fn_config_subdir "${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}" "${ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]}"]) +)]dnl +dnl +dnl Provide list of runtime-subdirs to Makefile. +[AC_SUBST([ax_config_subdirs], ["${ax_config_subdirs} m4_normalize([$1])"])]dnl +)# AX_CONFIG_SUBDIR + + +# AX_CONFIG_SUBDIR_IMMEDIATE(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) +# --------------------------------------------------------------------- +# +AC_DEFUN([AX_CONFIG_SUBDIR_IMMEDIATE], +dnl +_AX_CONFIG_SUBDIR_COMMON($1, $2, $3)dnl +dnl +AS_IF([test "x${no_recursion}" != xyes && test -d "${srcdir}/$1"], + [ax_fn_config_subdir "$1" "$2"]) +dnl +dnl Provide list of runtime-subdirs to Makefile. +[AC_SUBST([ax_config_subdirs], ["${ax_config_subdirs} m4_normalize([$1])"])]dnl +)# AX_CONFIG_SUBDIR_IMMEDIATE + + +# _AX_CONFIG_SUBDIR_COMMON +# ------------------------ +# Functionality common to AX_CONFIG_SUBDIR and AX_CONFIG_SUBDIR_IMMEDIATE. +# +m4_define([_AX_CONFIG_SUBDIR_COMMON], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])]dnl +[AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])]dnl +[AC_REQUIRE([_AX_CONFIG_SUBDIR_INIT])]dnl +dnl +dnl Two argument required +[m4_ifblank([$1], [m4_fatal([Macro requires at least two arguments])])]dnl +[m4_ifblank([$2], [m4_fatal([Macro requires at least two arguments])])]dnl +dnl +[AS_LITERAL_IF([$1], [], + [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl +dnl +dnl Prevent multiple registration of DIR. +[_AX_CONFIG_SUBDIR_UNIQUE(_AC_CONFIG_COMPUTE_DEST($1))]dnl +dnl +dnl Append DIR to _AC_LIST_SUBDIRS which defines ac_subdirs_all. This +dnl list is used for recursive help output only. Note that with a +dnl separate AX list and using the HELP_END diversion it is not +dnl possible to generate our own recursive help output as configure +dnl exits after ac_subdirs_all is processed. I (CF) did not find a +dnl way to move my code before the generic processing. Prevent +dnl recursive help if $3 is given. +[m4_ifblank([$3], [m4_append([_AC_LIST_SUBDIRS], [$1], [ +])])]dnl +)# _AX_CONFIG_SUBDIR_COMMON + + +# _AX_CONFIG_SUBDIR_INIT +# ------------------------- +# +AC_DEFUN_ONCE([_AX_CONFIG_SUBDIR_INIT], +dnl initialize macro-invocation counter +[m4_pushdef([_AX_CONFIG_SUBDIR_COUNT], 0)]dnl +[m4_append([_AX_CONFIG_SUBDIRS_RUN], +# Execute subdir configures defined via AX_CONFIG_SUBDIR. +# +# Do not complain if ax_config_subdir_dir is missing, so a configure +# script can configure whichever parts of a large source tree are +# present. +)]dnl +dnl Run configures after config.status creation +AC_CONFIG_COMMANDS_POST([_AX_CONFIG_SUBDIRS_RUN])dnl +_AX_CONFIG_SUBDIR_DEFINE_FN +)# _AX_CONFIG_SUBDIR_INIT + + +# _AX_CONFIG_SUBDIR_UNIQUE(DIR) +# ----------------------------- +# See also _AC_CONFIG_UNIQUE in status.m4. Prevent multiple usage of +# DIR in AC_CONFIG_SUBDIRS or AX_CONFIG_SUBDIR. Note that if DIR was +# defined in AX_CONFIG_SUBDIR first, using DIR in AC_CONFIG_SUBDIRS +# will issue a wrong error message ('... is already registered with +# AC_CONFIG_SUBDIRS.'). +# +m4_define([_AX_CONFIG_SUBDIR_UNIQUE], +dnl Abort if DIR was already defined with AX_CONFIG_SUBDIR +[m4_ifdef([_AX_CONFIG_SUBDIR_SEEN_TAG($1)], + [m4_fatal([`$1' is already registered with AX_CONFIG_SUBDIR])])]dnl +dnl Abort if DIR was already defined with AC_CONFIG_SUBDIRS +[m4_ifdef([_AC_SEEN_TAG($1)], + [m4_fatal([`$1' is already registered with AC_CONFIG_]m4_defn( + [_AC_SEEN_TAG($1)]).)])]dnl +dnl Make DIR unique +[m4_define([_AC_SEEN_TAG($1)], [SUBDIRS])]dnl +[m4_define([_AX_CONFIG_SUBDIR_SEEN_TAG($1)])]dnl +)# _AX_CONFIG_SUBDIR_UNIQUE(DIR) + + +# _AX_CONFIG_SUBDIR_DEFINE_FN +# --------------------------- +# Define a shell function to call configures in subdirectories with +# custom arguments. +# +m4_define([_AX_CONFIG_SUBDIR_DEFINE_FN], +[AS_REQUIRE_SHELL_FN([ax_fn_config_subdir], + [AS_FUNCTION_DESCRIBE([ax_fn_config_subdir], [], + [trigger configure in ax_subdir with arguments ax_subdir_args. Adjusts +parameters by updating --cache-file, --srcdir, --prefix, and adding +--disable-option-checking as in AC_CONFIG_SUBIRS.])], +[dnl body to expand +ax_subdir="$[]1" +ax_subdir_args="$[]2" + +# BEGIN: slightly modified snippet from status.m4 +# Remove --cache-file, --srcdir, --prefix, and +# --disable-option-checking arguments so they do not pile up. +# Input: ax_subdir_args; output: ax_sub_configure_args +ax_sub_configure_args= +ac_prev= +eval "set x $ax_subdir_args" +shift +for ac_arg +do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case $ac_arg in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ + | --c=*) + ;; + --config-cache | -C) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + ;; + --disable-option-checking) + ;; + *) + case $ac_arg in + *\'*) ac_arg=`AS_ECHO(["$ac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; + esac + AS_VAR_APPEND([ax_sub_configure_args], [" '$ac_arg'"]) ;; + esac +done + +# Always prepend --prefix to ensure using the same prefix +# in subdir configurations. +ac_arg="--prefix=$prefix" +case $ac_arg in +*\'*) ac_arg=`AS_ECHO(["$ac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; +esac +ax_sub_configure_args="'$ac_arg' $ax_sub_configure_args" + +# Pass --silent +if test "$silent" = yes; then + ax_sub_configure_args="--silent $ax_sub_configure_args" +fi + +# Always prepend --disable-option-checking to silence warnings, since +# different subdirs can have different --enable and --with options. +ax_sub_configure_args="--disable-option-checking $ax_sub_configure_args" + +ax_popdir=`pwd` + +ac_msg="=== configuring in $ax_subdir (`pwd`/$ax_subdir)" +_AS_ECHO_LOG([$ac_msg]) +_AS_ECHO([$ac_msg]) +AS_MKDIR_P(["$ax_subdir"]) +_AC_SRCDIRS(["$ax_subdir"]) + +cd "$ax_subdir" + +# Check for guested configure; otherwise get Cygnus style configure. +if test -f "$ac_srcdir/configure.gnu"; then + ax_sub_configure=$ac_srcdir/configure.gnu +elif test -f "$ac_srcdir/configure"; then + ax_sub_configure=$ac_srcdir/configure +elif test -f "$ac_srcdir/configure.in"; then + # This should be Cygnus configure. + ax_sub_configure=$ac_aux_dir/configure +else + AC_MSG_WARN([no configuration information is in $ax_subdir]) + ax_sub_configure= +fi + +# The recursion is here. +if test -n "$ax_sub_configure"; then + # Make the cache file name correct relative to the subdirectory. + case $cache_file in + [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;; + *) # Relative name. + ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; + esac + + AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) + # The eval makes quoting arguments work. + eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \ + --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || + AC_MSG_ERROR([$ax_sub_configure failed for $ax_subdir]) +fi + +cd "$ax_popdir" +# END: slightly modified snippet from status.m4])]dnl +)# _AX_CONFIG_SUBDIR_DEFINE_FN diff -Nru opari2-2.0.5/build-config/common/Makefile.inc.am opari2-2.0.6/build-config/common/Makefile.inc.am --- opari2-2.0.5/build-config/common/Makefile.inc.am 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/Makefile.inc.am 2021-02-25 12:51:08.215909906 +0000 @@ -0,0 +1,120 @@ +## -*- mode: makefile -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2011, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2011, 2015, 2017, 2019, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file build-config/common/Makefile.inc.am + +EXTRA_DIST = +BUILT_SOURCES = +CLEANFILES = +DISTCLEANFILES = + +# Testing framework +EXTRA_DIST += $(srcdir)/build-config/common/generate-config-backend-for-frontend.sh \ + $(srcdir)/build-config/common/generate-library-dependencies.sh \ + $(srcdir)/build-config/common/generate-library-dependencies-la-object.hpp \ + $(srcdir)/build-config/common/generate-library-version.sh \ + $(srcdir)/build-config/common/generate-package-version.sh \ + $(srcdir)/common/utils/test/cutest/CuTest.c \ + $(srcdir)/common/utils/test/cutest/CuTest.h \ + $(srcdir)/common/utils/test/cutest/license.txt \ + $(srcdir)/common/utils/test/cutest/README.txt + +DISTCLEANFILES += $(builddir)/config.summary +DISTCLEANFILES += $(builddir)/@PACKAGE@.summary + +CONFIG_STATUS_DEPENDENCIES = $(srcdir)/build-config/VERSION +CONFIGURE_DEPENDENCIES = $(srcdir)/build-config/VERSION + +common-uninstall: + rm -rf $(DESTDIR)$(datadir)/@PACKAGE@ + + +SCOREP_RECURSIVE_TARGETS= + + +############################################################################### +## code beautification targets +## +if GIT_CONTROLLED +if HAVE_UNCRUSTIFY + +beautify-sp: + @$(am__cd) $(srcdir) && ./common/beautifier/beautify +beautify: beautify-recursive +SCOREP_RECURSIVE_TARGETS += beautify-recursive + +beautify-clean: + +endif # HAVE_UNCRUSTIFY +endif # GIT_CONTROLLED + ## + ## +############################################################################### + + +############################################################################### +## trigger build of check_* targets here and in subdirectories. +## + +check-build-sp: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) +check-build: check-build-recursive +SCOREP_RECURSIVE_TARGETS += check-build-recursive + + ## + ## +############################################################################### + +$(SCOREP_RECURSIVE_TARGETS): +## Using $failcom allows "-k" to keep its natural meaning when running a +## recursive rule. + @fail= failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-sp"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-sp" || exit 1; \ + fi; test -z "$$fail" diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-aocc opari2-2.0.6/build-config/common/platforms/compiler-frontend-aocc --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-aocc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-aocc 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=clang +CXX_FOR_BUILD=clang++ +F77_FOR_BUILD=flang +FC_FOR_BUILD=flang + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-clang opari2-2.0.6/build-config/common/platforms/compiler-frontend-clang --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-clang 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-clang 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=clang +CXX_FOR_BUILD=clang++ +F77_FOR_BUILD=flang +FC_FOR_BUILD=flang + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-gcc opari2-2.0.6/build-config/common/platforms/compiler-frontend-gcc --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-gcc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-gcc 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=gcc +CXX_FOR_BUILD=g++ +F77_FOR_BUILD=gfortran +FC_FOR_BUILD=gfortran + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-ibm opari2-2.0.6/build-config/common/platforms/compiler-frontend-ibm --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-ibm 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-ibm 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=xlc_r +CXX_FOR_BUILD=xlC_r +F77_FOR_BUILD=xlf_r +FC_FOR_BUILD=xlf_r + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-intel opari2-2.0.6/build-config/common/platforms/compiler-frontend-intel --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-intel 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-intel 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=icc +CXX_FOR_BUILD=icpc +F77_FOR_BUILD=ifort +FC_FOR_BUILD=ifort + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-pgi opari2-2.0.6/build-config/common/platforms/compiler-frontend-pgi --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-pgi 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-pgi 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,13 @@ +CC_FOR_BUILD=pgcc +CXX_FOR_BUILD=pgc++ +F77_FOR_BUILD=pgfortran +FC_FOR_BUILD=pgfortran + +#CPPFLAGS_FOR_BUILD= +# Provide flags as 16.1 is broken with the default '-O2 -g'. +CFLAGS_FOR_BUILD=-O2 -gopt +CXXFLAGS_FOR_BUILD=-O2 -gopt +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-frontend-studio opari2-2.0.6/build-config/common/platforms/compiler-frontend-studio --- opari2-2.0.5/build-config/common/platforms/compiler-frontend-studio 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-frontend-studio 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=cc +CXX_FOR_BUILD=CC +F77_FOR_BUILD=f77 +FC_FOR_BUILD=f95 + +#CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD=-xO3 +CXXFLAGS_FOR_BUILD=-xO3 +FFLAGS_FOR_BUILD=-xO3 +FCFLAGS_FOR_BUILD=-xO3 +LDFLAGS_FOR_BUILD=-xO3 +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-bullxmpi opari2-2.0.6/build-config/common/platforms/compiler-mpi-bullxmpi --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-bullxmpi 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-bullxmpi 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,19 @@ +MPICC=mpicc +#MPI_CFLAGS +MPICXX=mpicxx +#MPI_CXXFLAGS= +MPIF77=mpif77 +#MPI_FFLAGS= +MPIFC=mpif90 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lmpi_f77 +# FMPIOBJ = +# MPIEXTRA = -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-hp opari2-2.0.6/build-config/common/platforms/compiler-mpi-hp --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-hp 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-hp 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,19 @@ +MPICC=mpicc -mpicc {CC} +#MPI_CFLAGS +MPICXX=mpiCC -mpicxx {CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -mpif77 {F77} +#MPI_FFLAGS= +MPIFC=mpif90 -mpif90 {FC} +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lhpmpi +# PMPILIB = -lpmpi +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-ibmpoe opari2-2.0.6/build-config/common/platforms/compiler-mpi-ibmpoe --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-ibmpoe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-ibmpoe 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,19 @@ +MPICC=mpcc_r +#MPI_CFLAGS +MPICXX=mpCC_r +#MPI_CXXFLAGS= +MPIF77=mpfort +#MPI_FFLAGS= +MPIFC=mpfort -qsuffix=f=f90 -qfree=f90 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi_ibm +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,20 @@ +MPICC=mpiicc +#MPI_CFLAGS +MPICXX=mpiicpc +#MPI_CXXFLAGS= +MPIF77=mpiifort +#MPI_FFLAGS= +MPIFC=mpiifort +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= +MPILIB_LDFLAGS=-Wc,-nolinkage + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lmpiif +# FMPIOBJ = +# MPIEXTRA = + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel2 opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel2 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel2 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel2 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,20 @@ +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -cxx={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -f77={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -fc={FC} +#MPI_FCFLAGS= +MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX +#MPI_LDFLAGS= +#MPI_LIBS= +MPILIB_LDFLAGS=-Wc,-nolinkage + +# # Scalasca1 settings +# MPILIB = +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel3 opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel3 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-intel3 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-intel3 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,22 @@ +# Intel MPI 5.x and higher (implements MPI-3) + +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -cxx={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -f77={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -fc={FC} +#MPI_FCFLAGS= +MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX +#MPI_LDFLAGS= +#MPI_LIBS= +MPILIB_LDFLAGS=-Wc,-nolinkage + +# # Scalasca1 settings +# MPILIB = +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-intelpoe opari2-2.0.6/build-config/common/platforms/compiler-mpi-intelpoe --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-intelpoe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-intelpoe 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpcc +#MPI_CFLAGS +MPICXX=mpCC +#MPI_CXXFLAGS= +MPIF77=mpfort +#MPI_FFLAGS= +MPIFC=mpfort +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-lam opari2-2.0.6/build-config/common/platforms/compiler-mpi-lam --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-lam 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-lam 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc +#MPI_CFLAGS +MPICXX=mpiCC +#MPI_CXXFLAGS= +MPIF77=mpif77 +#MPI_FFLAGS= +MPIFC=mpif77 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi -llam +# PMPILIB = +# FMPILIB = -llamf77mpi +# FMPIOBJ = +# MPIEXTRA = diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpibull2 opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpibull2 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpibull2 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpibull2 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,19 @@ +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -cxx={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif90 -f77={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -f90={FC} +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lmpibinding_f77 +# FMPIOBJ = +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -CC={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -f77={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -f90={FC} +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpich +# PMPILIB = -lpmpich +# FMPILIB = -lfmpich +# FMPIOBJ = +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich2 opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich2 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich2 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich2 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -cxx={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -f77={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -f90={FC} +#MPI_FCFLAGS= +MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpich +# PMPILIB = +# FMPILIB = -lfmpich +# FMPIOBJ = +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich3 opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich3 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-mpich3 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-mpich3 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc -cc={CC} +#MPI_CFLAGS +MPICXX=mpicxx -cxx={CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -fc={F77} +#MPI_FFLAGS= +MPIFC=mpif90 -fc={FC} +#MPI_FCFLAGS= +MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpich +# PMPILIB = +# FMPILIB = -lfmpich +# FMPIOBJ = +# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-openmpi opari2-2.0.6/build-config/common/platforms/compiler-mpi-openmpi --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-openmpi 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-openmpi 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc +#MPI_CFLAGS +MPICXX=mpicxx +#MPI_CXXFLAGS= +MPIF77=mpif77 +#MPI_FFLAGS= +MPIFC=mpif90 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lmpi_f77 +# FMPIOBJ = +# MPIEXTRA = -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-openmpi3 opari2-2.0.6/build-config/common/platforms/compiler-mpi-openmpi3 --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-openmpi3 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-openmpi3 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc +#MPI_CFLAGS +MPICXX=mpicxx +#MPI_CXXFLAGS= +MPIF77=mpif77 +#MPI_FFLAGS= +MPIFC=mpif90 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lmpi_f77 +# FMPIOBJ = +# MPIEXTRA = -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-platform opari2-2.0.6/build-config/common/platforms/compiler-mpi-platform --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-platform 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-platform 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC=mpicc -mpicc {CC} +#MPI_CFLAGS +MPICXX=mpiCC -mpicxx {CXX} +#MPI_CXXFLAGS= +MPIF77=mpif90 -mpif77 {F77} +#MPI_FFLAGS= +MPIFC=mpif90 -mpif90 {FC} +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lpcmpi +# PMPILIB = -lpmpi +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DHAS_MPI2_1SIDED -DNO_MPI_MISC diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-scali opari2-2.0.6/build-config/common/platforms/compiler-mpi-scali --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-scali 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-scali 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,19 @@ +MPICC=mpicc -ccl {CC} +#MPI_CFLAGS +MPICXX=mpic++ -ccl {CXX} +#MPI_CXXFLAGS= +MPIF77=mpif77 -ccl {F77} +#MPI_FFLAGS= +MPIFC=mpif90 -ccl {FC} +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lfmpi +# FMPIOBJ = +# MPIEXTRA = -DHAS_MPI2_1SIDED + diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-sgimpt opari2-2.0.6/build-config/common/platforms/compiler-mpi-sgimpt --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-sgimpt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-sgimpt 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,18 @@ +MPICC={CC} +#MPI_CFLAGS +MPICXX={CXX} +#MPI_CXXFLAGS= +MPIF77={F77} +#MPI_FFLAGS= +MPIFC={FC} +#MPI_FCFLAGS= +MPI_CPPFLAGS=-DMPI_NO_CPPBIND +#MPI_LDFLAGS= +MPI_LIBS=-lmpi + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DSGI_MPT -DMPI_NO_CPPBIND -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-sgimptwrapper opari2-2.0.6/build-config/common/platforms/compiler-mpi-sgimptwrapper --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-sgimptwrapper 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-sgimptwrapper 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,4 @@ +MPICC=mpicc +MPICXX=mpicxx +MPIF77=mpif77 +MPIFC=mpif90 diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-spectrum opari2-2.0.6/build-config/common/platforms/compiler-mpi-spectrum --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-spectrum 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-spectrum 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,11 @@ +MPICC=mpicc +#MPI_CFLAGS +MPICXX=mpic++ +#MPI_CXXFLAGS= +MPIF77=mpifort +#MPI_FFLAGS= +MPIFC=mpifort +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-sun opari2-2.0.6/build-config/common/platforms/compiler-mpi-sun --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-sun 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-sun 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,18 @@ +MPICC=mpcc +#MPI_CFLAGS +MPICXX=mpCC +#MPI_CXXFLAGS= +MPIF77=mpf77 +#MPI_FFLAGS= +MPIFC=mpf95 +#MPI_FCFLAGS= +#MPI_CPPFLAGS= +#MPI_LDFLAGS= +#MPI_LIBS= + +# # Scalasca1 settings +# MPILIB = -lmpi +# PMPILIB = +# FMPILIB = -lepk.ad.fmpi +# FMPIOBJ = libepk.ad.fmpi.a +# MPIEXTRA = -DHAS_MPI2_1SIDED -DNEED_F2C_CONV diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-mpi-without opari2-2.0.6/build-config/common/platforms/compiler-mpi-without --- opari2-2.0.5/build-config/common/platforms/compiler-mpi-without 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-mpi-without 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1 @@ +# Don't provide MPICC and friends if the user specified --without-mpi. diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-aocc opari2-2.0.6/build-config/common/platforms/compiler-nocross-aocc --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-aocc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-aocc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=clang +CXX=clang++ +F77=flang +FC=flang + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-clang opari2-2.0.6/build-config/common/platforms/compiler-nocross-clang --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-clang 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-clang 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=clang +CXX=clang++ +F77=flang +FC=flang + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-gcc opari2-2.0.6/build-config/common/platforms/compiler-nocross-gcc --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-gcc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-gcc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=gcc +CXX=g++ +F77=gfortran +FC=gfortran + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-ibm opari2-2.0.6/build-config/common/platforms/compiler-nocross-ibm --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-ibm 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-ibm 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=xlc_r +CXX=xlC_r +F77=xlf_r +FC=xlf_r + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-intel opari2-2.0.6/build-config/common/platforms/compiler-nocross-intel --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-intel 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-intel 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=icc +CXX=icpc +F77=ifort +FC=ifort + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-pgi opari2-2.0.6/build-config/common/platforms/compiler-nocross-pgi --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-pgi 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-pgi 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +CC=pgcc +CXX=pgc++ +F77=pgfortran +FC=pgfortran + +#CPPFLAGS= +# Provide flags as 16.1 is broken with the default '-O2 -g'. +CFLAGS_FOR_BUILD=-O2 -gopt +CXXFLAGS_FOR_BUILD=-O2 -gopt +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-nocross-studio opari2-2.0.6/build-config/common/platforms/compiler-nocross-studio --- opari2-2.0.5/build-config/common/platforms/compiler-nocross-studio 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-nocross-studio 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=f77 +FC=f95 + +#CPPFLAGS= +CFLAGS=-xO3 +CXXFLAGS=-xO3 +FFLAGS=-xO3 +FCFLAGS=-xO3 +LDFLAGS=-xO3 +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-openmpi opari2-2.0.6/build-config/common/platforms/compiler-shmem-openmpi --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-openmpi 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-openmpi 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +SHMEMCC=oshcc +#SHMEM_CFLAGS +SHMEMCXX=oshcc +#SHMEM_CXXFLAGS= +SHMEMF77=oshfort +#SHMEM_FFLAGS= +SHMEMFC=oshfort +#SHMEM_FCFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_LDFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=oshmem +SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-openmpi3 opari2-2.0.6/build-config/common/platforms/compiler-shmem-openmpi3 --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-openmpi3 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-openmpi3 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +SHMEMCC=oshcc +#SHMEM_CFLAGS +SHMEMCXX=oshcxx +#SHMEM_CXXFLAGS= +SHMEMF77=oshfort +#SHMEM_FFLAGS= +SHMEMFC=oshfort +#SHMEM_FCFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_LDFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=oshmem +SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-openshmem opari2-2.0.6/build-config/common/platforms/compiler-shmem-openshmem --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-openshmem 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-openshmem 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +SHMEMCC=oshcc +#SHMEM_CFLAGS +SHMEMCXX=oshcxx +#SHMEM_CXXFLAGS= +SHMEMF77=oshfort +#SHMEM_FFLAGS= +SHMEMFC=oshfort +#SHMEM_FCFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_LDFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=openshmem +SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-sgimpt opari2-2.0.6/build-config/common/platforms/compiler-shmem-sgimpt --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-sgimpt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-sgimpt 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +SHMEMCC={CC} +#SHMEM_CFLAGS +SHMEMCXX={CXX} +#SHMEM_CXXFLAGS= +SHMEMF77={F77} +#SHMEM_FFLAGS= +SHMEMFC={FC} +#SHMEM_FCFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_LDFLAGS= +SHMEM_LIBS=-lsma -lmpi +SHMEM_LIB_NAME=sma +SHMEM_NAME=SGI SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-sgimptwrapper opari2-2.0.6/build-config/common/platforms/compiler-shmem-sgimptwrapper --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-sgimptwrapper 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-sgimptwrapper 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,6 @@ +SHMEMCC=oshcc +SHMEMCXX=oshCC +SHMEMF77=oshfort +SHMEMFC=oshfort +SHMEM_LIB_NAME=sma +SHMEM_NAME=SGI SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-spectrum opari2-2.0.6/build-config/common/platforms/compiler-shmem-spectrum --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-spectrum 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-spectrum 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +SHMEMCC=oshcc +#SHMEM_CFLAGS +SHMEMCXX=oshc++ +#SHMEM_CXXFLAGS= +SHMEMF77=oshfort +#SHMEM_FFLAGS= +SHMEMFC=oshfort +#SHMEM_FCFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_LDFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=oshmem +SHMEM_NAME=IBM Spectrum MPI OpenSHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/compiler-shmem-without opari2-2.0.6/build-config/common/platforms/compiler-shmem-without --- opari2-2.0.5/build-config/common/platforms/compiler-shmem-without 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/compiler-shmem-without 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1 @@ +# Don't provide SHMEMCC and friends if the user specified --with-shmem=no. diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-aix opari2-2.0.6/build-config/common/platforms/platform-backend-aix --- opari2-2.0.5/build-config/common/platforms/platform-backend-aix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-aix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=xlc_r +CXX=xlC_r +F77=xlf_r +FC=xlf95_r + +#CPPFLAGS= +#CFLAGS= +CXXFLAGS=-qrtti +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-altix opari2-2.0.6/build-config/common/platforms/platform-backend-altix --- opari2-2.0.5/build-config/common/platforms/platform-backend-altix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-altix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=icc +CXX=icpc +F77=ifort +FC=ifort + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-bgl opari2-2.0.6/build-config/common/platforms/platform-backend-bgl --- opari2-2.0.5/build-config/common/platforms/platform-backend-bgl 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-bgl 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=blrts_xlc +CXX=blrts_xlC +F77=blrts_xlf +FC=blrts_xlf + +#CPPFLAGS= +#CFLAGS= +CXXFLAGS=-O3 -qarch=440 -qtune=440 +FFLAGS=-qsuppress=cmpmsg +FCFLAGS=-qfree=f90 -qsuffix=f=f90 +LDFLAGS=-L/bgl/BlueLight/ppcfloor/bglsys/lib +LIBS=-lmsglayer.rts -lrts.rts -ldevices.rts diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-bgp opari2-2.0.6/build-config/common/platforms/platform-backend-bgp --- opari2-2.0.5/build-config/common/platforms/platform-backend-bgp 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-bgp 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=bgxlc_r +CXX=bgxlC_r +F77=bgxlf_r +FC=bgxlf_r + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +FFLAGS=-qsuppress=cmpmsg +FCFLAGS=-qfree=f90 -qsuppress=cmpmsg +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-bgq opari2-2.0.6/build-config/common/platforms/platform-backend-bgq --- opari2-2.0.5/build-config/common/platforms/platform-backend-bgq 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-bgq 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=bgxlc_r +CXX=bgxlC_r +F77=bgxlf_r +FC=bgxlf_r + +#CPPFLAGS= +CFLAGS=-O3 -qstrict +CXXFLAGS=-O3 -qstrict -qminimaltoc +FFLAGS=-O3 -qstrict -qsuppress=cmpmsg +FCFLAGS=-O3 -qstrict -qfree=f90 -qsuppress=cmpmsg +LDFLAGS=-O3 -qstrict +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-crayunknown opari2-2.0.6/build-config/common/platforms/platform-backend-crayunknown --- opari2-2.0.5/build-config/common/platforms/platform-backend-crayunknown 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-crayunknown 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=ftn +FC=ftn + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-crayxc opari2-2.0.6/build-config/common/platforms/platform-backend-crayxc --- opari2-2.0.5/build-config/common/platforms/platform-backend-crayxc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-crayxc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=ftn +FC=ftn + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-crayxe opari2-2.0.6/build-config/common/platforms/platform-backend-crayxe --- opari2-2.0.5/build-config/common/platforms/platform-backend-crayxe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-crayxe 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=ftn +FC=ftn + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-crayxk opari2-2.0.6/build-config/common/platforms/platform-backend-crayxk --- opari2-2.0.5/build-config/common/platforms/platform-backend-crayxk 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-crayxk 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=ftn +FC=ftn + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-crayxt opari2-2.0.6/build-config/common/platforms/platform-backend-crayxt --- opari2-2.0.5/build-config/common/platforms/platform-backend-crayxt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-crayxt 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=ftn +FC=ftn + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-fx10 opari2-2.0.6/build-config/common/platforms/platform-backend-fx10 --- opari2-2.0.5/build-config/common/platforms/platform-backend-fx10 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-fx10 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=fccpx +CXX=FCCpx +F77=frtpx +FC=frtpx + +#CPPFLAGS= +CFLAGS=-Xg -noansi -Ntl_notrt -mt +CXXFLAGS=-Xg -Ntl_notrt -mt +FFLAGS=-Ntl_notrt -mt +FCFLAGS=-Ntl_notrt -mt +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-fx100 opari2-2.0.6/build-config/common/platforms/platform-backend-fx100 --- opari2-2.0.5/build-config/common/platforms/platform-backend-fx100 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-fx100 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=fccpx +CXX=FCCpx +F77=frtpx +FC=frtpx + +#CPPFLAGS= +CFLAGS=-Xg -noansi -Ntl_notrt -mt +CXXFLAGS=-Xg -Ntl_notrt -mt +FFLAGS=-Ntl_notrt -mt +FCFLAGS=-Ntl_notrt -mt +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-k opari2-2.0.6/build-config/common/platforms/platform-backend-k --- opari2-2.0.5/build-config/common/platforms/platform-backend-k 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-k 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=fccpx +CXX=FCCpx +F77=frtpx +FC=frtpx + +#CPPFLAGS= +CFLAGS=-Xg -noansi -Ntl_notrt -mt +CXXFLAGS=-Xg -Ntl_notrt -mt +FFLAGS=-Ntl_notrt -mt +FCFLAGS=-Ntl_notrt -mt +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-linux opari2-2.0.6/build-config/common/platforms/platform-backend-linux --- opari2-2.0.5/build-config/common/platforms/platform-backend-linux 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-linux 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=gcc +CXX=g++ +F77=gfortran +FC=gfortran + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-mac opari2-2.0.6/build-config/common/platforms/platform-backend-mac --- opari2-2.0.5/build-config/common/platforms/platform-backend-mac 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-mac 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=clang +CXX=clang++ +F77=flang +FC=flang + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-mic opari2-2.0.6/build-config/common/platforms/platform-backend-mic --- opari2-2.0.5/build-config/common/platforms/platform-backend-mic 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-mic 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=icc -mmic +CXX=icpc -mmic +F77=ifort -mmic +FC=ifort -mmic + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-mingw opari2-2.0.6/build-config/common/platforms/platform-backend-mingw --- opari2-2.0.5/build-config/common/platforms/platform-backend-mingw 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-mingw 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=gcc +CXX=g++ +F77=gfortran +FC=gfortran + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-necsx opari2-2.0.6/build-config/common/platforms/platform-backend-necsx --- opari2-2.0.5/build-config/common/platforms/platform-backend-necsx 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-necsx 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,16 @@ +# It is necessary to set this because "sxmpic++ -E" always tries to +# link and fails +#CPP="sxcc -E" + +CC=sxcc +CXX=sxc++ +F77=sxf90 +FC=sxf90 + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-solaris opari2-2.0.6/build-config/common/platforms/platform-backend-solaris --- opari2-2.0.5/build-config/common/platforms/platform-backend-solaris 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-solaris 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC=cc +CXX=CC +F77=f77 +FC=f95 + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-backend-user-provided opari2-2.0.6/build-config/common/platforms/platform-backend-user-provided --- opari2-2.0.5/build-config/common/platforms/platform-backend-user-provided 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-backend-user-provided 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC= +CXX= +F77= +FC= + +#CPPFLAGS= +#CFLAGS= +#CXXFLAGS= +#FFLAGS= +#FCFLAGS= +#LDFLAGS= +#LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-aix opari2-2.0.6/build-config/common/platforms/platform-frontend-aix --- opari2-2.0.5/build-config/common/platforms/platform-frontend-aix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-aix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD=-qrtti +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-altix opari2-2.0.6/build-config/common/platforms/platform-frontend-altix --- opari2-2.0.5/build-config/common/platforms/platform-frontend-altix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-altix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-bgl opari2-2.0.6/build-config/common/platforms/platform-frontend-bgl --- opari2-2.0.5/build-config/common/platforms/platform-frontend-bgl 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-bgl 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=xlc_r +CXX_FOR_BUILD=xlC_r +F77_FOR_BUILD=xlf_r +FC_FOR_BUILD=xlf_r + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD=-O2 +CXXFLAGS_FOR_BUILD=-O2 +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD=-O2 +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-bgp opari2-2.0.6/build-config/common/platforms/platform-frontend-bgp --- opari2-2.0.5/build-config/common/platforms/platform-frontend-bgp 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-bgp 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=xlc_r -q64 +CXX_FOR_BUILD=xlC_r -q64 +F77_FOR_BUILD=xlf_r -q64 +FC_FOR_BUILD=xlf_r -q64 + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD=-O2 +CXXFLAGS_FOR_BUILD=-O2 +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD=-O2 +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-bgq opari2-2.0.6/build-config/common/platforms/platform-frontend-bgq --- opari2-2.0.5/build-config/common/platforms/platform-frontend-bgq 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-bgq 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=xlc_r -q64 +CXX_FOR_BUILD=xlC_r -q64 +F77_FOR_BUILD=xlf_r -q64 +FC_FOR_BUILD=xlf_r -q64 + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD=-O2 -qsuppress=1500-030 +CXXFLAGS_FOR_BUILD=-O2 -qsuppress=1500-030 +FFLAGS_FOR_BUILD=-O2 +FCFLAGS_FOR_BUILD=-O2 +LDFLAGS_FOR_BUILD=-O2 +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-crayunknown opari2-2.0.6/build-config/common/platforms/platform-frontend-crayunknown --- opari2-2.0.5/build-config/common/platforms/platform-frontend-crayunknown 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-crayunknown 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=/usr/bin/gcc +CXX_FOR_BUILD=/usr/bin/g++ +F77_FOR_BUILD=/usr/bin/gfortran +FC_FOR_BUILD=/usr/bin/gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxc opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxc --- opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=/usr/bin/gcc +CXX_FOR_BUILD=/usr/bin/g++ +F77_FOR_BUILD=/usr/bin/gfortran +FC_FOR_BUILD=/usr/bin/gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxe opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxe --- opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxe 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=/usr/bin/gcc +CXX_FOR_BUILD=/usr/bin/g++ +F77_FOR_BUILD=/usr/bin/gfortran +FC_FOR_BUILD=/usr/bin/gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxk opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxk --- opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxk 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxk 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=/usr/bin/gcc +CXX_FOR_BUILD=/usr/bin/g++ +F77_FOR_BUILD=/usr/bin/gfortran +FC_FOR_BUILD=/usr/bin/gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxt opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxt --- opari2-2.0.5/build-config/common/platforms/platform-frontend-crayxt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-crayxt 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=/usr/bin/gcc +CXX_FOR_BUILD=/usr/bin/g++ +F77_FOR_BUILD=/usr/bin/gfortran +FC_FOR_BUILD=/usr/bin/gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-fx10 opari2-2.0.6/build-config/common/platforms/platform-frontend-fx10 --- opari2-2.0.5/build-config/common/platforms/platform-frontend-fx10 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-fx10 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=gcc +CXX_FOR_BUILD=g++ +F77_FOR_BUILD=gfortran +FC_FOR_BUILD=gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-fx100 opari2-2.0.6/build-config/common/platforms/platform-frontend-fx100 --- opari2-2.0.5/build-config/common/platforms/platform-frontend-fx100 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-fx100 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=gcc +CXX_FOR_BUILD=g++ +F77_FOR_BUILD=gfortran +FC_FOR_BUILD=gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-k opari2-2.0.6/build-config/common/platforms/platform-frontend-k --- opari2-2.0.5/build-config/common/platforms/platform-frontend-k 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-k 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=gcc +CXX_FOR_BUILD=g++ +F77_FOR_BUILD=gfortran +FC_FOR_BUILD=gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-linux opari2-2.0.6/build-config/common/platforms/platform-frontend-linux --- opari2-2.0.5/build-config/common/platforms/platform-frontend-linux 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-linux 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-mac opari2-2.0.6/build-config/common/platforms/platform-frontend-mac --- opari2-2.0.5/build-config/common/platforms/platform-frontend-mac 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-mac 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-mic opari2-2.0.6/build-config/common/platforms/platform-frontend-mic --- opari2-2.0.5/build-config/common/platforms/platform-frontend-mic 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-mic 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=icc +CXX_FOR_BUILD=icpc +F77_FOR_BUILD=ifort +FC_FOR_BUILD=ifort + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-mingw opari2-2.0.6/build-config/common/platforms/platform-frontend-mingw --- opari2-2.0.5/build-config/common/platforms/platform-frontend-mingw 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-mingw 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-necsx opari2-2.0.6/build-config/common/platforms/platform-frontend-necsx --- opari2-2.0.5/build-config/common/platforms/platform-frontend-necsx 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-necsx 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD=gcc +CXX_FOR_BUILD=g++ +F77_FOR_BUILD=gfortran +FC_FOR_BUILD=gfortran + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-solaris opari2-2.0.6/build-config/common/platforms/platform-frontend-solaris --- opari2-2.0.5/build-config/common/platforms/platform-frontend-solaris 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-solaris 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# not a cross compile platform, frontend ignored + +#CC_FOR_BUILD= +#CXX_FOR_BUILD= +#F77_FOR_BUILD= +#FC_FOR_BUILD= + +#CPPFLAGS_FOR_BUILD= +#CFLAGS_FOR_BUILD= +#CXXFLAGS_FOR_BUILD= +#FFLAGS_FOR_BUILD= +#FCFLAGS_FOR_BUILD= +#LDFLAGS_FOR_BUILD= +#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-frontend-user-provided opari2-2.0.6/build-config/common/platforms/platform-frontend-user-provided --- opari2-2.0.5/build-config/common/platforms/platform-frontend-user-provided 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-frontend-user-provided 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +CC_FOR_BUILD= +CXX_FOR_BUILD= +F77_FOR_BUILD= +FC_FOR_BUILD= + +CPPFLAGS_FOR_BUILD= +CFLAGS_FOR_BUILD= +CXXFLAGS_FOR_BUILD= +FFLAGS_FOR_BUILD= +FCFLAGS_FOR_BUILD= +LDFLAGS_FOR_BUILD= +LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-aix opari2-2.0.6/build-config/common/platforms/platform-mpi-aix --- opari2-2.0.5/build-config/common/platforms/platform-mpi-aix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-aix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpcc_r +MPICXX=mpCC_r +MPIF77=mpxlf_r +MPIFC=mpxlf90_r + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-altix opari2-2.0.6/build-config/common/platforms/platform-mpi-altix --- opari2-2.0.5/build-config/common/platforms/platform-mpi-altix 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-altix 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=icc +MPICXX=icpc +MPIF77=ifort +MPIFC=ifort + +#MPI_LDFLAGS= +MPI_LIBS=-lmpi +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-bgl opari2-2.0.6/build-config/common/platforms/platform-mpi-bgl --- opari2-2.0.5/build-config/common/platforms/platform-mpi-bgl 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-bgl 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=blrts_xlc +MPICXX=blrts_xlC +MPIF77=blrts_xlf +MPIFC=blrts_xlf + +MPI_LDFLAGS=-L/bgl/BlueLight/ppcfloor/bglsys/lib +MPI_LIBS=-lmpich.rts +MPI_CPPFLAGS=-I/bgl/BlueLight/ppcfloor/bglsys/include +#MPI_CFLAGS= +MPI_CXXFLAGS=-O3 -qarch=440 -qtune=440 +MPI_FFLAGS=-qsuppress=cmpmsg +MPI_FCFLAGS=-qfree=f90 -qsuffix=f=f90 -qsuppress=cmpmsg diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-bgp opari2-2.0.6/build-config/common/platforms/platform-mpi-bgp --- opari2-2.0.5/build-config/common/platforms/platform-mpi-bgp 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-bgp 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpixlc_r +MPICXX=mpixlcxx_r +MPIF77=mpixlf77_r +MPIFC=mpixlf95_r + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-bgq opari2-2.0.6/build-config/common/platforms/platform-mpi-bgq --- opari2-2.0.5/build-config/common/platforms/platform-mpi-bgq 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-bgq 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpixlc_r +MPICXX=mpixlcxx_r +MPIF77=mpixlf77_r +MPIFC=mpixlf95_r + +#MPI_CPPFLAGS= +MPI_CFLAGS=-O3 -qstrict +MPI_CXXFLAGS=-O3 -qstrict -qminimaltoc +MPI_FFLAGS=-O3 -qstrict -qsuppress=cmpmsg +MPI_FCFLAGS=-O3 -qstrict -qfree=f90 -qsuppress=cmpmsg +MPI_LDFLAGS=-O3 -qstrict +#MPI_LIBS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-crayunknown opari2-2.0.6/build-config/common/platforms/platform-mpi-crayunknown --- opari2-2.0.5/build-config/common/platforms/platform-mpi-crayunknown 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-crayunknown 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=cc +MPICXX=CC +MPIF77=ftn +MPIFC=ftn + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxc opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxc --- opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=cc +MPICXX=CC +MPIF77=ftn +MPIFC=ftn + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxe opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxe --- opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxe 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=cc +MPICXX=CC +MPIF77=ftn +MPIFC=ftn + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxk opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxk --- opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxk 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxk 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=cc +MPICXX=CC +MPIF77=ftn +MPIFC=ftn + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxt opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxt --- opari2-2.0.5/build-config/common/platforms/platform-mpi-crayxt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-crayxt 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=cc +MPICXX=CC +MPIF77=ftn +MPIFC=ftn + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-fx10 opari2-2.0.6/build-config/common/platforms/platform-mpi-fx10 --- opari2-2.0.5/build-config/common/platforms/platform-mpi-fx10 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-fx10 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpifccpx +MPICXX=mpiFCCpx +MPIF77=mpifrtpx +MPIFC=mpifrtpx + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt +MPI_CXXFLAGS=-Xg -Ntl_notrt -mt +MPI_FFLAGS=-Ntl_notrt -mt +MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-fx100 opari2-2.0.6/build-config/common/platforms/platform-mpi-fx100 --- opari2-2.0.5/build-config/common/platforms/platform-mpi-fx100 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-fx100 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpifccpx +MPICXX=mpiFCCpx +MPIF77=mpifrtpx +MPIFC=mpifrtpx + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt +MPI_CXXFLAGS=-Xg -Ntl_notrt -mt +MPI_FFLAGS=-Ntl_notrt -mt +MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-k opari2-2.0.6/build-config/common/platforms/platform-mpi-k --- opari2-2.0.5/build-config/common/platforms/platform-mpi-k 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-k 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpifccpx +MPICXX=mpiFCCpx +MPIF77=mpifrtpx +MPIFC=mpifrtpx + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt +MPI_CXXFLAGS=-Xg -Ntl_notrt -mt +MPI_FFLAGS=-Ntl_notrt -mt +MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-linux opari2-2.0.6/build-config/common/platforms/platform-mpi-linux --- opari2-2.0.5/build-config/common/platforms/platform-mpi-linux 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-linux 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# can't decide what would be a useful default. use --with-mpi + +#MPICC= +#MPICXX= +#MPIF77= +#MPIFC= + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-mac opari2-2.0.6/build-config/common/platforms/platform-mpi-mac --- opari2-2.0.5/build-config/common/platforms/platform-mpi-mac 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-mac 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +# can't decide what would be a useful default. use --with-mpi + +#MPICC= +#MPICXX= +#MPIF77= +#MPIFC= + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-mic opari2-2.0.6/build-config/common/platforms/platform-mpi-mic --- opari2-2.0.5/build-config/common/platforms/platform-mpi-mic 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-mic 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,13 @@ +MPICC=mpiicc -mmic +MPICXX=mpiicpc -mmic +MPIF77=mpiifort -mmic +MPIFC=mpiifort -mmic +MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX +MPILIB_LDFLAGS=-Wc,-nolinkage + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-necsx opari2-2.0.6/build-config/common/platforms/platform-mpi-necsx --- opari2-2.0.5/build-config/common/platforms/platform-mpi-necsx 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-necsx 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=sxmpicc +MPICXX=sxmpic++ +MPIF77=sxmpif90 +MPIFC=sxmpif90 + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-solaris opari2-2.0.6/build-config/common/platforms/platform-mpi-solaris --- opari2-2.0.5/build-config/common/platforms/platform-mpi-solaris 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-solaris 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC=mpcc +MPICXX=mpCC +MPIF77=mpf77 +MPIFC=mpf95 + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-mpi-user-provided opari2-2.0.6/build-config/common/platforms/platform-mpi-user-provided --- opari2-2.0.5/build-config/common/platforms/platform-mpi-user-provided 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-mpi-user-provided 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,12 @@ +MPICC= +MPICXX= +MPIF77= +MPIFC= + +#MPI_LDFLAGS= +#MPI_LIBS= +#MPI_CPPFLAGS= +#MPI_CFLAGS= +#MPI_CXXFLAGS= +#MPI_FFLAGS= +#MPI_FCFLAGS= diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-crayunknown opari2-2.0.6/build-config/common/platforms/platform-shmem-crayunknown --- opari2-2.0.5/build-config/common/platforms/platform-shmem-crayunknown 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-crayunknown 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +SHMEMCC=cc +SHMEMCXX=CC +SHMEMF77=ftn +SHMEMFC=ftn + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=sma +SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxc opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxc --- opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxc 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +SHMEMCC=cc +SHMEMCXX=CC +SHMEMF77=ftn +SHMEMFC=ftn + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=sma +SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxe opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxe --- opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxe 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxe 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +SHMEMCC=cc +SHMEMCXX=CC +SHMEMF77=ftn +SHMEMFC=ftn + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=sma +SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxk opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxk --- opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxk 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxk 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +SHMEMCC=cc +SHMEMCXX=CC +SHMEMF77=ftn +SHMEMFC=ftn + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=sma +SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxt opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxt --- opari2-2.0.5/build-config/common/platforms/platform-shmem-crayxt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-crayxt 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,14 @@ +SHMEMCC=cc +SHMEMCXX=CC +SHMEMF77=ftn +SHMEMFC=ftn + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +#SHMEM_LIBS= +SHMEM_LIB_NAME=sma +SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms/platform-shmem-user-provided opari2-2.0.6/build-config/common/platforms/platform-shmem-user-provided --- opari2-2.0.5/build-config/common/platforms/platform-shmem-user-provided 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms/platform-shmem-user-provided 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,19 @@ +SHMEMCC= +SHMEMCXX= +SHMEMF77= +SHMEMFC= + +#SHMEM_LDFLAGS= +#SHMEM_CPPFLAGS= +#SHMEM_CFLAGS= +#SHMEM_CXXFLAGS= +#SHMEM_FFLAGS= +#SHMEM_FCFLAGS= +# All libraries needed to link SHMEM applications. +# For example, add '-lsma -lmpi' to SHMEM_LIBS to use SGI SHMEM. +#SHMEM_LIBS= +# Name of the SHMEM library, e.g. 'sma' for SGI SHMEM. +# This name is used by the Score-P instrumenter to detect whether a +# SHMEM application is built. +#SHMEM_LIB_NAME= +SHMEM_NAME=SHMEM diff -Nru opari2-2.0.5/build-config/common/platforms.am opari2-2.0.6/build-config/common/platforms.am --- opari2-2.0.5/build-config/common/platforms.am 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/platforms.am 2021-02-25 12:51:08.219909919 +0000 @@ -0,0 +1,149 @@ +## -*- mode: makefile -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2009-2011, +## RWTH Aachen University, Germany +## +## Copyright (c) 2009-2011, +## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +## +## Copyright (c) 2009-2014, 2019, +## Technische Universitaet Dresden, Germany +## +## Copyright (c) 2009-2011, +## University of Oregon, Eugene, USA +## +## Copyright (c) 2009-2014, 2017, 2020-2021, +## Forschungszentrum Juelich GmbH, Germany +## +## Copyright (c) 2009-2011, +## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +## +## Copyright (c) 2009-2011, +## Technische Universitaet Muenchen, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +## file build-config/common/platforms.inc.am + +# Create platform entries for EXTRA_DIST using e.g.: +# cd build-config/common/platforms +# for i in *; do echo " \$(srcdir)/build-config/common/platforms/$i \\"; done + +EXTRA_DIST += $(srcdir)/build-config/common/process_arguments.awk \ + $(srcdir)/build-config/common/platforms/compiler-frontend-gcc \ + $(srcdir)/build-config/common/platforms/compiler-frontend-ibm \ + $(srcdir)/build-config/common/platforms/compiler-frontend-intel \ + $(srcdir)/build-config/common/platforms/compiler-frontend-pgi \ + $(srcdir)/build-config/common/platforms/compiler-frontend-studio \ + $(srcdir)/build-config/common/platforms/compiler-frontend-clang \ + $(srcdir)/build-config/common/platforms/compiler-frontend-aocc \ + $(srcdir)/build-config/common/platforms/compiler-mpi-bullxmpi \ + $(srcdir)/build-config/common/platforms/compiler-mpi-hp \ + $(srcdir)/build-config/common/platforms/compiler-mpi-ibmpoe \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intelpoe \ + $(srcdir)/build-config/common/platforms/compiler-mpi-lam \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpibull2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-openmpi \ + $(srcdir)/build-config/common/platforms/compiler-mpi-openmpi3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-platform \ + $(srcdir)/build-config/common/platforms/compiler-mpi-scali \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sgimpt \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sgimptwrapper \ + $(srcdir)/build-config/common/platforms/compiler-mpi-spectrum \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sun \ + $(srcdir)/build-config/common/platforms/compiler-mpi-without \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openmpi \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openmpi3 \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openshmem \ + $(srcdir)/build-config/common/platforms/compiler-shmem-sgimpt \ + $(srcdir)/build-config/common/platforms/compiler-shmem-sgimptwrapper \ + $(srcdir)/build-config/common/platforms/compiler-shmem-spectrum \ + $(srcdir)/build-config/common/platforms/compiler-shmem-without \ + $(srcdir)/build-config/common/platforms/compiler-nocross-gcc \ + $(srcdir)/build-config/common/platforms/compiler-nocross-ibm \ + $(srcdir)/build-config/common/platforms/compiler-nocross-intel \ + $(srcdir)/build-config/common/platforms/compiler-nocross-pgi \ + $(srcdir)/build-config/common/platforms/compiler-nocross-studio \ + $(srcdir)/build-config/common/platforms/compiler-nocross-clang \ + $(srcdir)/build-config/common/platforms/compiler-nocross-aocc \ + $(srcdir)/build-config/common/platforms/platform-backend-altix \ + $(srcdir)/build-config/common/platforms/platform-backend-bgl \ + $(srcdir)/build-config/common/platforms/platform-backend-bgp \ + $(srcdir)/build-config/common/platforms/platform-backend-bgq \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxt \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxe \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxk \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxc \ + $(srcdir)/build-config/common/platforms/platform-backend-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-backend-aix \ + $(srcdir)/build-config/common/platforms/platform-backend-linux \ + $(srcdir)/build-config/common/platforms/platform-backend-mac \ + $(srcdir)/build-config/common/platforms/platform-backend-mic \ + $(srcdir)/build-config/common/platforms/platform-backend-mingw \ + $(srcdir)/build-config/common/platforms/platform-backend-necsx \ + $(srcdir)/build-config/common/platforms/platform-backend-solaris \ + $(srcdir)/build-config/common/platforms/platform-backend-k \ + $(srcdir)/build-config/common/platforms/platform-backend-fx10 \ + $(srcdir)/build-config/common/platforms/platform-backend-fx100 \ + $(srcdir)/build-config/common/platforms/platform-backend-user-provided \ + $(srcdir)/build-config/common/platforms/platform-frontend-altix \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgl \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgp \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgq \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxt \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxe \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxk \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxc \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-frontend-aix \ + $(srcdir)/build-config/common/platforms/platform-frontend-linux \ + $(srcdir)/build-config/common/platforms/platform-frontend-mac \ + $(srcdir)/build-config/common/platforms/platform-frontend-mic \ + $(srcdir)/build-config/common/platforms/platform-frontend-mingw \ + $(srcdir)/build-config/common/platforms/platform-frontend-necsx \ + $(srcdir)/build-config/common/platforms/platform-frontend-solaris \ + $(srcdir)/build-config/common/platforms/platform-frontend-k \ + $(srcdir)/build-config/common/platforms/platform-frontend-fx10 \ + $(srcdir)/build-config/common/platforms/platform-frontend-fx100 \ + $(srcdir)/build-config/common/platforms/platform-frontend-user-provided \ + $(srcdir)/build-config/common/platforms/platform-mpi-altix \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgl \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgp \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgq \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxt \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxe \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxk \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxc \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-mpi-aix \ + $(srcdir)/build-config/common/platforms/platform-mpi-linux \ + $(srcdir)/build-config/common/platforms/platform-mpi-mac \ + $(srcdir)/build-config/common/platforms/platform-mpi-mic \ + $(srcdir)/build-config/common/platforms/platform-mpi-necsx \ + $(srcdir)/build-config/common/platforms/platform-mpi-solaris \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxk \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxe \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxt \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxc \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-shmem-user-provided \ + $(srcdir)/build-config/common/platforms/platform-mpi-k \ + $(srcdir)/build-config/common/platforms/platform-mpi-fx10 \ + $(srcdir)/build-config/common/platforms/platform-mpi-fx100 \ + $(srcdir)/build-config/common/platforms/platform-mpi-user-provided + +CLEANFILES += $(builddir)/user_provided_configure_args \ + $(builddir)/mpi_compiler_suite \ + $(builddir)/mpi_compiler_suite_to_source diff -Nru opari2-2.0.5/build-config/common/process_arguments.awk opari2-2.0.6/build-config/common/process_arguments.awk --- opari2-2.0.5/build-config/common/process_arguments.awk 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/build-config/common/process_arguments.awk 2021-02-25 12:51:08.223909931 +0000 @@ -0,0 +1,94 @@ +# We assume that the order of the passed files is +# - frontend compilers +# - backend compilers +# - mpi compilers +# - user-provided arguments +# +# With this order we guarantee that user-provided binary arguments takes +# precedence. They just overwrite already existing binary arguments. +# +# iterate over the fields. if a field is of the form "key=value", store it in +# a map. subsequent insertions of the same key override the old +# value, e.g. the last insertion wins. +# +# fields not in "key=value" form are treated as unary arguments and are taken +# into account for the user-provided toplevel arguments only. + +{ + if (FILENAME == "user_provided_configure_args") { + gsub("'", "") + if ($0 == "") { + next + } + n = index($0, "=") + if (n != 0) { # line with at least one "=". Use first "=" as key-value separator + args_binary[substr($0, 1, n-1)] = substr($0, n+1) + } + else { + args_unary = "'" $0 "' " args_unary + } + } +# else if (FILENAME == "args_exported") { +# # HUH, it seems that exported values doesn't make it into configure +# # if I do a export CC=icc; ./configure then CC always equals gcc. +# # i.e. we can omit "args_exported" +# # don't put every exported symbol into the map but override only those +# # that were inserted by the platform defaults. +# n = split($0, split_array, "=") +# if (n == 2) { +# key = split_array[1] +# if (key in args_binary) { +# args_binary[key]=split_array[2] +# } +# } +# } + else { # FILENAME == "${ac_scorep_platform}" + if (index($0, "#") == 0) { # ! commented line + n = index($0, "=") + if (n != 0) { # line with at least one "=". Use first "=" as key-value separator + args_binary[substr($0, 1, n-1)] = substr($0, n+1) + } + } + } +} + + +function evaluate_placeholder(compiler) +{ + # e.g. transform MPICC="mpiicc -cc={CC}" to MPICC="mpiicc -cc=gcc", + # assuming that CC=gcc + mpi_compiler = "MPI" compiler + pattern = "{" compiler "}" + if (mpi_compiler in args_binary) { + if (match(args_binary[mpi_compiler], pattern) != 0) { + sub(pattern, args_binary[compiler], args_binary[mpi_compiler]) + } + } + + # e.g. transform SHMEMCC={CC} to SHMEMCC="icc", + # assuming that CC=icc + shmem_compiler = "SHMEM" compiler + pattern = "{" compiler "}" + if (shmem_compiler in args_binary) { + if (match(args_binary[shmem_compiler], pattern) != 0) { + sub(pattern, args_binary[compiler], args_binary[shmem_compiler]) + } + } +} + + +END{ + evaluate_placeholder("CC") + evaluate_placeholder("CXX") + evaluate_placeholder("F77") + evaluate_placeholder("FC") + + # Concatenate the map's content into a "key=value" pair sequence, add the + # unary arguments and print it to stdout. + for (key in args_binary) { + result = "'" key "=" args_binary[key] "' " result + } + + print result args_unary +} + diff -Nru opari2-2.0.5/build-config/config.guess opari2-2.0.6/build-config/config.guess --- opari2-2.0.5/build-config/config.guess 2019-07-26 09:16:14.961180143 +0000 +++ opari2-2.0.6/build-config/config.guess 2021-02-25 12:51:12.747924331 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2017-05-27' +timestamp='2021-01-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,19 +27,19 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,8 +84,6 @@ exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,66 +94,89 @@ # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=$( (umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null) && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +UNAME_MACHINE=$( (uname -m) 2>/dev/null) || UNAME_MACHINE=unknown +UNAME_RELEASE=$( (uname -r) 2>/dev/null) || UNAME_RELEASE=unknown +UNAME_SYSTEM=$( (uname -s) 2>/dev/null) || UNAME_SYSTEM=unknown +UNAME_VERSION=$( (uname -v) 2>/dev/null) || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval $set_cc_for_build - cat <<-EOF > $dummy.c + set_cc_for_build + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g')" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -167,32 +188,32 @@ # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ - echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=$( (uname -p 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)) + case "$UNAME_MACHINE_ARCH" in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=$(echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,') + endian=$(echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p') + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -208,10 +229,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=$(echo "$UNAME_MACHINE_ARCH" | sed -e "$expr") ;; esac # The OS release @@ -219,60 +240,75 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=$(echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2) ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi-}" exit ;; *:Bitrig:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + UNAME_MACHINE_ARCH=$(arch | sed 's/Bitrig.//') + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + UNAME_MACHINE_ARCH=$(arch | sed 's/OpenBSD.//') + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + UNAME_MACHINE_ARCH=$(arch | sed 's/^.*BSD\.//') + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" + exit ;; + *:OS108:*:*) + echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix + exit ;; + *:Twizzler:*:*) + echo "$UNAME_MACHINE"-unknown-twizzler + exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $3}') ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=$(/usr/sbin/sizer -v | awk '{print $4}') ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + ALPHA_CPU_TYPE=$(/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1) case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; @@ -310,28 +346,19 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + echo "$UNAME_MACHINE"-dec-osf"$(echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz)" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -343,7 +370,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -353,7 +380,7 @@ exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then + if test "$( (/bin/universe) 2>/dev/null)" = att ; then echo pyramid-pyramid-sysv3 else echo pyramid-pyramid-bsd @@ -366,28 +393,28 @@ echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in + case $(/usr/bin/uname -p) in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"$(echo "$UNAME_RELEASE" | sed -e 's/[^.]*//')" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -395,40 +422,40 @@ SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case "$(/usr/bin/arch -k)" in Series*|S4*) - UNAME_RELEASE=`uname -v` + UNAME_RELEASE=$(uname -v) ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/')" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + UNAME_RELEASE=$( (sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null) + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case "$(/bin/arch)" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -439,44 +466,44 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -485,23 +512,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=$(echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p') && + SYSTEM_NAME=$("$dummy" "$dummyarg") && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -526,18 +553,18 @@ exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + UNAME_PROCESSOR=$(/usr/bin/uname -p) + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -554,26 +581,26 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"$(echo "$UNAME_RELEASE"|sed -e 's/-/_/g')" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit ;; # Note that: echo "'$(uname -s)'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/oslevel ; then + IBM_REV=$(/usr/bin/oslevel) else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -584,7 +611,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") then echo "$SYSTEM_NAME" else @@ -597,28 +624,28 @@ fi exit ;; *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_CPU_ID=$(/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }') + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | - awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` + if test -x /usr/bin/lslpp ; then + IBM_REV=$(/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/) else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -633,28 +660,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in + if test -x /usr/bin/getconf; then + sc_cpu_version=$(/usr/bin/getconf SC_CPU_VERSION 2>/dev/null) + sc_kernel_bits=$(/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null) + case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in + case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if test "$HP_ARCH" = ""; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -687,13 +714,13 @@ exit (0); } EOF - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=$("$dummy") test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -712,15 +739,15 @@ HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//') + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -745,11 +772,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=$("$dummy") && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -758,17 +785,17 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -793,131 +820,123 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + FUJITSU_PROC=$(uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz) + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | sed -e 's/ /_/') echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + FUJITSU_SYS=$(uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///') + FUJITSU_REL=$(echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/') echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" + exit ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=$(uname -p) + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"$(echo ${UNAME_RELEASE}|sed -e 's/[-(].*//')"-gnueabihf + fi exit ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + UNAME_PROCESSOR=$(/usr/bin/uname -p) + case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_PROCESSOR"-unknown-freebsd"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + echo x86_64-pc-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"$(echo "$UNAME_RELEASE"|sed -e 's/[^.]*//')" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo "$(echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,')-unknown-$LIBC$(echo "$UNAME_RELEASE"|sed -e 's,/.*$,,')" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-$(echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]")$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')-$LIBC" exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case $(sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null) in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -928,140 +947,181 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "$($CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI')" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + case $(grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2) in + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; + *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI="$LIBC"x32 + fi + fi + echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1075,51 +1135,51 @@ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=$(echo "$UNAME_RELEASE" | sed 's/\/MP$//') if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in + case $(/bin/uname -X | grep "^Machine") in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + UNAME_REL=$( (/bin/uname -X|grep Release|sed -e 's/.*= //')) (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 @@ -1127,9 +1187,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1149,9 +1209,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1169,41 +1229,41 @@ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + && OS_REL=.$(sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1213,8 +1273,8 @@ exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + UNAME_MACHINE=$( (uname -p) 2>/dev/null) + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1234,23 +1294,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + if test -d /usr/nec; then + echo mips-nec-sysv"$UNAME_RELEASE" else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1269,90 +1329,97 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux${UNAME_RELEASE} + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" + exit ;; + arm64:Darwin:*:*) + echo aarch64-apple-darwin"$UNAME_RELEASE" exit ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + UNAME_PROCESSOR=$(uname -p) + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` + UNAME_PROCESSOR=$(uname -p) if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + echo nsr-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk${UNAME_RELEASE} + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1361,18 +1428,19 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. + # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1393,14 +1461,14 @@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"$(echo "$UNAME_RELEASE"|sed -e 's/[-(].*//')" exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + UNAME_MACHINE=$( (uname -p) 2>/dev/null) + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1409,32 +1477,190 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` + echo "$UNAME_MACHINE"-pc-skyos"$(echo "$UNAME_RELEASE" | sed -e 's/ .*$//')" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + *:AROS:*:*) + echo "$UNAME_MACHINE"-unknown-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; + *:Unleashed:*:*) + echo "$UNAME_MACHINE"-unknown-unleashed"$UNAME_RELEASE" + exit ;; +esac + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=$( (hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=$($dummy) && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 <&2 </dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +uname -m = $( (uname -m) 2>/dev/null || echo unknown) +uname -r = $( (uname -r) 2>/dev/null || echo unknown) +uname -s = $( (uname -s) 2>/dev/null || echo unknown) +uname -v = $( (uname -v) 2>/dev/null || echo unknown) + +/usr/bin/uname -p = $( (/usr/bin/uname -p) 2>/dev/null) +/bin/uname -X = $( (/bin/uname -X) 2>/dev/null) + +hostinfo = $( (hostinfo) 2>/dev/null) +/bin/universe = $( (/bin/universe) 2>/dev/null) +/usr/bin/arch -k = $( (/usr/bin/arch -k) 2>/dev/null) +/bin/arch = $( (/bin/arch) 2>/dev/null) +/usr/bin/oslevel = $( (/usr/bin/oslevel) 2>/dev/null) +/usr/convex/getsysinfo = $( (/usr/convex/getsysinfo) 2>/dev/null) + +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru opari2-2.0.5/build-config/config.sub opari2-2.0.6/build-config/config.sub --- opari2-2.0.5/build-config/config.sub 2019-07-26 09:16:14.965180155 +0000 +++ opari2-2.0.6/build-config/config.sub 2021-02-25 12:51:12.751924343 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2017-04-02' +timestamp='2021-01-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -50,14 +50,14 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -me=`echo "$0" | sed -e 's,.*/,,'` +me=$(echo "$0" | sed -e 's,.*/,,') usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -67,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2017 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -89,12 +89,12 @@ - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -110,1252 +110,1169 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 - ;; - -lynx*) - os=-lynxos +# Split fields of configuration type +# shellcheck disable=SC2162 +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | we32k \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" + cpu=m68k + vendor=motorola ;; - e500v[12]-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + dpx2*) + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=$(echo "$1" | sed -e 's/86.*/86/') + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=$(echo "$1" | sed -e 's/86.*/86/') + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=$(echo "$1" | sed -e 's/86.*/86/') + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + cpu=$(echo "$1" | sed -e 's/86.*/86/') + vendor=pc + basic_os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint + cpu=m68000 + vendor=convergent ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=mips + vendor=sony + basic_os=newsos + ;; + next | m*-next) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc + cpu=m68k + vendor=tti ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc + pc532) + cpu=ns32k + vendor=pc532 ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc + pn) + cpu=pn + vendor=gould ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ps2) + cpu=i386 + vendor=ibm ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + rm[46]00) + cpu=mips + vendor=siemens ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - pn) - basic_machine=pn-gould + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} + ;; + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - power) basic_machine=power-ibm + tower | tower-32) + cpu=m68k + vendor=ncr ;; - ppc | ppcbe) basic_machine=powerpc-unknown + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + w65) + cpu=w65 + vendor=wdc ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + none) + cpu=none + vendor=none ;; - ppc64) basic_machine=powerpc64-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + leon-*|leon[3-9]-*) + cpu=sparc + vendor=$(echo "$basic_machine" | sed 's/-.*//') ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown + + *-*) + # shellcheck disable=SC2162 + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1363,203 +1280,213 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x$basic_os != x then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=$(echo $basic_os | sed -e 's|gnu/linux|gnu|') + ;; + os2-emx) + kernel=os2 + os=$(echo $basic_os | sed -e 's|os2-emx|emx|') + ;; + nto-qnx*) + kernel=nto + os=$(echo $basic_os | sed -e 's|nto-qnx|qnx|') + ;; + *-*) + # shellcheck disable=SC2162 + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1572,264 +1499,361 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; - *-next ) - os=-nextstep + *-next) + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* | linux-musl* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru opari2-2.0.5/build-config/ltmain.sh opari2-2.0.6/build-config/ltmain.sh --- opari2-2.0.5/build-config/ltmain.sh 2019-07-26 09:16:20.017195877 +0000 +++ opari2-2.0.6/build-config/ltmain.sh 2021-02-25 12:51:18.975944154 +0000 @@ -7071,8 +7071,7 @@ ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*|-homp \ - |-qopenmp|-Popenmp|--openmp|-Kopenmp) + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -7606,8 +7605,7 @@ found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*|-homp \ - |-qopenmp|-Popenmp|--openmp|-Kopenmp) + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -8148,21 +8146,6 @@ esac # This is a shared library - # Cray's compiler drivers need a -dynamic flag if any linked - # library is a shared library. Ensure it gets this flag. - case `$CC -V 2>&1 | sed 5q` in - *Cray*) - case " $compile_command " in - *" -dynamic ") ;; - *) func_append compile_command " -dynamic" ;; - esac - case " $finalize_command " in - *" -dynamic ") ;; - *) func_append finalize_command " -dynamic" ;; - esac - ;; - esac - # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! dlopenmodule= @@ -8601,10 +8584,7 @@ # practice: case $deplib in -L*) new_libs="$deplib $new_libs" ;; - -R*) - if test prog = "$linkmode"; then - new_libs="$deplib $new_libs" - fi ;; + -R*) ;; *) # And here is the reason: when a library appears more # than once as an explicit dependence of a library, or @@ -10243,24 +10223,7 @@ finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac - if test -n "$dlfiles" || - test "$dlself" = "yes" || - test "$export_dynamic" = "yes"; then - # Cray's compiler drivers need a -dynamic flag if the program - # is going to be dlopening itself or any libraries. - case `$CC -V 2>&1 | sed 5q` in - *Cray*) - case " $compile_command " in - *" -dynamic ") ;; - *) func_append compile_command " -dynamic" ;; - esac - case " $finalize_command " in - *" -dynamic ") ;; - *) func_append finalize_command " -dynamic" ;; - esac - ;; - esac - fi + # move library search paths that coincide with paths to not yet # installed libraries to the beginning of the library search list diff -Nru opari2-2.0.5/build-config/m4/libtool.m4 opari2-2.0.6/build-config/m4/libtool.m4 --- opari2-2.0.5/build-config/m4/libtool.m4 2019-07-26 09:16:20.037195939 +0000 +++ opari2-2.0.6/build-config/m4/libtool.m4 2021-02-25 12:51:18.995944218 +0000 @@ -1543,9 +1543,7 @@ m4_defun([_LT_CMD_OLD_ARCHIVE], [_LT_PROG_AR -# Cray's compiler drivers need STRIP to be an absolute file name when -# static linking. -AC_PATH_TOOL(STRIP, strip, :) +AC_CHECK_TOOL(STRIP, strip, :) test -z "$STRIP" && STRIP=: _LT_DECL([], [STRIP], [1], [A symbol stripping program]) @@ -4750,6 +4748,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + armflang* | flang*) + # Flang and ARM HPC Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -DPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4807,6 +4811,11 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + *xlf*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' + ;; esac ;; esac @@ -5252,21 +5261,39 @@ tmp_sharedflag='--shared' ;; nagfor*) # NAGFOR 5.3 tmp_sharedflag='-Wl,-shared' ;; - xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also below + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - _LT_TAGVAR(compiler_needs_object, $1)=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + _LT_TAGVAR(compiler_needs_object, $1)=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *xlc*) # IBM XL C + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + *xlf*) # IBM xlf since version 13 knows about -qmkshrobj + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; + esac esac _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -5281,7 +5308,21 @@ tcc*) _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; - xlf* | bgf* | bgxlf* | mpixlf*) + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also above + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -lt 13; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + fi + ;; + bgf* | bgxlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' @@ -7176,7 +7217,18 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; - esac + *xlC* | *xlc++* ) # IBM XL + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + esac ;; esac ;; diff -Nru opari2-2.0.5/build-config/REVISION opari2-2.0.6/build-config/REVISION --- opari2-2.0.5/build-config/REVISION 2019-07-26 09:16:33.781238699 +0000 +++ opari2-2.0.6/build-config/REVISION 2021-02-25 12:51:38.412006027 +0000 @@ -1 +1 @@ -1824 +v2.0.6 diff -Nru opari2-2.0.5/build-config/REVISION_COMMON opari2-2.0.6/build-config/REVISION_COMMON --- opari2-2.0.5/build-config/REVISION_COMMON 2019-07-26 09:16:25.901214185 +0000 +++ opari2-2.0.6/build-config/REVISION_COMMON 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2415 diff -Nru opari2-2.0.5/build-config/test-driver opari2-2.0.6/build-config/test-driver --- opari2-2.0.5/build-config/test-driver 2019-07-26 09:16:25.669213464 +0000 +++ opari2-2.0.6/build-config/test-driver 2021-02-25 12:51:12.839924623 +0000 @@ -74,7 +74,7 @@ done if test $color_tests = yes; then - # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. + # Keep this in sync with 'lib/am/header-vars.am:$(am__tty_colors)'. red='' # Red. grn='' # Green. lgn='' # Light green. diff -Nru opari2-2.0.5/build-config/VERSION opari2-2.0.6/build-config/VERSION --- opari2-2.0.5/build-config/VERSION 2019-07-26 09:16:10.857167370 +0000 +++ opari2-2.0.6/build-config/VERSION 2021-02-25 12:51:08.215909906 +0000 @@ -9,7 +9,7 @@ package.major=2 package.minor=0 -package.bugfix=5 +package.bugfix=6 package.suffix= # In the POMP2 case library.revision makes no sense as opari2 just provides diff -Nru opari2-2.0.5/build-frontend/aclocal.m4 opari2-2.0.6/build-frontend/aclocal.m4 --- opari2-2.0.5/build-frontend/aclocal.m4 2019-07-26 09:16:23.169205685 +0000 +++ opari2-2.0.6/build-frontend/aclocal.m4 2021-02-25 12:51:23.323957995 +0000 @@ -78,7 +78,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], [am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], - [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' + [am_ar_try='$AR cr libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) if test "$ac_status" -eq 0; then am_cv_ar_interface=ar @@ -1218,19 +1218,20 @@ AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([../vendor/common/build-config/m4/ac_common_package.m4]) -m4_include([../vendor/common/build-config/m4/ac_recursive_eval.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_c99.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_compiler_checks.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_fortran_checks.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_svn_controlled.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_sys_detection.m4]) -m4_include([../vendor/common/build-config/m4/ac_scorep_version_and_revision.m4]) -m4_include([../vendor/common/build-config/m4/afs_am_conditional.m4]) -m4_include([../vendor/common/build-config/m4/afs_maintainer_mode.m4]) -m4_include([../vendor/common/build-config/m4/ax_compiler_vendor.m4]) -m4_include([../vendor/common/build-config/m4/ax_compiler_version.m4]) +m4_include([../build-config/common/m4/ac_common_package.m4]) +m4_include([../build-config/common/m4/ac_recursive_eval.m4]) +m4_include([../build-config/common/m4/ac_scorep_c99.m4]) +m4_include([../build-config/common/m4/ac_scorep_compiler_and_flags.m4]) +m4_include([../build-config/common/m4/ac_scorep_compiler_checks.m4]) +m4_include([../build-config/common/m4/ac_scorep_fortran_checks.m4]) +m4_include([../build-config/common/m4/ac_scorep_git_controlled.m4]) +m4_include([../build-config/common/m4/ac_scorep_sys_detection.m4]) +m4_include([../build-config/common/m4/ac_scorep_version_and_revision.m4]) +m4_include([../build-config/common/m4/afs_am_conditional.m4]) +m4_include([../build-config/common/m4/afs_maintainer_mode.m4]) +m4_include([../build-config/common/m4/afs_summary.m4]) +m4_include([../build-config/common/m4/ax_compiler_vendor.m4]) +m4_include([../build-config/common/m4/ax_compiler_version.m4]) m4_include([../build-config/m4/libtool.m4]) m4_include([../build-config/m4/ltoptions.m4]) m4_include([../build-config/m4/ltsugar.m4]) diff -Nru opari2-2.0.5/build-frontend/configure opari2-2.0.6/build-frontend/configure --- opari2-2.0.5/build-frontend/configure 2019-07-26 09:16:24.361209394 +0000 +++ opari2-2.0.6/build-frontend/configure 2021-02-25 12:51:24.991963304 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OPARI2 2.0.5. +# Generated by GNU Autoconf 2.69 for OPARI2 2.0.6. # # Report bugs to . # @@ -81,6 +81,37 @@ fi +# need to catch these variables, before unsetting them later +: ${AS_COLOR:=$CLICOLOR}; export AS_COLOR +: ${AS_COLOR_FORCE:=$CLICOLOR_FORCE}; export AS_COLOR_FORCE + +as__red= +as__grn= +as__yel= +as__blu= +as__mag= +as__cya= +as__gry= +as__std= +as__color=no +if test "X$AS_COLOR_FORCE" = X0; then + as__color=no; +elif test "X$AS_COLOR_FORCE" = X1; then + as__color=yes +elif { test "X$TERM" != Xdumb || test "X$AS_COLOR" = X1; } && { test -t 1; } 2>/dev/null; then + as__color=yes +fi +if test $as__color = yes; then + as__red='' + as__grn='' + as__yel='' + as__blu='' + as__mag='' + as__cya='' + as__gry='' + as__std='' +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -423,7 +454,7 @@ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: ${as__red}error: $2${as__std}" >&2 as_fn_exit $as_status } # as_fn_error @@ -590,8 +621,8 @@ # Identity of this package. PACKAGE_NAME='OPARI2' PACKAGE_TARNAME='opari2' -PACKAGE_VERSION='2.0.5' -PACKAGE_STRING='OPARI2 2.0.5' +PACKAGE_VERSION='2.0.6' +PACKAGE_STRING='OPARI2 2.0.6' PACKAGE_BUGREPORT='support@score-p.org' PACKAGE_URL='' @@ -685,6 +716,10 @@ host_vendor host_cpu host +build_os +build_vendor +build_cpu +build LIBTOOL LIBRARY_AGE LIBRARY_REVISION @@ -743,7 +778,6 @@ SCOREP_COMPILER_SUN_TRUE SCOREP_COMPILER_INTEL_FALSE SCOREP_COMPILER_INTEL_TRUE -SED PLATFORM_CRAY_FALSE PLATFORM_CRAY_TRUE PLATFORM_FX100_FALSE @@ -754,8 +788,6 @@ PLATFORM_K_TRUE PLATFORM_MINGW_FALSE PLATFORM_MINGW_TRUE -PLATFORM_ARM_FALSE -PLATFORM_ARM_TRUE PLATFORM_NECSX_FALSE PLATFORM_NECSX_TRUE PLATFORM_MIC_FALSE @@ -766,6 +798,8 @@ PLATFORM_SOLARIS_TRUE PLATFORM_LINUX_FALSE PLATFORM_LINUX_TRUE +PLATFORM_CRAYUNKNOWN_FALSE +PLATFORM_CRAYUNKNOWN_TRUE PLATFORM_CRAYXC_FALSE PLATFORM_CRAYXC_TRUE PLATFORM_CRAYXK_FALSE @@ -784,10 +818,6 @@ PLATFORM_AIX_TRUE PLATFORM_ALTIX_FALSE PLATFORM_ALTIX_TRUE -build_os -build_vendor -build_cpu -build BUILD_TESTS_FALSE BUILD_TESTS_TRUE MAINT @@ -839,8 +869,9 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -SVN_CONTROLLED_FALSE -SVN_CONTROLLED_TRUE +SED +GIT_CONTROLLED_FALSE +GIT_CONTROLLED_TRUE BINDIR INCLUDEDIR LIBS_FOR_BUILD @@ -857,8 +888,8 @@ LIBRARY_INTERFACE_VERSION AFS_PACKAGE_BUILD_NAME AFS_PACKAGE_BUILD_name -afs_srcdir AFS_PACKAGE_TO_TOP +afs_srcdir AFS_PACKAGE_NAME AFS_PACKAGE_name target_alias @@ -1345,9 +1376,9 @@ *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: ${as__yel}WARNING: you should use --build, --host, --target${as__std}" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: ${as__yel}WARNING: invalid host type: $ac_option${as__std}" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1363,7 +1394,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: ${as__yel}WARNING: unrecognized options: $ac_unrecognized_opts${as__std}" >&2 ;; esac fi @@ -1484,7 +1515,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OPARI2 2.0.5 to adapt to many kinds of systems. +\`configure' configures OPARI2 2.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1554,7 +1585,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OPARI2 2.0.5:";; + short | recursive ) echo "Configuration of OPARI2 2.0.6:";; esac cat <<\_ACEOF @@ -1692,7 +1723,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: ${as__yel}WARNING: no configuration information is in $ac_dir${as__std}" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1701,7 +1732,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OPARI2 configure 2.0.5 +OPARI2 configure 2.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2302,7 +2333,14 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +case "$ac_res" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_res${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_res${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_res${as__std}" >&6 ;; +esac; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2406,7 +2444,14 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } +case "$ac_res" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_res${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_res${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_res${as__std}" >&6 ;; +esac; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2451,7 +2496,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OPARI2 $as_me 2.0.5, which was +It was created by OPARI2 $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2574,7 +2619,7 @@ *${as_nl}*) case $ac_var in #( *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: cache variable $ac_var contains a newline${as__std}" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2703,14 +2748,14 @@ do test "x$ac_site_file" = xNONE && continue if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: loading site script $ac_site_file" >&5 +$as_echo "$as_me: ${as__blu}info: loading site script $ac_site_file${as__std}" >&2;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "failed to load site script $ac_site_file" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2718,16 +2763,16 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: loading cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: loading cache $cache_file${as__std}" >&2;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: creating cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: creating cache $cache_file${as__std}" >&2;} >$cache_file fi @@ -2810,6 +2855,9 @@ +afs_srcdir=$srcdir + + @@ -2820,22 +2868,22 @@ -AFS_PACKAGE_TO_TOP=../ +AFS_PACKAGE_TO_TOP=../ -# when building inplace, $srcdir equals ., ignore $srcdir than case $srcdir in #( .) : afs_srcdir="../" ;; #( *) : afs_srcdir="${srcdir}/../" ;; esac + cat >>confdefs.h <<_ACEOF #define AFS_PACKAGE_SRCDIR "${afs_srcdir}" _ACEOF - +afs_srcdir=${afs_srcdir%/} cat >>confdefs.h <<_ACEOF @@ -3021,10 +3069,22 @@ -ac_scorep_svn_controlled="no" -svn info ${srcdir} > /dev/null 2>&1 -if test $? -eq 0; then : - ac_scorep_svn_controlled="yes" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Git controlled" >&5 +$as_echo_n "checking Git controlled... " >&6; } +ac_scorep_git_controlled="no" + +# test if ${afs_srcdir} is a git top-level, not any parent directory: +# * if ${afs_srcdir} is a top-level, than the prefix is empty (e.g., we are git controlled) +# * if ${afs_srcdir} is below a top-level, than it wont be empty (e.g., we operate in a +# tarball, which was extracted below a top-level) +# * if git could not find any top-level, it prints an error to stderr and stop, +# we catch this error, which makes the test also fail (e.g., we operate in a +# tarball which is *not* below any top-level) +if test -z "$( + unset $(git rev-parse --local-env-vars 2>/dev/null) && + cd ${afs_srcdir} && + git rev-parse --show-prefix 2>&1)"; then : + ac_scorep_git_controlled="yes" $as_echo "#define SCOREP_IN_DEVELOPEMENT /**/" >>confdefs.h @@ -3033,12 +3093,187 @@ $as_echo "#define SCOREP_IN_PRODUCTION /**/" >>confdefs.h fi - if test "x${ac_scorep_svn_controlled}" = xyes; then - SVN_CONTROLLED_TRUE= - SVN_CONTROLLED_FALSE='#' +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_git_controlled" >&5 +case "$ac_scorep_git_controlled" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_git_controlled${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_git_controlled${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_git_controlled${as__std}" >&6 ;; +esac; } + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +case "$ac_cv_path_SED" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_SED${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_SED${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_SED${as__std}" >&6 ;; +esac; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + + + +# afs_fn_summary DESCR VALUE INDENT WRAP-MARGIN=128 +# ---------------------------------------------------------------------- +# Produces a line-wrapped summary line with DESCR and VALUE, indented by +# INDENT and wrapped at WRAP-MARGIN. +afs_fn_summary () +{ + _afs_summary_wrap_width=${4-128} + _afs_summary_column_width=32 + _afs_summary_prefix="${3-} ${1-}:" + printf "%s" "${_afs_summary_prefix}" + _afs_summary_padding="$(printf "%-${_afs_summary_column_width}s" "")" + _afs_summary_value="$(echo "${2-}" | $SED -e 's/ */ /g' -e 's/^ //' -e 's/ $//')" + if test ${#_afs_summary_prefix} -ge ${#_afs_summary_padding}; then : + + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" + +else + + as_fn_arith ${#_afs_summary_padding} - ${#_afs_summary_prefix} && + _afs_summary_nl="$(printf "%-${as_val}s" "")" + +fi + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + while test -n "${_afs_summary_value}" + do + _afs_summary_entry="${_afs_summary_value%% *}" + printf "%s" "${_afs_summary_nl}${_afs_summary_sep}${_afs_summary_entry}" + + case "${_afs_summary_value}" in + (*" "*) _afs_summary_value="${_afs_summary_value#* }" ;; + (*) _afs_summary_value="" ;; + esac + + as_fn_arith ${_afs_summary_column} + ${#_afs_summary_entry} + ${#_afs_summary_sep} && + _afs_summary_column=$as_val + if test ${_afs_summary_column} -ge ${_afs_summary_wrap_width}; then : + + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + +else + + _afs_summary_sep=" " + _afs_summary_nl="" + +fi + done + echo +{ _afs_summary_column_width=; unset _afs_summary_column_width;} +{ _afs_summary_wrap_width=; unset _afs_summary_wrap_width;} +{ _afs_summary_prefix=; unset _afs_summary_prefix;} +{ _afs_summary_padding=; unset _afs_summary_padding;} +{ _afs_summary_value=; unset _afs_summary_value;} +{ _afs_summary_nl=; unset _afs_summary_nl;} +{ _afs_summary_sep=; unset _afs_summary_sep;} +{ _afs_summary_column=; unset _afs_summary_column;} +{ _afs_summary_entry=; unset _afs_summary_entry;} +{ _afs_summary_tag=; unset _afs_summary_tag;} +{ _afs_summary_tag_final=; unset _afs_summary_tag_final;} + +} # afs_fn_summary + + +rm -f opari2.summary +LC_ALL=C find . -name 'config.summary*' -exec rm -f '{}' \; + +afs_fn_summary \ + "OPARI2 (frontend)" \ + "" \ + " " \ + >config.summary + + + + if test "x${ac_scorep_git_controlled}" = xyes; then + GIT_CONTROLLED_TRUE= + GIT_CONTROLLED_FALSE='#' else - SVN_CONTROLLED_TRUE='#' - SVN_CONTROLLED_FALSE= + GIT_CONTROLLED_TRUE='#' + GIT_CONTROLLED_FALSE= +fi + + + +if test "x${verbose}" = "xyes"; then : + + +afs_fn_summary "Git controlled" "$ac_scorep_git_controlled" " " >>config.summary + fi @@ -3128,7 +3363,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +case "$INSTALL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$INSTALL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$INSTALL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$INSTALL${as__std}" >&6 ;; +esac; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -3194,7 +3436,7 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -3232,7 +3474,7 @@ else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: 'missing' script is too old or missing${as__std}" >&2;} fi if test x"${install_sh}" != xset; then @@ -3280,10 +3522,17 @@ STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +case "$STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3320,10 +3569,17 @@ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } +case "$ac_ct_STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -3332,7 +3588,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -3384,7 +3640,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +case "$MKDIR_P" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$MKDIR_P${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$MKDIR_P${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$MKDIR_P${as__std}" >&6 ;; +esac; } for ac_prog in gawk mawk nawk awk do @@ -3418,10 +3681,17 @@ AWK=$ac_cv_prog_AWK if test -n "$AWK"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +case "$AWK" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$AWK${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$AWK${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$AWK${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3451,11 +3721,11 @@ fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } SET_MAKE= else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -3497,7 +3767,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +case "$am_cv_make_support_nested_variables" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_make_support_nested_variables${as__std}" >&6 ;; +esac; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3529,7 +3806,7 @@ # Define the identity of the package. PACKAGE='opari2' - VERSION='2.0.5' + VERSION='2.0.6' cat >>confdefs.h <<_ACEOF @@ -3658,7 +3935,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 -$as_echo "$am_cv_prog_tar_pax" >&6; } +case "$am_cv_prog_tar_pax" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_prog_tar_pax${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_prog_tar_pax${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_prog_tar_pax${as__std}" >&6 ;; +esac; } @@ -3694,7 +3978,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +case "$am_cv_make_support_nested_variables" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_make_support_nested_variables${as__std}" >&6 ;; +esac; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -3745,7 +4036,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } +case "$_am_result" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$_am_result${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$_am_result${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$_am_result${as__std}" >&6 ;; +esac; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. @@ -3803,10 +4101,17 @@ CC=$ac_cv_prog_CC if test -n "$CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +case "$CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3843,10 +4148,17 @@ ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } +case "$ac_ct_CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -3855,7 +4167,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3896,10 +4208,17 @@ CC=$ac_cv_prog_CC if test -n "$CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +case "$CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3953,10 +4272,17 @@ CC=$ac_cv_prog_CC if test -n "$CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +case "$CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3995,10 +4321,17 @@ CC=$ac_cv_prog_CC if test -n "$CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } +case "$CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -4039,10 +4372,17 @@ ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } +case "$ac_ct_CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_CC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -4055,7 +4395,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -4066,9 +4406,9 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4176,22 +4516,29 @@ fi if test -z "$ac_file"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error 77 "C compiler cannot create executables" "$LINENO" 5 +as_fn_error 77 "See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 $as_echo_n "checking for C compiler default output file name... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +case "$ac_file" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_file${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_file${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_file${as__std}" >&6 ;; +esac; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out @@ -4224,13 +4571,20 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +case "$ac_cv_exeext" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_exeext${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_exeext${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_exeext${as__std}" >&6 ;; +esac; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -4282,15 +4636,22 @@ cross_compiling=yes else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +If you meant to cross compile, use \`--host'." "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +case "$cross_compiling" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$cross_compiling${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$cross_compiling${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$cross_compiling${as__std}" >&6 ;; +esac; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save @@ -4335,14 +4696,21 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +case "$ac_cv_objext" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_objext${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_objext${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_objext${as__std}" >&6 ;; +esac; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 @@ -4374,7 +4742,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +case "$ac_cv_c_compiler_gnu" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_c_compiler_gnu${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_c_compiler_gnu${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_c_compiler_gnu${as__std}" >&6 ;; +esac; } if test $ac_compiler_gnu = yes; then GCC=yes else @@ -4444,7 +4819,14 @@ ac_c_werror_flag=$ac_save_c_werror_flag fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +case "$ac_cv_prog_cc_g" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_cc_g${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_cc_g${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_cc_g${as__std}" >&6 ;; +esac; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -4537,14 +4919,28 @@ case "x$ac_cv_prog_cc_c89" in x) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; +case "none needed" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}none needed${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}none needed${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}none needed${as__std}" >&6 ;; +esac; } ;; xno) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; +$as_echo "${as__red}unsupported${as__std}" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +case "$ac_cv_prog_cc_c89" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_cc_c89${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_cc_c89${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_cc_c89${as__std}" >&6 ;; +esac; } ;; esac if test "x$ac_cv_prog_cc_c89" != xno; then : @@ -4670,7 +5066,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +case "$am_cv_CC_dependencies_compiler_type" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_CC_dependencies_compiler_type${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_CC_dependencies_compiler_type${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_CC_dependencies_compiler_type${as__std}" >&6 ;; +esac; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4718,10 +5121,17 @@ AR=$ac_cv_prog_AR if test -n "$AR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +case "$AR" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$AR${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$AR${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$AR${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -4762,10 +5172,17 @@ ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } +case "$ac_ct_AR" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_AR${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_AR${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_AR${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -4778,7 +5195,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -4798,7 +5215,7 @@ int some_variable = 0; _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5' + am_ar_try='$AR cr libconftest.a conftest.$ac_objext >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5 (eval $am_ar_try) 2>&5 ac_status=$? @@ -4826,7 +5243,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 -$as_echo "$am_cv_ar_interface" >&6; } +case "$am_cv_ar_interface" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_ar_interface${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_ar_interface${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_ar_interface${as__std}" >&6 ;; +esac; } case $am_cv_ar_interface in ar) @@ -4846,7 +5270,7 @@ esac -if test "x${ac_scorep_svn_controlled}" = xyes; then : +if test "x${ac_scorep_git_controlled}" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -4858,7 +5282,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } +case "$USE_MAINTAINER_MODE" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$USE_MAINTAINER_MODE${as__std}" >&6 ;; +esac; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -4882,7 +5313,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } +case "$USE_MAINTAINER_MODE" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$USE_MAINTAINER_MODE${as__std}" >&6 ;; +esac; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -4915,46 +5353,6 @@ BUILD_TESTS_FALSE= fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; -esac -build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac - - - - if test "x${ac_scorep_platform}" = "xaltix"; then PLATFORM_ALTIX_TRUE= @@ -4964,7 +5362,7 @@ PLATFORM_ALTIX_FALSE= fi - if test "x${ac_scorep_platform}" = "xaix" && test "x${build_cpu}" = "xpowerpc"; then + if test "x${ac_scorep_platform}" = "xaix"; then PLATFORM_AIX_TRUE= PLATFORM_AIX_FALSE='#' else @@ -5028,6 +5426,14 @@ PLATFORM_CRAYXC_FALSE= fi + if test "x${ac_scorep_platform}" = "xcrayunknown"; then + PLATFORM_CRAYUNKNOWN_TRUE= + PLATFORM_CRAYUNKNOWN_FALSE='#' +else + PLATFORM_CRAYUNKNOWN_TRUE='#' + PLATFORM_CRAYUNKNOWN_FALSE= +fi + if test "x${ac_scorep_platform}" = "xlinux"; then PLATFORM_LINUX_TRUE= PLATFORM_LINUX_FALSE='#' @@ -5068,14 +5474,6 @@ PLATFORM_NECSX_FALSE= fi - if test "x${ac_scorep_platform}" = "xarm"; then - PLATFORM_ARM_TRUE= - PLATFORM_ARM_FALSE='#' -else - PLATFORM_ARM_TRUE='#' - PLATFORM_ARM_FALSE= -fi - if test "x${ac_scorep_platform}" = "xmingw"; then PLATFORM_MINGW_TRUE= PLATFORM_MINGW_FALSE='#' @@ -5110,7 +5508,7 @@ case ${ac_scorep_platform} in #( - crayx*) : + cray*) : afs_platform_cray="yes" ;; #( *) : afs_platform_cray="no" ;; @@ -5174,6 +5572,11 @@ $as_echo "#define HAVE_PLATFORM_CRAYXC 1" >>confdefs.h fi + if test -z "$PLATFORM_CRAYUNKNOWN_TRUE"; then : + +$as_echo "#define HAVE_PLATFORM_CRAYUNKNOWN 1" >>confdefs.h + +fi if test -z "$PLATFORM_LINUX_TRUE"; then : $as_echo "#define HAVE_PLATFORM_LINUX 1" >>confdefs.h @@ -5199,11 +5602,6 @@ $as_echo "#define HAVE_PLATFORM_NECSX 1" >>confdefs.h fi - if test -z "$PLATFORM_ARM_TRUE"; then : - -$as_echo "#define HAVE_PLATFORM_ARM 1" >>confdefs.h - -fi if test -z "$PLATFORM_MINGW_TRUE"; then : $as_echo "#define HAVE_PLATFORM_MINGW 1" >>confdefs.h @@ -5227,791 +5625,66 @@ # + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5 +$as_echo_n "checking for C compiler vendor... " >&6; } +if ${ax_cv_c_compiler_vendor+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi + vendors=" + intel: __ICC,__ECC,__INTEL_COMPILER + ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__ + pathscale: __PATHCC__,__PATHSCALE__ + clang: __clang__ + cray: _CRAYC,_CRAYFTN + fujitsu: __FUJITSU + sdcc: SDCC,__SDCC + sx: _SX + portland: __PGI + gnu: __GNUC__ + sun: __SUNPRO_C,__SUNPRO_CC,__SUNPRO_F90,__SUNPRO_F95 + hp: __HP_cc,__HP_aCC + dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER + borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ + comeau: __COMO__ + kai: __KCC + lcc: __LCC__ + sgi: __sgi,sgi + microsoft: _MSC_VER + metrowerks: __MWERKS__ + watcom: __WATCOMC__ + tcc: __TINYC__ + unknown: UNKNOWN + " + for ventest in $vendors; do + case $ventest in #( + *:) + vendor=${ventest%:*} + continue + ;; #( + *) + vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" + ;; + esac - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -depcc="$CC" am_compiler_list= - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named 'D' -- because '-MD' means "put the output - # in D". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_CC_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` - fi - am__universal=false - case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with - # Solaris 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with '-c' and '-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle '-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # After this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested. - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok '-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_CC_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_CC_dependencies_compiler_type=none -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } -CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - if - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then - am__fastdepCC_TRUE= - am__fastdepCC_FALSE='#' -else - am__fastdepCC_TRUE='#' - am__fastdepCC_FALSE= -fi - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ - for ac_i in 1 2 3 4 5 6 7; do - ac_script="$ac_script$as_nl$ac_script" - done - echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed - { ac_script=; unset ac_script;} - if test -z "$SED"; then - ac_path_SED_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_SED" || continue -# Check for GNU ac_path_SED and select it if it is found. - # Check for GNU $ac_path_SED -case `"$ac_path_SED" --version 2>&1` in -*GNU*) - ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" - "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_SED_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_SED="$ac_path_SED" - ac_path_SED_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_SED_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_SED"; then - as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 - fi -else - ac_cv_path_SED=$SED -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } - SED="$ac_cv_path_SED" - rm -f conftest.sed - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler vendor" >&5 -$as_echo_n "checking for C compiler vendor... " >&6; } -if ${ax_cv_c_compiler_vendor+:} false; then : - $as_echo_n "(cached) " >&6 -else - # note: don't check for gcc first since some other compilers define __GNUC__ - vendors="intel: __ICC,__ECC,__INTEL_COMPILER - ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__ - pathscale: __PATHCC__,__PATHSCALE__ - clang: __clang__ - cray: _CRAYC - fujitsu: __FUJITSU - portland: __PGI - gnu: __GNUC__ - sun: __SUNPRO_C,__SUNPRO_CC - hp: __HP_cc,__HP_aCC - dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER - borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ - comeau: __COMO__ - kai: __KCC - lcc: __LCC__ - sgi: __sgi,sgi - microsoft: _MSC_VER - metrowerks: __MWERKS__ - watcom: __WATCOMC__ - tcc: __TINYC__ - unknown: UNKNOWN" - for ventest in $vendors; do - case $ventest in #( - *:) vendor=${ventest%:*}; continue ;; #( - *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; - esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () { - #if !($vencpp) - thisisanerror; - #endif +#if !($vencpp) + thisisanerror; +#endif ; return 0; @@ -6021,25 +5694,32 @@ break fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - ax_cv_c_compiler_vendor=$vendor - portland_variants="llvm: __PGLLVM__" - eval variants=\"\$${ax_cv_c_compiler_vendor}_variants : NONE\" - for vartest in $variants; do - case $vartest in #( - *:) variant=${vartest%:*}; continue ;; #( - *) varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")" ;; - esac - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + done + + ax_cv_c_compiler_vendor=$vendor + + portland_variants="llvm: __PGLLVM__" + eval variants=\"\$${ax_cv_c_compiler_vendor}_variants : NONE\" + for vartest in $variants; do + case $vartest in #( + *:) + variant=${vartest%:*}; + continue + ;; #( + *) + varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")" + ;; + esac + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int main () { - #if !($varcpp) - thisisanerror; - #endif +#if !($varcpp) + thisisanerror; +#endif ; return 0; @@ -6049,12 +5729,19 @@ break fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - as_fn_append ax_cv_c_compiler_vendor ${variant:+/$variant} + done + as_fn_append ax_cv_c_compiler_vendor ${variant:+/$variant} fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_vendor" >&5 -$as_echo "$ax_cv_c_compiler_vendor" >&6; } +case "$ax_cv_c_compiler_vendor" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ax_cv_c_compiler_vendor${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ax_cv_c_compiler_vendor${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ax_cv_c_compiler_vendor${as__std}" >&6 ;; +esac; } @@ -6069,27 +5756,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__INTEL_COMPILER%100)/10" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__INTEL_COMPILER%10)" "_ax_c_compiler_version_patch" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_INTEL unknown intel compiler version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6135,36 +5822,36 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__xlC__%100" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__xlC_ver__/0x100" "_ax_c_compiler_version_patch" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__xlC_ver__%0x100" "_ax_c_compiler_version_build" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler build version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler build version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch.$_ax_c_compiler_version_build" @@ -6175,27 +5862,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__ibmxl_release__" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__ibmxl_version__" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6209,27 +5896,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__xlC__/10000)%10" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__xlC__/100000)%10" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_IBM unknown IBM compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6243,27 +5930,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale major -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale major" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__PATHCC_MINOR__" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__PATHCC_PATCHLEVEL__" "_ax_c_compiler_version_patch" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale patch level -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PATHSCALE unknown pathscale patch level" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6274,18 +5961,18 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_CLANG unknown clang major -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_CLANG unknown clang major" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__clang_minor__" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_CLANG unknown clang minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_CLANG unknown clang minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__clang_patchlevel__" "_ax_c_compiler_version_patch" ""; then : @@ -6302,18 +5989,18 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_CRAY unknown crayc release -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_CRAY unknown crayc release" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "_RELEASE_MINOR" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_CRAY unknown crayc minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_CRAY unknown crayc minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor" @@ -6324,7 +6011,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: _AX_COMPILER_VERSION_FUJITSU unknown fujitsu release" >&5 -$as_echo "$as_me: WARNING: _AX_COMPILER_VERSION_FUJITSU unknown fujitsu release" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: _AX_COMPILER_VERSION_FUJITSU unknown fujitsu release${as__std}" >&2;} ax_cv_c_compiler_version="" fi @@ -6335,27 +6022,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc major -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc major" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__GNUC_MINOR__" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__GNUC_PATCHLEVEL__" "_ax_c_compiler_version_patch" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc patch level -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_GNU unknown gcc patch level" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6373,9 +6060,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun release version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun release version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if test "X$_ax_c_compiler_version_until59" = X1; then : @@ -6389,9 +6076,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6404,9 +6091,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6419,9 +6106,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi @@ -6436,9 +6123,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6451,9 +6138,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6466,9 +6153,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SUN unknown sun major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi @@ -6488,9 +6175,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp release version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp release version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if test "X$_ax_c_compiler_version_untilA0121" = X1; then : @@ -6507,9 +6194,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp release version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp release version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(( @@ -6522,9 +6209,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(( @@ -6537,9 +6224,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_HP unknown hp major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6558,9 +6245,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec release version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec release version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(( @@ -6573,9 +6260,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(( @@ -6588,9 +6275,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_DEC unknown dec major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6626,9 +6313,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if test $_ax_c_compiler_version_turboc_raw -lt 661 || test $_ax_c_compiler_version_turboc_raw -gt 1023; then : @@ -6642,9 +6329,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6657,9 +6344,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown turboc major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="0turboc:$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor" @@ -6674,7 +6361,7 @@ *) : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: [_AX_COMPILER_VERSION_BORLAND] unknown turboc version between 0x295 and 0x400 please report bug" >&5 -$as_echo "$as_me: WARNING: [_AX_COMPILER_VERSION_BORLAND] unknown turboc version between 0x295 and 0x400 please report bug" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: [_AX_COMPILER_VERSION_BORLAND] unknown turboc version between 0x295 and 0x400 please report bug${as__std}" >&2;} ax_cv_c_compiler_version="" ;; esac @@ -6694,9 +6381,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown borlandc version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_BORLAND unknown borlandc version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi case $_ax_c_compiler_version_borlandc_raw in #( @@ -6743,7 +6430,7 @@ *) : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: [_AX_COMPILER_VERSION_BORLAND] Unknown borlandc compiler version $_ax_c_compiler_version_borlandc_raw please report bug" >&5 -$as_echo "$as_me: WARNING: [_AX_COMPILER_VERSION_BORLAND] Unknown borlandc compiler version $_ax_c_compiler_version_borlandc_raw please report bug" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: [_AX_COMPILER_VERSION_BORLAND] Unknown borlandc compiler version $_ax_c_compiler_version_borlandc_raw please report bug${as__std}" >&2;} ;; esac @@ -6755,18 +6442,18 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_COMEAU unknown comeau compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_COMEAU unknown comeau compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__COMO_VERSION__/100)%10" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_COMEAU unknown comeau compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_COMEAU unknown comeau compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor" @@ -6777,27 +6464,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__KCC_VERSION/100)%10" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__KCC_VERSION/1000)%10" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_KAI unknown kay compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6815,9 +6502,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6830,9 +6517,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "( @@ -6845,9 +6532,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SGI unknown SGI compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6858,18 +6545,18 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(_MSC_VER/100)%100" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi _ax_c_compiler_version_patch=0 @@ -6889,9 +6576,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi @@ -6902,9 +6589,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi @@ -6914,9 +6601,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler build version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_MICROSOFT unknown microsoft compiler build version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi @@ -6928,27 +6615,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler patch version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler patch version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__MWERKS__/0x100)%0x10" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__MWERKS__/0x1000)%0x10" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_METROWERKS unknown metrowerks compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -6958,18 +6645,18 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_WATCOM unknown watcom compiler minor version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_WATCOM unknown watcom compiler minor version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "(__WATCOMC__/100)%100" "_ax_c_compiler_version_major" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_WATCOM unknown watcom compiler major version -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_WATCOM unknown watcom compiler major version" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor" @@ -6980,27 +6667,27 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi major -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi major" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__PGIC_MINOR__" "_ax_c_compiler_version_minor" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "__PGIC_PATCHLEVEL__" "_ax_c_compiler_version_patch" ""; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi patch level -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_PORTLAND unknown pgi patch level" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -7021,9 +6708,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc major -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc major" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" "/* avoid parse error with comments */ @@ -7036,9 +6723,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc minor -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc minor" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi if ac_fn_c_compute_int "$LINENO" " @@ -7054,9 +6741,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc patch level -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "_AX_COMPILER_VERSION_SDCC unknown sdcc patch level" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ax_cv_c_compiler_version="$_ax_c_compiler_version_major.$_ax_c_compiler_version_minor.$_ax_c_compiler_version_patch" @@ -7067,7 +6754,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_c_compiler_version" >&5 -$as_echo "$ax_cv_c_compiler_version" >&6; } +case "$ax_cv_c_compiler_version" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ax_cv_c_compiler_version${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ax_cv_c_compiler_version${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ax_cv_c_compiler_version${as__std}" >&6 ;; +esac; } ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7158,10 +6852,10 @@ ;; #( unknown) : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not determine compiler vendor. OPARI2 might not function properly." >&5 -$as_echo "$as_me: WARNING: Could not determine compiler vendor. OPARI2 might not function properly." >&2;} ;; #( +$as_echo "$as_me: ${as__yel}WARNING: Could not determine compiler vendor. OPARI2 might not function properly.${as__std}" >&2;} ;; #( *) : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Compiler vendor '${ax_cv_c_compiler_vendor}' unsupported. OPARI2 might not function properly." >&5 -$as_echo "$as_me: WARNING: Compiler vendor '${ax_cv_c_compiler_vendor}' unsupported. OPARI2 might not function properly." >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: Compiler vendor '${ax_cv_c_compiler_vendor}' unsupported. OPARI2 might not function properly.${as__std}" >&2;} ;; esac afs_compiler_intel=0 afs_compiler_sun=0 @@ -7374,14 +7068,28 @@ case "x$ac_cv_prog_cc_c99" in x) { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; +case "none needed" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}none needed${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}none needed${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}none needed${as__std}" >&6 ;; +esac; } ;; xno) { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; +$as_echo "${as__red}unsupported${as__std}" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c99" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +case "$ac_cv_prog_cc_c99" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_cc_c99${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_cc_c99${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_cc_c99${as__std}" >&6 ;; +esac; } ;; esac if test "x$ac_cv_prog_cc_c99" != xno; then : @@ -7433,10 +7141,17 @@ CXX=$ac_cv_prog_CXX if test -n "$CXX"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } +case "$CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CXX${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -7477,10 +7192,17 @@ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } +case "$ac_ct_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_CXX${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -7493,7 +7215,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -7556,7 +7278,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +case "$ac_cv_cxx_compiler_gnu" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_cxx_compiler_gnu${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_cxx_compiler_gnu${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_cxx_compiler_gnu${as__std}" >&6 ;; +esac; } if test $ac_compiler_gnu = yes; then GXX=yes else @@ -7626,7 +7355,14 @@ ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } +case "$ac_cv_prog_cxx_g" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_cxx_g${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_cxx_g${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_cxx_g${as__std}" >&6 ;; +esac; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -7762,7 +7498,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } +case "$am_cv_CXX_dependencies_compiler_type" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_CXX_dependencies_compiler_type${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_CXX_dependencies_compiler_type${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_CXX_dependencies_compiler_type${as__std}" >&6 ;; +esac; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type if @@ -7879,10 +7622,10 @@ fi if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } $as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h @@ -7941,10 +7684,17 @@ F77=$ac_cv_prog_F77 if test -n "$F77"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } +case "$F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$F77${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -7985,10 +7735,17 @@ ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } +case "$ac_ct_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_F77${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -8001,7 +7758,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac F77=$ac_ct_F77 @@ -8062,7 +7819,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } +case "$ac_cv_f77_compiler_gnu" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_f77_compiler_gnu${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_f77_compiler_gnu${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_f77_compiler_gnu${as__std}" >&6 ;; +esac; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS @@ -8087,7 +7851,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } +case "$ac_cv_prog_f77_g" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_f77_g${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_f77_g${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_f77_g${as__std}" >&6 ;; +esac; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -8154,7 +7925,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${scorep_have_f77}" >&5 -$as_echo "${scorep_have_f77}" >&6; } +case "${scorep_have_f77}" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}${scorep_have_f77}${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}${scorep_have_f77}${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}${scorep_have_f77}${as__std}" >&6 ;; +esac; } ac_ext=${ac_fc_srcext-f} @@ -8194,10 +7972,17 @@ FC=$ac_cv_prog_FC if test -n "$FC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5 -$as_echo "$FC" >&6; } +case "$FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$FC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -8238,10 +8023,17 @@ ac_ct_FC=$ac_cv_prog_ac_ct_FC if test -n "$ac_ct_FC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5 -$as_echo "$ac_ct_FC" >&6; } +case "$ac_ct_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_FC${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -8254,7 +8046,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac FC=$ac_ct_FC @@ -8315,7 +8107,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5 -$as_echo "$ac_cv_fc_compiler_gnu" >&6; } +case "$ac_cv_fc_compiler_gnu" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_fc_compiler_gnu${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_fc_compiler_gnu${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_fc_compiler_gnu${as__std}" >&6 ;; +esac; } ac_ext=$ac_save_ext ac_test_FCFLAGS=${FCFLAGS+set} ac_save_FCFLAGS=$FCFLAGS @@ -8340,7 +8139,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5 -$as_echo "$ac_cv_prog_fc_g" >&6; } +case "$ac_cv_prog_fc_g" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_fc_g${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_fc_g${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_fc_g${as__std}" >&6 ;; +esac; } if test "$ac_test_FCFLAGS" = set; then FCFLAGS=$ac_save_FCFLAGS elif test $ac_cv_prog_fc_g = yes; then @@ -8407,7 +8213,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${scorep_have_fc}" >&5 -$as_echo "${scorep_have_fc}" >&6; } +case "${scorep_have_fc}" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}${scorep_have_fc}${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}${scorep_have_fc}${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}${scorep_have_fc}${as__std}" >&6 ;; +esac; } ac_ext=c @@ -8443,8 +8256,8 @@ ac_cv_prog_c_openmp='none needed' else ac_cv_prog_c_openmp='unsupported' - for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp \ - -qsmp=omp -homp -Popenmp --openmp -Kopenmp; do + for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp -Kopenmp; do ac_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $ac_option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8472,7 +8285,14 @@ conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_c_openmp" >&5 -$as_echo "$ac_cv_prog_c_openmp" >&6; } +case "$ac_cv_prog_c_openmp" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_c_openmp${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_c_openmp${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_c_openmp${as__std}" >&6 ;; +esac; } case $ac_cv_prog_c_openmp in #( "none needed" | unsupported) ;; #( @@ -8500,7 +8320,7 @@ if test "x${ac_cv_prog_c_openmp}" = "xunsupported"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no suitable OpenMP compilers found. POMP2 dummy lib will not be build." >&5 -$as_echo "$as_me: WARNING: no suitable OpenMP compilers found. POMP2 dummy lib will not be build." >&2;} +$as_echo "$as_me: ${as__yel}WARNING: no suitable OpenMP compilers found. POMP2 dummy lib will not be build.${as__std}" >&2;} else ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' @@ -8536,8 +8356,8 @@ ac_cv_prog_cxx_openmp='none needed' else ac_cv_prog_cxx_openmp='unsupported' - for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp \ - -qsmp=omp -homp -Popenmp --openmp -Kopenmp; do + for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp -Kopenmp; do ac_save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $ac_option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8565,7 +8385,14 @@ conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_openmp" >&5 -$as_echo "$ac_cv_prog_cxx_openmp" >&6; } +case "$ac_cv_prog_cxx_openmp" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_cxx_openmp${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_cxx_openmp${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_cxx_openmp${as__std}" >&6 ;; +esac; } case $ac_cv_prog_cxx_openmp in #( "none needed" | unsupported) ;; #( @@ -8614,8 +8441,8 @@ ac_cv_prog_f77_openmp='none needed' else ac_cv_prog_f77_openmp='unsupported' - for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp \ - -qsmp=omp -homp -Popenmp --openmp -Kopenmp; do + for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp -Kopenmp; do ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_option" cat > conftest.$ac_ext <<_ACEOF @@ -8643,7 +8470,14 @@ conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_openmp" >&5 -$as_echo "$ac_cv_prog_f77_openmp" >&6; } +case "$ac_cv_prog_f77_openmp" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_f77_openmp${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_f77_openmp${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_f77_openmp${as__std}" >&6 ;; +esac; } case $ac_cv_prog_f77_openmp in #( "none needed" | unsupported) ;; #( @@ -8692,8 +8526,8 @@ ac_cv_prog_fc_openmp='none needed' else ac_cv_prog_fc_openmp='unsupported' - for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp \ - -qsmp=omp -homp -Popenmp --openmp -Kopenmp; do + for ac_option in -fopenmp -xopenmp -qopenmp -openmp -mp -omp -qsmp=omp -homp \ + -Popenmp --openmp -Kopenmp; do ac_save_FCFLAGS=$FCFLAGS FCFLAGS="$FCFLAGS $ac_option" cat > conftest.$ac_ext <<_ACEOF @@ -8721,7 +8555,14 @@ conftest$ac_exeext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_openmp" >&5 -$as_echo "$ac_cv_prog_fc_openmp" >&6; } +case "$ac_cv_prog_fc_openmp" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_prog_fc_openmp${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_prog_fc_openmp${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_prog_fc_openmp${as__std}" >&6 ;; +esac; } case $ac_cv_prog_fc_openmp in #( "none needed" | unsupported) ;; #( @@ -8770,7 +8611,14 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: result: $scorep_support_allocatable" >&5 -$as_echo "$scorep_support_allocatable" >&6; } +case "$scorep_support_allocatable" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$scorep_support_allocatable${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$scorep_support_allocatable${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$scorep_support_allocatable${as__std}" >&6 ;; +esac; } if test "x$scorep_support_allocatable" = "xyes"; then FORTRAN_SUPPORT_ALLOCATABLE_TRUE= FORTRAN_SUPPORT_ALLOCATABLE_FALSE='#' @@ -8788,25 +8636,17 @@ - for i in REVISION REVISION_COMMON; do - if test ! -e ${srcdir}/../build-config/${i}; then - as_fn_error $? "File ${srcdir}/../build-config/${i} must exist." "$LINENO" 5 - fi - done + if test ! -e ${afs_srcdir}/build-config/REVISION; then : + as_fn_error $? "File ${afs_srcdir}/build-config/REVISION must exist." "$LINENO" 5 +fi - component_revision=`cat ${srcdir}/../build-config/REVISION` - common_revision=`cat ${srcdir}/../build-config/REVISION_COMMON` + component_revision=`cat ${afs_srcdir}/build-config/REVISION` cat >>confdefs.h <<_ACEOF #define SCOREP_COMPONENT_REVISION "${component_revision}" _ACEOF -cat >>confdefs.h <<_ACEOF -#define SCOREP_COMMON_REVISION "${common_revision}" -_ACEOF - - # PACKAGE_MAJOR=2 @@ -8815,7 +8655,7 @@ PACKAGE_MINOR=0 - PACKAGE_BUGFIX=5 + PACKAGE_BUGFIX=6 PACKAGE_SUFFIX= @@ -8837,7 +8677,7 @@ case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: Libtool does not cope well with whitespace in \`pwd\`${as__std}" >&2;} ;; esac @@ -8857,7 +8697,52 @@ -ltmain=$ac_aux_dir/ltmain.sh +ltmain=$ac_aux_dir/ltmain.sh + +# Make sure we can run config.sub. +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } +if ${ac_cv_build+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +case "$ac_cv_build" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_build${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_build${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_build${as__std}" >&6 ;; +esac; } +case $ac_cv_build in +*-*-*) ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } @@ -8873,7 +8758,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +case "$ac_cv_host" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_host${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_host${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_host${as__std}" >&6 ;; +esac; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -8941,11 +8833,32 @@ case $ECHO in printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; +case "printf" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}printf${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}printf${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}printf${as__std}" >&6 ;; +esac; } ;; print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; +case "print -r" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}print -r${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}print -r${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}print -r${as__std}" >&6 ;; +esac; } ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; +case "cat" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}cat${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}cat${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}cat${as__std}" >&6 ;; +esac; } ;; esac @@ -9026,7 +8939,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +case "$ac_cv_path_SED" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_SED${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_SED${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_SED${as__std}" >&6 ;; +esac; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -9102,7 +9022,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +case "$ac_cv_path_GREP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_GREP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_GREP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_GREP${as__std}" >&6 ;; +esac; } GREP="$ac_cv_path_GREP" @@ -9169,7 +9096,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +case "$ac_cv_path_EGREP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_EGREP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_EGREP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_EGREP${as__std}" >&6 ;; +esac; } EGREP="$ac_cv_path_EGREP" @@ -9236,7 +9170,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +case "$ac_cv_path_FGREP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_FGREP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_FGREP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_FGREP${as__std}" >&6 ;; +esac; } FGREP="$ac_cv_path_FGREP" @@ -9338,10 +9279,17 @@ LD=$lt_cv_path_LD if test -n "$LD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } +case "$LD" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$LD${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$LD${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$LD${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 @@ -9360,7 +9308,14 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +case "$lt_cv_prog_gnu_ld" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; +esac; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -9426,7 +9381,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +case "$lt_cv_path_NM" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_path_NM${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_path_NM${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_path_NM${as__std}" >&6 ;; +esac; } if test no != "$lt_cv_path_NM"; then NM=$lt_cv_path_NM else @@ -9467,10 +9429,17 @@ DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } +case "$DUMPBIN" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$DUMPBIN${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$DUMPBIN${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$DUMPBIN${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -9511,10 +9480,17 @@ ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } +case "$ac_ct_DUMPBIN" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_DUMPBIN${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_DUMPBIN${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_DUMPBIN${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -9527,7 +9503,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -9576,17 +9552,24 @@ rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +case "$lt_cv_nm_interface" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_nm_interface${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_nm_interface${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_nm_interface${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } +$as_echo "${as__red}no, using $LN_S${as__std}" >&6; } fi # find the maximum length of command line arguments @@ -9722,10 +9705,24 @@ if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } +case "$lt_cv_sys_max_cmd_len" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_sys_max_cmd_len${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_sys_max_cmd_len${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_sys_max_cmd_len${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } +case "none" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}none${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}none${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}none${as__std}" >&6 ;; +esac; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -9810,7 +9807,14 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +case "$lt_cv_to_host_file_cmd" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_to_host_file_cmd${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_to_host_file_cmd${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_to_host_file_cmd${as__std}" >&6 ;; +esac; } @@ -9837,7 +9841,14 @@ to_tool_file_cmd=$lt_cv_to_tool_file_cmd { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +case "$lt_cv_to_tool_file_cmd" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_to_tool_file_cmd${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_to_tool_file_cmd${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_to_tool_file_cmd${as__std}" >&6 ;; +esac; } @@ -9851,7 +9862,14 @@ lt_cv_ld_reload_flag='-r' fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +case "$lt_cv_ld_reload_flag" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_ld_reload_flag${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_ld_reload_flag${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_ld_reload_flag${as__std}" >&6 ;; +esac; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -9912,10 +9930,17 @@ OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } +case "$OBJDUMP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$OBJDUMP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$OBJDUMP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$OBJDUMP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -9952,10 +9977,17 @@ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } +case "$ac_ct_OBJDUMP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_OBJDUMP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_OBJDUMP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_OBJDUMP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -9964,7 +9996,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -10184,7 +10216,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +case "$lt_cv_deplibs_check_method" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_deplibs_check_method${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_deplibs_check_method${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_deplibs_check_method${as__std}" >&6 ;; +esac; } file_magic_glob= want_nocaseglob=no @@ -10256,10 +10295,17 @@ DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } +case "$DLLTOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$DLLTOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$DLLTOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$DLLTOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -10296,10 +10342,17 @@ ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } +case "$ac_ct_DLLTOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_DLLTOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_DLLTOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_DLLTOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -10308,7 +10361,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -10356,7 +10409,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +case "$lt_cv_sharedlib_from_linklib_cmd" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_sharedlib_from_linklib_cmd${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_sharedlib_from_linklib_cmd${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_sharedlib_from_linklib_cmd${as__std}" >&6 ;; +esac; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -10399,10 +10459,17 @@ AR=$ac_cv_prog_AR if test -n "$AR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } +case "$AR" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$AR${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$AR${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$AR${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -10443,10 +10510,17 @@ ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } +case "$ac_ct_AR" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_AR${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_AR${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_AR${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -10459,7 +10533,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -10539,7 +10613,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +case "$lt_cv_ar_at_file" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_ar_at_file${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_ar_at_file${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_ar_at_file${as__std}" >&6 ;; +esac; } if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= @@ -10553,29 +10634,25 @@ -# Cray's compiler drivers need STRIP to be an absolute file name when -# static linking. if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_STRIP+:} false; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - case $STRIP in - [\\/]* | ?:[\\/]*) - ac_cv_path_STRIP="$STRIP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_STRIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -10583,42 +10660,46 @@ done IFS=$as_save_IFS - ;; -esac fi -STRIP=$ac_cv_path_STRIP +fi +STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +case "$STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi fi -if test -z "$ac_cv_path_STRIP"; then - ac_pt_STRIP=$STRIP +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_STRIP+:} false; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else - case $ac_pt_STRIP in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_STRIP="$ac_pt_STRIP" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_STRIP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -10626,31 +10707,37 @@ done IFS=$as_save_IFS - ;; -esac fi -ac_pt_STRIP=$ac_cv_path_ac_pt_STRIP -if test -n "$ac_pt_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_STRIP" >&5 -$as_echo "$ac_pt_STRIP" >&6; } +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +case "$ac_ct_STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi - if test "x$ac_pt_STRIP" = x; then + if test "x$ac_ct_STRIP" = x; then STRIP=":" else case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac - STRIP=$ac_pt_STRIP + STRIP=$ac_ct_STRIP fi else - STRIP="$ac_cv_path_STRIP" + STRIP="$ac_cv_prog_STRIP" fi test -z "$STRIP" && STRIP=: @@ -10691,10 +10778,17 @@ RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } +case "$RANLIB" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$RANLIB${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$RANLIB${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$RANLIB${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -10731,10 +10825,17 @@ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } +case "$ac_ct_RANLIB" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_RANLIB${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_RANLIB${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_RANLIB${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -10743,7 +10844,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -11100,10 +11201,10 @@ fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } +$as_echo "${as__red}failed${as__std}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } +$as_echo "${as__grn}ok${as__std}" >&6; } fi # Response file support. @@ -11174,13 +11275,27 @@ ;; #( *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 -$as_echo "$with_sysroot" >&6; } +case "$with_sysroot" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$with_sysroot${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$with_sysroot${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$with_sysroot${as__std}" >&6 ;; +esac; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } +case "${lt_sysroot:-no}" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}${lt_sysroot:-no}${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}${lt_sysroot:-no}${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}${lt_sysroot:-no}${as__std}" >&6 ;; +esac; } @@ -11225,7 +11340,14 @@ rm -f conftest.i conftest2.i conftest.out fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 -$as_echo "$ac_cv_path_lt_DD" >&6; } +case "$ac_cv_path_lt_DD" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_lt_DD${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_lt_DD${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_lt_DD${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 @@ -11244,7 +11366,14 @@ test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 -$as_echo "$lt_cv_truncate_bin" >&6; } +case "$lt_cv_truncate_bin" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_truncate_bin${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_truncate_bin${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_truncate_bin${as__std}" >&6 ;; +esac; } @@ -11482,7 +11611,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +case "$lt_cv_cc_needs_belf" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_cc_needs_belf${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_cc_needs_belf${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_cc_needs_belf${as__std}" >&6 ;; +esac; } if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS=$SAVE_CFLAGS @@ -11560,10 +11696,17 @@ MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } +case "$MANIFEST_TOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$MANIFEST_TOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$MANIFEST_TOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$MANIFEST_TOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -11600,10 +11743,17 @@ ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } +case "$ac_ct_MANIFEST_TOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_MANIFEST_TOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_MANIFEST_TOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_MANIFEST_TOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -11612,7 +11762,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -11637,7 +11787,14 @@ rm -f conftest* fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +case "$lt_cv_path_mainfest_tool" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_path_mainfest_tool${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_path_mainfest_tool${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_path_mainfest_tool${as__std}" >&6 ;; +esac; } if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -11680,10 +11837,17 @@ DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } +case "$DSYMUTIL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$DSYMUTIL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$DSYMUTIL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$DSYMUTIL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -11720,10 +11884,17 @@ ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } +case "$ac_ct_DSYMUTIL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_DSYMUTIL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_DSYMUTIL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_DSYMUTIL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -11732,7 +11903,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -11772,10 +11943,17 @@ NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } +case "$NMEDIT" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$NMEDIT${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$NMEDIT${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$NMEDIT${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -11812,10 +11990,17 @@ ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } +case "$ac_ct_NMEDIT" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_NMEDIT${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_NMEDIT${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_NMEDIT${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -11824,7 +12009,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -11864,10 +12049,17 @@ LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } +case "$LIPO" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$LIPO${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$LIPO${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$LIPO${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -11904,10 +12096,17 @@ ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } +case "$ac_ct_LIPO" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_LIPO${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_LIPO${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_LIPO${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -11916,7 +12115,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -11956,10 +12155,17 @@ OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } +case "$OTOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$OTOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$OTOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$OTOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -11996,10 +12202,17 @@ ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } +case "$ac_ct_OTOOL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_OTOOL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_OTOOL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_OTOOL${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -12008,7 +12221,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -12048,10 +12261,17 @@ OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } +case "$OTOOL64" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$OTOOL64${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$OTOOL64${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$OTOOL64${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -12088,10 +12308,17 @@ ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } +case "$ac_ct_OTOOL64" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_OTOOL64${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_OTOOL64${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_OTOOL64${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -12100,7 +12327,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -12169,7 +12396,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +case "$lt_cv_apple_cc_single_mod" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_apple_cc_single_mod${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_apple_cc_single_mod${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_apple_cc_single_mod${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } @@ -12202,7 +12436,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +case "$lt_cv_ld_exported_symbols_list" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_ld_exported_symbols_list${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_ld_exported_symbols_list${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_ld_exported_symbols_list${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } @@ -12237,7 +12478,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +case "$lt_cv_ld_force_load" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_ld_force_load${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_ld_force_load${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_ld_force_load${as__std}" >&6 ;; +esac; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; @@ -12384,7 +12632,14 @@ ac_cv_prog_CPP=$CPP fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +case "$CPP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CPP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CPP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CPP${as__std}" >&6 ;; +esac; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -12434,9 +12689,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -12551,7 +12806,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } +case "$ac_cv_header_stdc" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_header_stdc${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_header_stdc${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_header_stdc${as__std}" >&6 ;; +esac; } if test $ac_cv_header_stdc = yes; then $as_echo "#define STDC_HEADERS 1" >>confdefs.h @@ -12760,7 +13022,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 -$as_echo "$with_aix_soname" >&6; } +case "$with_aix_soname" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$with_aix_soname${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$with_aix_soname${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$with_aix_soname${as__std}" >&6 ;; +esac; } if test aix != "$with_aix_soname"; then # For the AIX way of multilib, we name the shared archive member # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', @@ -12858,7 +13127,14 @@ rmdir .libs 2>/dev/null fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +case "$lt_cv_objdir" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_objdir${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_objdir${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_objdir${as__std}" >&6 ;; +esac; } objdir=$lt_cv_objdir @@ -12967,10 +13243,17 @@ MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } +case "$MAGIC_CMD" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$MAGIC_CMD${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$MAGIC_CMD${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$MAGIC_CMD${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -13033,10 +13316,17 @@ MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } +case "$MAGIC_CMD" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$MAGIC_CMD${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$MAGIC_CMD${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$MAGIC_CMD${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -13157,7 +13447,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +case "$lt_cv_prog_compiler_rtti_exceptions" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_rtti_exceptions${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_rtti_exceptions${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_rtti_exceptions${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -13379,6 +13676,12 @@ lt_prog_compiler_pic='-fPIC' lt_prog_compiler_static='-static' ;; + armflang* | flang*) + # Flang and ARM HPC Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC -DPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -13436,6 +13739,11 @@ lt_prog_compiler_pic='-Kpic' lt_prog_compiler_static='-Bstatic' ;; + *xlf*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-qpic' + lt_prog_compiler_static='-qstaticlink' + ;; esac ;; esac @@ -13532,7 +13840,14 @@ lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +case "$lt_cv_prog_compiler_pic" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic${as__std}" >&6 ;; +esac; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # @@ -13575,7 +13890,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +case "$lt_cv_prog_compiler_pic_works" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_works${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_works${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_works${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in @@ -13632,7 +13954,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +case "$lt_cv_prog_compiler_static_works" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_static_works${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_static_works${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_static_works${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_static_works"; then : @@ -13694,7 +14023,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +case "$lt_cv_prog_compiler_c_o" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; +esac; } @@ -13749,7 +14085,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +case "$lt_cv_prog_compiler_c_o" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o${as__std}" >&6 ;; +esac; } @@ -13766,10 +14109,17 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } +case "$hard_links" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hard_links${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hard_links${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hard_links${as__std}" >&6 ;; +esac; } if test no = "$hard_links"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe${as__std}" >&2;} need_locks=warn fi else @@ -14051,21 +14401,39 @@ tmp_sharedflag='--shared' ;; nagfor*) # NAGFOR 5.3 tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also below + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; nvcc*) # Cuda Compiler Driver 2.2 whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *xlc*) # IBM XL C + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + *xlf*) # IBM xlf since version 13 knows about -qmkshrobj + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; + esac esac archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -14080,7 +14448,21 @@ tcc*) export_dynamic_flag_spec='-rdynamic' ;; - xlf* | bgf* | bgxlf* | mpixlf*) + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also above + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -lt 13; then + whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + fi + ;; + bgf* | bgxlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' @@ -14711,7 +15093,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +case "$lt_cv_prog_compiler__b" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler__b${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler__b${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler__b${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler__b"; then archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -14772,7 +15161,14 @@ LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +case "$lt_cv_irix_exported_symbol" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -15063,7 +15459,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +case "$ld_shlibs" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ld_shlibs${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ld_shlibs${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ld_shlibs${as__std}" >&6 ;; +esac; } test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -15143,7 +15546,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +case "$lt_cv_archive_cmds_need_lc" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_archive_cmds_need_lc${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_archive_cmds_need_lc${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_archive_cmds_need_lc${as__std}" >&6 ;; +esac; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -16121,7 +16531,14 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +case "$dynamic_linker" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$dynamic_linker${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$dynamic_linker${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$dynamic_linker${as__std}" >&6 ;; +esac; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -16268,7 +16685,14 @@ hardcode_action=unsupported fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +case "$hardcode_action" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hardcode_action${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hardcode_action${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hardcode_action${as__std}" >&6 ;; +esac; } if test relink = "$hardcode_action" || test yes = "$inherit_rpath"; then @@ -16347,7 +16771,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +case "$ac_cv_lib_dl_dlopen" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; +esac; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else @@ -16408,7 +16839,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +case "$ac_cv_lib_dld_shl_load" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_lib_dld_shl_load${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_lib_dld_shl_load${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_lib_dld_shl_load${as__std}" >&6 ;; +esac; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else @@ -16451,7 +16889,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +case "$ac_cv_lib_dl_dlopen" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_lib_dl_dlopen${as__std}" >&6 ;; +esac; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else @@ -16490,7 +16935,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +case "$ac_cv_lib_svld_dlopen" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_lib_svld_dlopen${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_lib_svld_dlopen${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_lib_svld_dlopen${as__std}" >&6 ;; +esac; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else @@ -16529,7 +16981,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +case "$ac_cv_lib_dld_dld_link" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_lib_dld_dld_link${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_lib_dld_dld_link${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_lib_dld_dld_link${as__std}" >&6 ;; +esac; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -16671,7 +17130,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +case "$lt_cv_dlopen_self" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_dlopen_self${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_dlopen_self${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_dlopen_self${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" @@ -16777,7 +17243,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +case "$lt_cv_dlopen_self_static" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_dlopen_self_static${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_dlopen_self_static${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_dlopen_self_static${as__std}" >&6 ;; +esac; } fi CPPFLAGS=$save_CPPFLAGS @@ -16821,7 +17294,7 @@ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -16830,15 +17303,15 @@ striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } ;; esac fi @@ -16858,7 +17331,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } +case "$can_build_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$can_build_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$can_build_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$can_build_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } @@ -16886,14 +17366,28 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } +case "$enable_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +case "$enable_static" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_static${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_static${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_static${as__std}" >&6 ;; +esac; } @@ -16982,7 +17476,14 @@ ac_cv_prog_CXXCPP=$CXXCPP fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +case "$CXXCPP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$CXXCPP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$CXXCPP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$CXXCPP${as__std}" >&6 ;; +esac; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -17032,9 +17533,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -17245,10 +17746,17 @@ LD=$lt_cv_path_LD if test -n "$LD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } +case "$LD" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$LD${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$LD${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$LD${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 @@ -17267,7 +17775,14 @@ esac fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +case "$lt_cv_prog_gnu_ld" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_gnu_ld${as__std}" >&6 ;; +esac; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -18120,7 +18635,18 @@ export_dynamic_flag_spec_CXX='$wl--export-dynamic' whole_archive_flag_spec_CXX='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' ;; - esac + *xlC* | *xlc++* ) # IBM XL + hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir' + export_dynamic_flag_spec_CXX='$wl--export-dynamic' + archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds_CXX='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' + fi + ;; + esac ;; esac ;; @@ -18442,7 +18968,14 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } +case "$ld_shlibs_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ld_shlibs_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ld_shlibs_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ld_shlibs_CXX${as__std}" >&6 ;; +esac; } test no = "$ld_shlibs_CXX" && can_build_shared=no GCC_CXX=$GXX @@ -18992,7 +19525,14 @@ lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; } +case "$lt_cv_prog_compiler_pic_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_CXX${as__std}" >&6 ;; +esac; } lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX # @@ -19035,7 +19575,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } +case "$lt_cv_prog_compiler_pic_works_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_works_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_works_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_works_CXX${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_pic_works_CXX"; then case $lt_prog_compiler_pic_CXX in @@ -19086,7 +19633,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } +case "$lt_cv_prog_compiler_static_works_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_static_works_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_static_works_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_static_works_CXX${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_static_works_CXX"; then : @@ -19145,7 +19699,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +case "$lt_cv_prog_compiler_c_o_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; +esac; } @@ -19197,7 +19758,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } +case "$lt_cv_prog_compiler_c_o_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_CXX${as__std}" >&6 ;; +esac; } @@ -19214,10 +19782,17 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } +case "$hard_links" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hard_links${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hard_links${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hard_links${as__std}" >&6 ;; +esac; } if test no = "$hard_links"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe${as__std}" >&2;} need_locks=warn fi else @@ -19267,7 +19842,14 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5 -$as_echo "$ld_shlibs_CXX" >&6; } +case "$ld_shlibs_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ld_shlibs_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ld_shlibs_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ld_shlibs_CXX${as__std}" >&6 ;; +esac; } test no = "$ld_shlibs_CXX" && can_build_shared=no with_gnu_ld_CXX=$with_gnu_ld @@ -19338,7 +19920,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; } +case "$lt_cv_archive_cmds_need_lc_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_archive_cmds_need_lc_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_archive_cmds_need_lc_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_archive_cmds_need_lc_CXX${as__std}" >&6 ;; +esac; } archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX ;; esac @@ -20153,7 +20742,14 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +case "$dynamic_linker" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$dynamic_linker${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$dynamic_linker${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$dynamic_linker${as__std}" >&6 ;; +esac; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -20243,7 +20839,14 @@ hardcode_action_CXX=unsupported fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5 -$as_echo "$hardcode_action_CXX" >&6; } +case "$hardcode_action_CXX" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hardcode_action_CXX${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hardcode_action_CXX${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hardcode_action_CXX${as__std}" >&6 ;; +esac; } if test relink = "$hardcode_action_CXX" || test yes = "$inherit_rpath_CXX"; then @@ -20386,7 +20989,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } +case "$can_build_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$can_build_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$can_build_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$can_build_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } @@ -20413,14 +21023,28 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } +case "$enable_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +case "$enable_static" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_static${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_static${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_static${as__std}" >&6 ;; +esac; } GCC_F77=$G77 LD_F77=$LD @@ -20636,6 +21260,12 @@ lt_prog_compiler_pic_F77='-fPIC' lt_prog_compiler_static_F77='-static' ;; + armflang* | flang*) + # Flang and ARM HPC Compiler + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-fPIC -DPIC' + lt_prog_compiler_static_F77='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -20693,6 +21323,11 @@ lt_prog_compiler_pic_F77='-Kpic' lt_prog_compiler_static_F77='-Bstatic' ;; + *xlf*) + lt_prog_compiler_wl_F77='-Wl,' + lt_prog_compiler_pic_F77='-qpic' + lt_prog_compiler_static_F77='-qstaticlink' + ;; esac ;; esac @@ -20789,7 +21424,14 @@ lt_cv_prog_compiler_pic_F77=$lt_prog_compiler_pic_F77 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_F77" >&5 -$as_echo "$lt_cv_prog_compiler_pic_F77" >&6; } +case "$lt_cv_prog_compiler_pic_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_F77${as__std}" >&6 ;; +esac; } lt_prog_compiler_pic_F77=$lt_cv_prog_compiler_pic_F77 # @@ -20832,7 +21474,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } +case "$lt_cv_prog_compiler_pic_works_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_works_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_works_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_works_F77${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_pic_works_F77"; then case $lt_prog_compiler_pic_F77 in @@ -20883,7 +21532,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_F77" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } +case "$lt_cv_prog_compiler_static_works_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_static_works_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_static_works_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_static_works_F77${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_static_works_F77"; then : @@ -20942,7 +21598,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } +case "$lt_cv_prog_compiler_c_o_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; +esac; } @@ -20994,7 +21657,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_F77" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } +case "$lt_cv_prog_compiler_c_o_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_F77${as__std}" >&6 ;; +esac; } @@ -21011,10 +21681,17 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } +case "$hard_links" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hard_links${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hard_links${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hard_links${as__std}" >&6 ;; +esac; } if test no = "$hard_links"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe${as__std}" >&2;} need_locks=warn fi else @@ -21293,21 +21970,39 @@ tmp_sharedflag='--shared' ;; nagfor*) # NAGFOR 5.3 tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also below + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; nvcc*) # Cuda Compiler Driver 2.2 whole_archive_flag_spec_F77='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_F77=yes ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_F77='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object_F77=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_F77='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object_F77=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *xlc*) # IBM XL C + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + *xlf*) # IBM xlf since version 13 knows about -qmkshrobj + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; + esac esac archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -21322,7 +22017,21 @@ tcc*) export_dynamic_flag_spec_F77='-rdynamic' ;; - xlf* | bgf* | bgxlf* | mpixlf*) + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also above + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -lt 13; then + whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir' + archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds_F77='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + fi + ;; + bgf* | bgxlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec_F77='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec_F77='$wl-rpath $wl$libdir' @@ -21964,7 +22673,14 @@ LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +case "$lt_cv_irix_exported_symbol" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -22255,7 +22971,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_F77" >&5 -$as_echo "$ld_shlibs_F77" >&6; } +case "$ld_shlibs_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ld_shlibs_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ld_shlibs_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ld_shlibs_F77${as__std}" >&6 ;; +esac; } test no = "$ld_shlibs_F77" && can_build_shared=no with_gnu_ld_F77=$with_gnu_ld @@ -22326,7 +23049,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_F77" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_F77" >&6; } +case "$lt_cv_archive_cmds_need_lc_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_archive_cmds_need_lc_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_archive_cmds_need_lc_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_archive_cmds_need_lc_F77${as__std}" >&6 ;; +esac; } archive_cmds_need_lc_F77=$lt_cv_archive_cmds_need_lc_F77 ;; esac @@ -23135,7 +23865,14 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +case "$dynamic_linker" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$dynamic_linker${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$dynamic_linker${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$dynamic_linker${as__std}" >&6 ;; +esac; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -23225,7 +23962,14 @@ hardcode_action_F77=unsupported fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_F77" >&5 -$as_echo "$hardcode_action_F77" >&6; } +case "$hardcode_action_F77" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hardcode_action_F77${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hardcode_action_F77${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hardcode_action_F77${as__std}" >&6 ;; +esac; } if test relink = "$hardcode_action_F77" || test yes = "$inherit_rpath_F77"; then @@ -23364,7 +24108,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } +case "$can_build_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$can_build_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$can_build_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$can_build_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } @@ -23391,14 +24142,28 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } +case "$enable_shared" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_shared${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_shared${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_shared${as__std}" >&6 ;; +esac; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } +case "$enable_static" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$enable_static${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$enable_static${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$enable_static${as__std}" >&6 ;; +esac; } GCC_FC=$ac_cv_fc_compiler_gnu LD_FC=$LD @@ -23764,6 +24529,12 @@ lt_prog_compiler_pic_FC='-fPIC' lt_prog_compiler_static_FC='-static' ;; + armflang* | flang*) + # Flang and ARM HPC Compiler + lt_prog_compiler_wl_FC='-Wl,' + lt_prog_compiler_pic_FC='-fPIC -DPIC' + lt_prog_compiler_static_FC='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -23821,6 +24592,11 @@ lt_prog_compiler_pic_FC='-Kpic' lt_prog_compiler_static_FC='-Bstatic' ;; + *xlf*) + lt_prog_compiler_wl_FC='-Wl,' + lt_prog_compiler_pic_FC='-qpic' + lt_prog_compiler_static_FC='-qstaticlink' + ;; esac ;; esac @@ -23917,7 +24693,14 @@ lt_cv_prog_compiler_pic_FC=$lt_prog_compiler_pic_FC fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_FC" >&5 -$as_echo "$lt_cv_prog_compiler_pic_FC" >&6; } +case "$lt_cv_prog_compiler_pic_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_FC${as__std}" >&6 ;; +esac; } lt_prog_compiler_pic_FC=$lt_cv_prog_compiler_pic_FC # @@ -23960,7 +24743,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_FC" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works_FC" >&6; } +case "$lt_cv_prog_compiler_pic_works_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_pic_works_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_pic_works_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_pic_works_FC${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_pic_works_FC"; then case $lt_prog_compiler_pic_FC in @@ -24011,7 +24801,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_FC" >&5 -$as_echo "$lt_cv_prog_compiler_static_works_FC" >&6; } +case "$lt_cv_prog_compiler_static_works_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_static_works_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_static_works_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_static_works_FC${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_prog_compiler_static_works_FC"; then : @@ -24070,7 +24867,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; } +case "$lt_cv_prog_compiler_c_o_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; +esac; } @@ -24122,7 +24926,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_FC" >&5 -$as_echo "$lt_cv_prog_compiler_c_o_FC" >&6; } +case "$lt_cv_prog_compiler_c_o_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_prog_compiler_c_o_FC${as__std}" >&6 ;; +esac; } @@ -24139,10 +24950,17 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } +case "$hard_links" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hard_links${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hard_links${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hard_links${as__std}" >&6 ;; +esac; } if test no = "$hard_links"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe${as__std}" >&2;} need_locks=warn fi else @@ -24421,21 +25239,39 @@ tmp_sharedflag='--shared' ;; nagfor*) # NAGFOR 5.3 tmp_sharedflag='-Wl,-shared' ;; - xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below) + xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC tmp_sharedflag='-qmkshrobj' tmp_addflag= ;; + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also below + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; nvcc*) # Cuda Compiler Driver 2.2 whole_archive_flag_spec_FC='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object_FC=yes ;; - esac - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) # Sun C 5.9 - whole_archive_flag_spec_FC='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' - compiler_needs_object_FC=yes - tmp_sharedflag='-G' ;; - *Sun\ F*) # Sun Fortran 8.3 - tmp_sharedflag='-G' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_FC='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' + compiler_needs_object_FC=yes + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *xlc*) # IBM XL C + tmp_sharedflag='-qmkshrobj' + tmp_addflag= ;; + *xlf*) # IBM xlf since version 13 knows about -qmkshrobj + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -ge 13; then + tmp_sharedflag='-qmkshrobj' + tmp_addflag= + fi + ;; + esac esac archive_cmds_FC='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' @@ -24450,7 +25286,21 @@ tcc*) export_dynamic_flag_spec_FC='-rdynamic' ;; - xlf* | bgf* | bgxlf* | mpixlf*) + xlf* | mpixlf*) # IBM xlf since version 13 knows about -qmkshrobj, see also above + xlf_version=`$CC -qversion=verbose 2>&1 | sed -n 2p | sed -e "s/^Version: //" | cut -d'.' -f 1` + if test $xlf_version -lt 13; then + whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive' + hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' + archive_cmds_FC='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' + if test yes = "$supports_anon_versioning"; then + archive_expsym_cmds_FC='echo "{ global:" > $output_objdir/$libname.ver~ + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' + fi + fi + ;; + bgf* | bgxlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec_FC='--whole-archive$convenience --no-whole-archive' hardcode_libdir_flag_spec_FC='$wl-rpath $wl$libdir' @@ -25092,7 +25942,14 @@ LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +case "$lt_cv_irix_exported_symbol" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_irix_exported_symbol${as__std}" >&6 ;; +esac; } if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds_FC='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi @@ -25383,7 +26240,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_FC" >&5 -$as_echo "$ld_shlibs_FC" >&6; } +case "$ld_shlibs_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ld_shlibs_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ld_shlibs_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ld_shlibs_FC${as__std}" >&6 ;; +esac; } test no = "$ld_shlibs_FC" && can_build_shared=no with_gnu_ld_FC=$with_gnu_ld @@ -25454,7 +26318,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_FC" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc_FC" >&6; } +case "$lt_cv_archive_cmds_need_lc_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$lt_cv_archive_cmds_need_lc_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$lt_cv_archive_cmds_need_lc_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$lt_cv_archive_cmds_need_lc_FC${as__std}" >&6 ;; +esac; } archive_cmds_need_lc_FC=$lt_cv_archive_cmds_need_lc_FC ;; esac @@ -26263,7 +27134,14 @@ ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +case "$dynamic_linker" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$dynamic_linker${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$dynamic_linker${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$dynamic_linker${as__std}" >&6 ;; +esac; } test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -26353,7 +27231,14 @@ hardcode_action_FC=unsupported fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_FC" >&5 -$as_echo "$hardcode_action_FC" >&6; } +case "$hardcode_action_FC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$hardcode_action_FC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$hardcode_action_FC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$hardcode_action_FC${as__std}" >&6 ;; +esac; } if test relink = "$hardcode_action_FC" || test yes = "$inherit_rpath_FC"; then @@ -26434,13 +27319,13 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +$as_echo "${as__grn}yes${as__std}" >&6; }; $as_echo "#define HAVE_READLINK 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -26455,9 +27340,9 @@ ac_config_files="$ac_config_files ../test/jacobi_f77_test.sh" -ac_config_files="$ac_config_files ../doc/example/Makefile" +ac_config_files="$ac_config_files ../doc/example/openmp/Makefile" -ac_config_files="$ac_config_files ../doc/example_user_instrumentation/Makefile" +ac_config_files="$ac_config_files ../doc/example/pomp/Makefile" ac_config_files="$ac_config_files ../src/opari2_config_tool_frontend.h:../src/opari/opari2_config_tool_frontend.h.in" @@ -26494,7 +27379,7 @@ *${as_nl}*) case $ac_var in #( *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: cache variable $ac_var contains a newline${as__std}" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -26531,8 +27416,8 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: updating cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: updating cache $cache_file${as__std}" >&2;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -26546,8 +27431,8 @@ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: not updating unwritable cache $cache_file${as__std}" >&2;} fi fi rm -f confcache @@ -26575,8 +27460,8 @@ LTLIBOBJS=$ac_ltlibobjs -if test -z "${SVN_CONTROLLED_TRUE}" && test -z "${SVN_CONTROLLED_FALSE}"; then - as_fn_error $? "conditional \"SVN_CONTROLLED\" was never defined. +if test -z "${GIT_CONTROLLED_TRUE}" && test -z "${GIT_CONTROLLED_FALSE}"; then + as_fn_error $? "conditional \"GIT_CONTROLLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 @@ -26586,7 +27471,14 @@ wait $am_sleep_pid 2>/dev/null fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } +case "done" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}done${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}done${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}done${as__std}" >&6 ;; +esac; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -26651,6 +27543,10 @@ as_fn_error $? "conditional \"PLATFORM_CRAYXC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${PLATFORM_CRAYUNKNOWN_TRUE}" && test -z "${PLATFORM_CRAYUNKNOWN_FALSE}"; then + as_fn_error $? "conditional \"PLATFORM_CRAYUNKNOWN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${PLATFORM_LINUX_TRUE}" && test -z "${PLATFORM_LINUX_FALSE}"; then as_fn_error $? "conditional \"PLATFORM_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26671,10 +27567,6 @@ as_fn_error $? "conditional \"PLATFORM_NECSX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${PLATFORM_ARM_TRUE}" && test -z "${PLATFORM_ARM_FALSE}"; then - as_fn_error $? "conditional \"PLATFORM_ARM\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${PLATFORM_MINGW_TRUE}" && test -z "${PLATFORM_MINGW_FALSE}"; then as_fn_error $? "conditional \"PLATFORM_MINGW\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26695,10 +27587,6 @@ as_fn_error $? "conditional \"PLATFORM_CRAY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error $? "conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${SCOREP_COMPILER_INTEL_TRUE}" && test -z "${SCOREP_COMPILER_INTEL_FALSE}"; then as_fn_error $? "conditional \"SCOREP_COMPILER_INTEL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26756,8 +27644,8 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: info: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: ${as__blu}info: creating $CONFIG_STATUS${as__std}" >&2;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -26845,6 +27733,37 @@ fi +# need to catch these variables, before unsetting them later +: ${AS_COLOR:=$CLICOLOR}; export AS_COLOR +: ${AS_COLOR_FORCE:=$CLICOLOR_FORCE}; export AS_COLOR_FORCE + +as__red= +as__grn= +as__yel= +as__blu= +as__mag= +as__cya= +as__gry= +as__std= +as__color=no +if test "X$AS_COLOR_FORCE" = X0; then + as__color=no; +elif test "X$AS_COLOR_FORCE" = X1; then + as__color=yes +elif { test "X$TERM" != Xdumb || test "X$AS_COLOR" = X1; } && { test -t 1; } 2>/dev/null; then + as__color=yes +fi +if test $as__color = yes; then + as__red='' + as__grn='' + as__yel='' + as__blu='' + as__mag='' + as__cya='' + as__gry='' + as__std='' +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -26911,7 +27830,7 @@ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: ${as__red}error: $2${as__std}" >&2 as_fn_exit $as_status } # as_fn_error @@ -27148,7 +28067,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OPARI2 $as_me 2.0.5, which was +This file was extended by OPARI2 $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27214,7 +28133,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OPARI2 config.status 2.0.5 +OPARI2 config.status 2.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -27904,8 +28823,8 @@ "../test/jacobi_c++_test.sh") CONFIG_FILES="$CONFIG_FILES ../test/jacobi_c++_test.sh" ;; "../test/jacobi_f90_test.sh") CONFIG_FILES="$CONFIG_FILES ../test/jacobi_f90_test.sh" ;; "../test/jacobi_f77_test.sh") CONFIG_FILES="$CONFIG_FILES ../test/jacobi_f77_test.sh" ;; - "../doc/example/Makefile") CONFIG_FILES="$CONFIG_FILES ../doc/example/Makefile" ;; - "../doc/example_user_instrumentation/Makefile") CONFIG_FILES="$CONFIG_FILES ../doc/example_user_instrumentation/Makefile" ;; + "../doc/example/openmp/Makefile") CONFIG_FILES="$CONFIG_FILES ../doc/example/openmp/Makefile" ;; + "../doc/example/pomp/Makefile") CONFIG_FILES="$CONFIG_FILES ../doc/example/pomp/Makefile" ;; "../src/opari2_config_tool_frontend.h") CONFIG_FILES="$CONFIG_FILES ../src/opari2_config_tool_frontend.h:../src/opari/opari2_config_tool_frontend.h.in" ;; "../include/opari2/pomp2_lib.h") CONFIG_FILES="$CONFIG_FILES ../include/opari2/pomp2_lib.h:../include/opari2/pomp2_lib.h" ;; "../include/opari2/pomp2_user_lib.h") CONFIG_FILES="$CONFIG_FILES ../include/opari2/pomp2_user_lib.h:../include/opari2/pomp2_user_lib.h" ;; @@ -28270,8 +29189,8 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: creating $ac_file" >&5 +$as_echo "$as_me: ${as__blu}info: creating $ac_file${as__std}" >&2;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( @@ -28382,7 +29301,7 @@ *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: $ac_file_inputs seems to ignore the --datarootdir setting${as__std}" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -28428,8 +29347,8 @@ "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined${as__std}" >&2;} rm -f "$ac_tmp/stdin" case $ac_file in @@ -28449,8 +29368,8 @@ } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: $ac_file is unchanged" >&5 +$as_echo "$as_me: ${as__blu}info: $ac_file is unchanged${as__std}" >&2;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ @@ -28497,8 +29416,8 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: info: executing $ac_file commands" >&5 +$as_echo "$as_me: ${as__blu}info: executing $ac_file commands${as__std}" >&2;} ;; esac @@ -29655,6 +30574,6 @@ fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: unrecognized options: $ac_unrecognized_opts${as__std}" >&2;} fi diff -Nru opari2-2.0.5/build-frontend/configure.ac opari2-2.0.6/build-frontend/configure.ac --- opari2-2.0.5/build-frontend/configure.ac 2019-07-26 09:16:11.109168154 +0000 +++ opari2-2.0.6/build-frontend/configure.ac 2021-02-25 12:51:08.223909931 +0000 @@ -1,13 +1,13 @@ AC_PREREQ([2.69]) -AC_INIT([OPARI2], m4_esyscmd([../vendor/common/build-config/generate-package-version.sh ../build-config/VERSION]), [support@score-p.org], [opari2]) +AC_INIT([OPARI2], m4_esyscmd([../build-config/common/generate-package-version.sh ../build-config/VERSION]), [support@score-p.org], [opari2]) AFS_PACKAGE_BUILD_INIT([frontend]) -AC_SUBST([LIBRARY_INTERFACE_VERSION], m4_esyscmd([../vendor/common/build-config/generate-library-version.sh ../build-config/VERSION])) +AC_SUBST([LIBRARY_INTERFACE_VERSION], m4_esyscmd([../build-config/common/generate-library-version.sh ../build-config/VERSION])) AC_CONFIG_AUX_DIR([../build-config]) ## See also ACLOCAL_AMFLAGS in Makefile.am. -AC_CONFIG_MACRO_DIRS([../build-config/m4 ../vendor/common/build-config/m4]) +AC_CONFIG_MACRO_DIRS([../build-config/m4 ../build-config/common/m4]) AC_CONFIG_HEADERS([../src/config-frontend.h]) @@ -37,7 +37,7 @@ adl_RECURSIVE_EVAL([${bindir}], [BINDIR]) AC_SUBST([BINDIR]) -AC_SCOREP_SVN_CONTROLLED +AC_SCOREP_GIT_CONTROLLED AM_INIT_AUTOMAKE([foreign color-tests 1.13.4 -Wall tar-pax]) AM_SILENT_RULES([yes]) @@ -129,8 +129,8 @@ AC_CONFIG_FILES([../test/jacobi_c++_test.sh], [chmod +x ../test/jacobi_c++_test.sh]) AC_CONFIG_FILES([../test/jacobi_f90_test.sh], [chmod +x ../test/jacobi_f90_test.sh]) AC_CONFIG_FILES([../test/jacobi_f77_test.sh], [chmod +x ../test/jacobi_f77_test.sh]) -AC_CONFIG_FILES([../doc/example/Makefile]) -AC_CONFIG_FILES([../doc/example_user_instrumentation/Makefile]) +AC_CONFIG_FILES([../doc/example/openmp/Makefile]) +AC_CONFIG_FILES([../doc/example/pomp/Makefile]) AC_CONFIG_FILES([../src/opari2_config_tool_frontend.h:../src/opari/opari2_config_tool_frontend.h.in]) AC_CONFIG_FILES([../include/opari2/pomp2_lib.h:../include/opari2/pomp2_lib.h]) AC_CONFIG_FILES([../include/opari2/pomp2_user_lib.h:../include/opari2/pomp2_user_lib.h]) diff -Nru opari2-2.0.5/build-frontend/Makefile.am opari2-2.0.6/build-frontend/Makefile.am --- opari2-2.0.5/build-frontend/Makefile.am 2019-07-26 09:16:11.109168154 +0000 +++ opari2-2.0.6/build-frontend/Makefile.am 2021-02-25 12:51:08.223909931 +0000 @@ -9,7 +9,7 @@ ## Copyright (c) 2009-2011, ## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany ## -## Copyright (c) 2009-2011, +## Copyright (c) 2009-2011, 2020, ## Technische Universitaet Dresden, Germany ## ## Copyright (c) 2009-2011, @@ -36,7 +36,7 @@ ## ACLOCAL_AMFLAGS should be replaced by AC_CONFIG_MACRO_DIRS, aclocal-1.13.4 ## doesn't honor the paths provided to AC_CONFIG_MACRO_DIRS. See ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21352 -ACLOCAL_AMFLAGS = -I ../build-config/m4 -I ../vendor/common/build-config/m4 +ACLOCAL_AMFLAGS = -I ../build-config/m4 -I ../build-config/common/m4 include ../build-includes/common.am @@ -51,44 +51,13 @@ if SCOREP_HAVE_F77 if HAVE_OPENMP_SUPPORT installcheck-local: - @$(am__cd) $(DESTDIR)$(docdir)/example/ && $(MAKE) $(AM_MAKEFLAGS) - @$(am__cd) $(DESTDIR)$(docdir)/example_user_instrumentation/ && $(MAKE) $(AM_MAKEFLAGS) + @$(am__cd) $(DESTDIR)$(docdir)/example/openmp && $(MAKE) $(AM_MAKEFLAGS) + @$(am__cd) $(DESTDIR)$(docdir)/example/pomp && $(MAKE) $(AM_MAKEFLAGS) endif else if HAVE_OPENMP_SUPPORT installcheck-local: - @$(am__cd) $(DESTDIR)$(docdir)/example/ && $(MAKE) $(AM_MAKEFLAGS) c - @$(am__cd) $(DESTDIR)$(docdir)/example_user_instrumentation/ && $(MAKE) $(AM_MAKEFLAGS) c -endif -endif - -install-example: -if HAVE_OPENMP_SUPPORT - $(MKDIR_P) $(DESTDIR)$(docdir)/example - $(INSTALL_DATA) $(abs_srcdir)/../doc/example/example.* $(DESTDIR)$(docdir)/example/ - $(INSTALL_DATA) $(abs_srcdir)/../include/opari2/pomp2_lib.h $(DESTDIR)$(docdir)/example/ - $(INSTALL_DATA) $(abs_builddir)/../doc/example/Makefile $(DESTDIR)$(docdir)/example/ - $(INSTALL_DATA) $(abs_builddir)/../build-frontend/.libs/libpomp.* $(DESTDIR)$(docdir)/example/ - rm -f $(DESTDIR)$(docdir)/example/libpomp.la + @$(am__cd) $(DESTDIR)$(docdir)/example/openmp && $(MAKE) $(AM_MAKEFLAGS) c + @$(am__cd) $(DESTDIR)$(docdir)/example/pomp && $(MAKE) $(AM_MAKEFLAGS) c endif - $(MKDIR_P) $(DESTDIR)$(docdir)/example_user_instrumentation - $(INSTALL_DATA) $(abs_srcdir)/../doc/example_user_instrumentation/example_user_instrumentation.* $(DESTDIR)$(docdir)/example_user_instrumentation/ - $(INSTALL_DATA) $(abs_srcdir)/../include/opari2/pomp2_user_lib.h $(DESTDIR)$(docdir)/example_user_instrumentation/ - $(INSTALL_DATA) $(abs_builddir)/../doc/example_user_instrumentation/Makefile $(DESTDIR)$(docdir)/example_user_instrumentation/ -if HAVE_OPENMP_SUPPORT - $(INSTALL_DATA) $(abs_builddir)/../build-frontend/.libs/libpomp.* $(DESTDIR)$(docdir)/example_user_instrumentation/ endif - rm -f $(DESTDIR)$(docdir)/example_user_instrumentation/libpomp.la - -install-pomp2_region_info: - $(MKDIR_P) $(DESTDIR)$(datadir)/@PACKAGE@/devel - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_token.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_parser.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_parser.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_region_info.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_user_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_user_region_info.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - -install-data-local: install-example install-pomp2_region_info diff -Nru opari2-2.0.5/build-frontend/Makefile.in opari2-2.0.6/build-frontend/Makefile.in --- opari2-2.0.5/build-frontend/Makefile.in 2019-07-26 09:16:25.725213638 +0000 +++ opari2-2.0.6/build-frontend/Makefile.in 2021-02-25 12:51:26.763968944 +0000 @@ -25,7 +25,7 @@ # Copyright (c) 2009-2013, # Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -# Copyright (c) 2009-2013, +# Copyright (c) 2009-2013, 2020, # Technische Universitaet Dresden, Germany # Copyright (c) 2009-2013, @@ -127,11 +127,35 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} DIST_COMMON = $(srcdir)/../build-includes/common.am \ - $(srcdir)/../vendor/common/build-config/common.am \ + $(srcdir)/../build-config/common/common.am \ $(srcdir)/../build-includes/frontend-only.am \ $(srcdir)/../src/opari/Makefile.inc.am \ $(srcdir)/../src/opari-lib-dummy/Makefile.inc.am \ + $(srcdir)/../doc/example/openmp/Makefile.inc.am \ + $(srcdir)/../doc/example/pomp/Makefile.inc.am \ $(srcdir)/../test/Makefile.inc.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) \ @@ -140,8 +164,8 @@ $(top_srcdir)/../test/jacobi_c++_test.sh.in \ $(top_srcdir)/../test/jacobi_f90_test.sh.in \ $(top_srcdir)/../test/jacobi_f77_test.sh.in \ - $(top_srcdir)/../doc/example/Makefile.in \ - $(top_srcdir)/../doc/example_user_instrumentation/Makefile.in \ + $(top_srcdir)/../doc/example/openmp/Makefile.in \ + $(top_srcdir)/../doc/example/pomp/Makefile.in \ $(top_srcdir)/../src/opari/opari2_config_tool_frontend.h.in \ $(top_srcdir)/../include/opari2/pomp2_lib.h \ $(top_srcdir)/../include/opari2/pomp2_user_lib.h \ @@ -164,36 +188,37 @@ pkglibexec_PROGRAMS = check_PROGRAMS = XFAIL_TESTS = -@HAVE_OPENMP_SUPPORT_TRUE@am__append_1 = libpomp.la -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_2 = \ +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_1 = \ @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_fwrapper.c \ @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_fwrapper_base.c \ @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_fwrapper_base.h +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_2 = pomp2_fwrapper_def.h @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_3 = pomp2_fwrapper_def.h -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_4 = pomp2_fwrapper_def.h -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_5 = getfname -@HAVE_OPENMP_SUPPORT_TRUE@am__append_6 = $(SRC_ROOT)src/opari-lib-dummy/pomp2_parse_init_regions.awk.in -@HAVE_OPENMP_SUPPORT_TRUE@am__append_7 = \ +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_4 = getfname +@HAVE_OPENMP_SUPPORT_TRUE@am__append_5 = $(SRC_ROOT)src/opari-lib-dummy/pomp2_parse_init_regions.awk.in +@HAVE_OPENMP_SUPPORT_TRUE@am__append_6 = \ @HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)test/jacobi_c_test.sh \ @HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)test/jacobi_c++_test.sh -@FORTRAN_SUPPORT_ALLOCATABLE_TRUE@@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_FC_TRUE@am__append_8 = $(SRC_ROOT)test/jacobi_f90_test.sh -@FORTRAN_SUPPORT_ALLOCATABLE_TRUE@@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_9 = $(SRC_ROOT)test/jacobi_f77_test.sh +@FORTRAN_SUPPORT_ALLOCATABLE_TRUE@@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_FC_TRUE@am__append_7 = $(SRC_ROOT)test/jacobi_f90_test.sh +@FORTRAN_SUPPORT_ALLOCATABLE_TRUE@@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__append_8 = $(SRC_ROOT)test/jacobi_f77_test.sh subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/../vendor/common/build-config/m4/ac_common_package.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_recursive_eval.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_c99.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_compiler_checks.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_fortran_checks.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_sys_detection.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/afs_am_conditional.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/afs_maintainer_mode.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ax_compiler_vendor.m4 \ - $(top_srcdir)/../vendor/common/build-config/m4/ax_compiler_version.m4 \ +am__aclocal_m4_deps = \ + $(top_srcdir)/../build-config/common/m4/ac_common_package.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_recursive_eval.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_c99.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_compiler_and_flags.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_compiler_checks.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_fortran_checks.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_git_controlled.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_sys_detection.m4 \ + $(top_srcdir)/../build-config/common/m4/ac_scorep_version_and_revision.m4 \ + $(top_srcdir)/../build-config/common/m4/afs_am_conditional.m4 \ + $(top_srcdir)/../build-config/common/m4/afs_maintainer_mode.m4 \ + $(top_srcdir)/../build-config/common/m4/afs_summary.m4 \ + $(top_srcdir)/../build-config/common/m4/ax_compiler_vendor.m4 \ + $(top_srcdir)/../build-config/common/m4/ax_compiler_version.m4 \ $(top_srcdir)/../build-config/m4/libtool.m4 \ $(top_srcdir)/../build-config/m4/ltoptions.m4 \ $(top_srcdir)/../build-config/m4/ltsugar.m4 \ @@ -210,8 +235,8 @@ CONFIG_HEADER = $(top_builddir)/../src/config-frontend.h CONFIG_CLEAN_FILES = ../test/jacobi_c_test.sh \ ../test/jacobi_c++_test.sh ../test/jacobi_f90_test.sh \ - ../test/jacobi_f77_test.sh ../doc/example/Makefile \ - ../doc/example_user_instrumentation/Makefile \ + ../test/jacobi_f77_test.sh ../doc/example/openmp/Makefile \ + ../doc/example/pomp/Makefile \ ../src/opari2_config_tool_frontend.h \ ../include/opari2/pomp2_lib.h \ ../include/opari2/pomp2_user_lib.h @@ -243,10 +268,13 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(opari2includedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(examplelibdir)" "$(DESTDIR)$(libdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(exampleopenmpdir)" \ + "$(DESTDIR)$(examplepompdir)" "$(DESTDIR)$(pkgdatadir)" \ + "$(DESTDIR)$(pkgdatadeveldir)" "$(DESTDIR)$(opari2includedir)" +LTLIBRARIES = $(examplelib_LTLIBRARIES) $(lib_LTLIBRARIES) \ + $(noinst_LTLIBRARIES) libpomp_la_LIBADD = am__libpomp_la_SOURCES_DIST = \ $(SRC_ROOT)src/opari-lib-dummy/pomp2_lib.c \ @@ -277,8 +305,9 @@ am__v_lt_1 = libpomp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libpomp_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@HAVE_OPENMP_SUPPORT_TRUE@am_libpomp_la_rpath = + $(CFLAGS) $(libpomp_la_LDFLAGS) $(LDFLAGS) -o $@ +@HAVE_OPENMP_SUPPORT_TRUE@am_libpomp_la_rpath = -rpath \ +@HAVE_OPENMP_SUPPORT_TRUE@ $(examplelibdir) @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@am__EXEEXT_1 = getfname$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) am__getfname_SOURCES_DIST = $(SRC_ROOT)src/opari-lib-dummy/foos.c \ @@ -310,7 +339,7 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @$(am__tty_colors); echo " GEN $${mgn}$@$$std"; am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) @@ -328,7 +357,7 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; +am__v_CC_0 = @$(am__tty_colors); echo " CC $${blu}$@$$std"; am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -336,7 +365,7 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_0 = @$(am__tty_colors); echo " CCLD $${grn}$@$$std"; am__v_CCLD_1 = CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) @@ -346,7 +375,7 @@ $(AM_CXXFLAGS) $(CXXFLAGS) AM_V_CXX = $(am__v_CXX_@AM_V@) am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) -am__v_CXX_0 = @echo " CXX " $@; +am__v_CXX_0 = @$(am__tty_colors); echo " CXX $${blu}$@$$std"; am__v_CXX_1 = CXXLD = $(CXX) CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ @@ -354,14 +383,14 @@ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) -am__v_CXXLD_0 = @echo " CXXLD " $@; +am__v_CXXLD_0 = @$(am__tty_colors); echo " CXXLD $${grn}$@$$std"; am__v_CXXLD_1 = F77COMPILE = $(F77) $(AM_FFLAGS) $(FFLAGS) LTF77COMPILE = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(F77) $(AM_FFLAGS) $(FFLAGS) AM_V_F77 = $(am__v_F77_@AM_V@) am__v_F77_ = $(am__v_F77_@AM_DEFAULT_V@) -am__v_F77_0 = @echo " F77 " $@; +am__v_F77_0 = @$(am__tty_colors); echo " F77 $${blu}$@$$std"; am__v_F77_1 = F77LD = $(F77) F77LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 $(AM_LIBTOOLFLAGS) \ @@ -369,7 +398,7 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_F77LD = $(am__v_F77LD_@AM_V@) am__v_F77LD_ = $(am__v_F77LD_@AM_DEFAULT_V@) -am__v_F77LD_0 = @echo " F77LD " $@; +am__v_F77LD_0 = @$(am__tty_colors); echo " F77LD $${grn}$@$$std"; am__v_F77LD_1 = SOURCES = $(libpomp_la_SOURCES) $(getfname_SOURCES) $(opari2_SOURCES) \ $(opari2_config_SOURCES) @@ -381,7 +410,8 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA = $(pkgdata_DATA) +DATA = $(exampleopenmp_DATA) $(examplepomp_DATA) $(pkgdata_DATA) \ + $(pkgdatadevel_DATA) HEADERS = $(opari2include_HEADERS) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, @@ -404,28 +434,6 @@ CTAGS = ctags CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope check recheck -am__tty_colors_dummy = \ - mgn= red= grn= lgn= blu= brg= std=; \ - am__color_tests=no -am__tty_colors = { \ - $(am__tty_colors_dummy); \ - if test "X$(AM_COLOR_TESTS)" = Xno; then \ - am__color_tests=no; \ - elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ - am__color_tests=yes; \ - elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ - am__color_tests=yes; \ - fi; \ - if test $$am__color_tests = yes; then \ - red=''; \ - grn=''; \ - lgn=''; \ - blu=''; \ - mgn=''; \ - brg=''; \ - std=''; \ - fi; \ -} am__recheck_rx = ^[ ]*:recheck:[ ]* am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* @@ -767,24 +775,24 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -ACLOCAL_AMFLAGS = -I ../build-config/m4 -I ../vendor/common/build-config/m4 +ACLOCAL_AMFLAGS = -I ../build-config/m4 -I ../build-config/common/m4 AM_CPPFLAGS = -I$(srcdir)/../src -DFRONTEND_BUILD -DCROSS_BUILD SRC_ROOT = ../ INC_ROOT = $(srcdir)/../ PUBLIC_INC_DIR = $(INC_ROOT)include # The include path to the common utils headers. -INC_DIR_COMMON_UTILS = $(INC_ROOT)vendor/common/src/utils/include -INC_DIR_COMMON_HASH = $(INC_ROOT)vendor/common/hash -INC_DIR_COMMON_CUTEST = $(INC_ROOT)vendor/common/cutest +INC_DIR_COMMON_UTILS = $(INC_ROOT)common/utils/include +INC_DIR_COMMON_HASH = $(INC_ROOT)common/hash +INC_DIR_COMMON_CUTEST = $(INC_ROOT)common/utils/test/cutest LIB_ROOT = lib_LTLIBRARIES = -noinst_LTLIBRARIES = $(am__append_1) +noinst_LTLIBRARIES = BUILT_SOURCES = libtool opari2_usage.h opari2-config_usage.h \ - $(am__append_3) -CLEANFILES = opari2_usage.h opari2-config_usage.h $(am__append_4) + $(am__append_2) +CLEANFILES = opari2_usage.h opari2-config_usage.h $(am__append_3) DISTCLEANFILES = $(builddir)/config.summary -EXTRA_DIST = $(am__append_6) +EXTRA_DIST = $(am__append_5) check_LTLIBRARIES = PHONY_TARGETS = INSTALL_DATA_LOCAL_TARGETS = @@ -794,7 +802,7 @@ pkgdata_DATA = TESTS = $(SRC_ROOT)test/c_test.sh $(SRC_ROOT)test/f90_test.sh \ $(SRC_ROOT)test/f77_test.sh $(SRC_ROOT)test/awk_script_test.sh \ - $(am__append_7) $(am__append_8) $(am__append_9) + $(am__append_6) $(am__append_7) $(am__append_8) PUBLIC_INC_SRC = $(SRC_ROOT)include/opari2/ opari2_SOURCES = \ $(SRC_ROOT)src/opari/common.h \ @@ -835,6 +843,8 @@ $(SRC_ROOT)src/opari/opari2_config.h \ opari2-config_usage.h +@HAVE_OPENMP_SUPPORT_TRUE@examplelibdir = $(docdir)/example/lib +@HAVE_OPENMP_SUPPORT_TRUE@examplelib_LTLIBRARIES = libpomp.la @HAVE_OPENMP_SUPPORT_TRUE@libpomp_la_SOURCES = $(SRC_ROOT)src/opari-lib-dummy/pomp2_lib.c \ @HAVE_OPENMP_SUPPORT_TRUE@ $(PUBLIC_INC_SRC)pomp2_lib.h \ @HAVE_OPENMP_SUPPORT_TRUE@ $(PUBLIC_INC_SRC)pomp2_user_lib.h \ @@ -846,7 +856,7 @@ @HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_region_info.h \ @HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.c \ @HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.h \ -@HAVE_OPENMP_SUPPORT_TRUE@ $(am__append_2) +@HAVE_OPENMP_SUPPORT_TRUE@ $(am__append_1) # Currently, the fortran wrappers get a int* parameter whereas the new # POMP_Region_handle is of type void*. Ask a fortran guru if this may cause @@ -855,49 +865,73 @@ # CFLAGS are sufficient here, CPPFLAGS would cause duplication @HAVE_OPENMP_SUPPORT_TRUE@libpomp_la_CFLAGS = $(AM_CFLAGS) $(OPENMP_CFLAGS) @HAVE_OPENMP_SUPPORT_TRUE@libpomp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PUBLIC_INC_DIR) +@HAVE_OPENMP_SUPPORT_TRUE@libpomp_la_LDFLAGS = -static -avoid-version @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@getfname_SOURCES = \ @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/foos.c \ @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ $(SRC_ROOT)src/opari-lib-dummy/getfname.f +pkgdatadeveldir = $(pkgdatadir)/devel +pkgdatadevel_DATA = \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_token.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_parser.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_parser.c \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_region_info.c \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.c + +@HAVE_OPENMP_SUPPORT_TRUE@exampleopenmpdir = $(docdir)/example/openmp +@HAVE_OPENMP_SUPPORT_TRUE@exampleopenmp_DATA = \ +@HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)doc/example/openmp/example.c \ +@HAVE_OPENMP_SUPPORT_TRUE@ $(SRC_ROOT)doc/example/openmp/example.f90 \ +@HAVE_OPENMP_SUPPORT_TRUE@ ../doc/example/openmp/Makefile + +examplepompdir = $(docdir)/example/pomp +examplepomp_DATA = \ + $(SRC_ROOT)doc/example/pomp/example.c \ + $(SRC_ROOT)doc/example/pomp/example.f90 \ + ../doc/example/pomp/Makefile + all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .cc .f .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../build-includes/common.am $(srcdir)/../vendor/common/build-config/common.am $(srcdir)/../build-includes/frontend-only.am $(srcdir)/../src/opari/Makefile.inc.am $(srcdir)/../src/opari-lib-dummy/Makefile.inc.am $(srcdir)/../test/Makefile.inc.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../build-includes/common.am $(srcdir)/../build-config/common/common.am $(srcdir)/../build-includes/frontend-only.am $(srcdir)/../src/opari/Makefile.inc.am $(srcdir)/../src/opari-lib-dummy/Makefile.inc.am $(srcdir)/../doc/example/openmp/Makefile.inc.am $(srcdir)/../doc/example/pomp/Makefile.inc.am $(srcdir)/../test/Makefile.inc.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + if $(AM_V_P); then echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; fi; \ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + if $(AM_V_P); then echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; fi; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - echo ' $(SHELL) ./config.status'; \ + if $(AM_V_P); then echo ' $(SHELL) ./config.status'; fi; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + if $(AM_V_P); then echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; fi; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/../build-includes/common.am $(srcdir)/../vendor/common/build-config/common.am $(srcdir)/../build-includes/frontend-only.am $(srcdir)/../src/opari/Makefile.inc.am $(srcdir)/../src/opari-lib-dummy/Makefile.inc.am $(srcdir)/../test/Makefile.inc.am: +$(srcdir)/../build-includes/common.am $(srcdir)/../build-config/common/common.am $(srcdir)/../build-includes/frontend-only.am $(srcdir)/../src/opari/Makefile.inc.am $(srcdir)/../src/opari-lib-dummy/Makefile.inc.am $(srcdir)/../doc/example/openmp/Makefile.inc.am $(srcdir)/../doc/example/pomp/Makefile.inc.am $(srcdir)/../test/Makefile.inc.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck + $(AM_V_at)$(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) + $(AM_V_at)$(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(AM_V_at)$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): ../src/config-frontend.h: ../src/stamp-h1 @@ -922,9 +956,9 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ ../test/jacobi_f77_test.sh: $(top_builddir)/config.status $(top_srcdir)/../test/jacobi_f77_test.sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ -../doc/example/Makefile: $(top_builddir)/config.status $(top_srcdir)/../doc/example/Makefile.in +../doc/example/openmp/Makefile: $(top_builddir)/config.status $(top_srcdir)/../doc/example/openmp/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ -../doc/example_user_instrumentation/Makefile: $(top_builddir)/config.status $(top_srcdir)/../doc/example_user_instrumentation/Makefile.in +../doc/example/pomp/Makefile: $(top_builddir)/config.status $(top_srcdir)/../doc/example/pomp/Makefile.in cd $(top_builddir) && $(SHELL) ./config.status $@ ../src/opari2_config_tool_frontend.h: $(top_builddir)/config.status $(top_srcdir)/../src/opari/opari2_config_tool_frontend.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -944,20 +978,65 @@ rm -f $${locs}; \ } +install-examplelibLTLIBRARIES: $(examplelib_LTLIBRARIES) + @$(NORMAL_INSTALL) + @$(am__tty_colors); \ + list='$(examplelib_LTLIBRARIES)'; test -n "$(examplelibdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(examplelibdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(examplelibdir)$$std"; fi; \ + $(MKDIR_P) "$(DESTDIR)$(examplelibdir)" || exit 1; \ + for p in $$list2; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p '$(DESTDIR)$(examplelibdir)'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(examplelibdir)/$$f$$std"; fi; \ + $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p "$(DESTDIR)$(examplelibdir)" || exit $$?; \ + done; } + +uninstall-examplelibLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(examplelib_LTLIBRARIES)'; test -n "$(examplelibdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(examplelibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(examplelibdir)/$$f"; \ + done + +clean-examplelibLTLIBRARIES: + -test -z "$(examplelib_LTLIBRARIES)" || rm -f $(examplelib_LTLIBRARIES) + @list='$(examplelib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @$(am__tty_colors); \ + list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(libdir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ - } + for p in $$list2; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p '$(DESTDIR)$(libdir)'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(libdir)/$$f$$std"; fi; \ + $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p "$(DESTDIR)$(libdir)" || exit $$?; \ + done; } uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) @@ -994,9 +1073,11 @@ $(AM_V_CCLD)$(libpomp_la_LINK) $(am_libpomp_la_rpath) $(libpomp_la_OBJECTS) $(libpomp_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + @$(am__tty_colors); \ + list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(bindir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ @@ -1016,10 +1097,12 @@ END { for (d in files) print "f", d, files[d] }' | \ while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ + test -z "$$files" || { for p in $$files; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$p '$(DESTDIR)$(bindir)$$dir'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(bindir)$$dir/$$f$$std"; fi; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$p "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + done; } \ ; done uninstall-binPROGRAMS: @@ -1061,9 +1144,11 @@ rm -f $$list install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS) @$(NORMAL_INSTALL) - @list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ + @$(am__tty_colors); \ + list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(pkglibexecdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(pkglibexecdir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(pkglibexecdir)" || exit 1; \ fi; \ for p in $$list; do echo "$$p $$p"; done | \ @@ -1083,10 +1168,12 @@ END { for (d in files) print "f", d, files[d] }' | \ while read type dir files; do \ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ - } \ + test -z "$$files" || { for p in $$files; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$p '$(DESTDIR)$(pkglibexecdir)$$dir'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(pkglibexecdir)$$dir/$$f$$std"; fi; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$p "$(DESTDIR)$(pkglibexecdir)$$dir" || exit $$?; \ + done; } \ ; done uninstall-pkglibexecPROGRAMS: @@ -1122,9 +1209,11 @@ $(AM_V_CXXLD)$(CXXLINK) $(opari2_config_OBJECTS) $(opari2_config_LDADD) $(LIBS) install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) @$(NORMAL_INSTALL) - @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + @$(am__tty_colors); \ + list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(bindir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ fi; \ for p in $$list; do \ @@ -1142,11 +1231,13 @@ else { print "f", d "/" $$4, $$1 } } \ END { for (d in files) print "f", d, files[d] }' | \ while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { for p in $$files; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(bindir)$$dir/$$f$$std"; fi; \ + $(INSTALL_SCRIPT) $$p "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + done; } \ ; done uninstall-dist_binSCRIPTS: @@ -1471,20 +1562,65 @@ distclean-libtool: -rm -f libtool config.lt +install-exampleopenmpDATA: $(exampleopenmp_DATA) + @$(NORMAL_INSTALL) + @$(am__tty_colors); \ + list='$(exampleopenmp_DATA)'; test -n "$(exampleopenmpdir)" || list=; \ + if test -n "$$list"; then \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(exampleopenmpdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(exampleopenmpdir)$$std"; fi; \ + $(MKDIR_P) "$(DESTDIR)$(exampleopenmpdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + $(am__strip_dir) \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if $(AM_V_P); then echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(exampleopenmpdir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(exampleopenmpdir)/$$f$$std"; fi; \ + $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(exampleopenmpdir)" || exit $$?; \ + done + +uninstall-exampleopenmpDATA: + @$(NORMAL_UNINSTALL) + @list='$(exampleopenmp_DATA)'; test -n "$(exampleopenmpdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(exampleopenmpdir)'; $(am__uninstall_files_from_dir) +install-examplepompDATA: $(examplepomp_DATA) + @$(NORMAL_INSTALL) + @$(am__tty_colors); \ + list='$(examplepomp_DATA)'; test -n "$(examplepompdir)" || list=; \ + if test -n "$$list"; then \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(examplepompdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(examplepompdir)$$std"; fi; \ + $(MKDIR_P) "$(DESTDIR)$(examplepompdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + $(am__strip_dir) \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if $(AM_V_P); then echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(examplepompdir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(examplepompdir)/$$f$$std"; fi; \ + $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(examplepompdir)" || exit $$?; \ + done + +uninstall-examplepompDATA: + @$(NORMAL_UNINSTALL) + @list='$(examplepomp_DATA)'; test -n "$(examplepompdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(examplepompdir)'; $(am__uninstall_files_from_dir) install-pkgdataDATA: $(pkgdata_DATA) @$(NORMAL_INSTALL) - @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ + @$(am__tty_colors); \ + list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(pkgdatadir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ fi; \ for p in $$list; do \ + $(am__strip_dir) \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ + if $(AM_V_P); then echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(pkgdatadir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(pkgdatadir)/$$f$$std"; fi; \ + $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ done uninstall-pkgdataDATA: @@ -1492,20 +1628,43 @@ @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) +install-pkgdatadevelDATA: $(pkgdatadevel_DATA) + @$(NORMAL_INSTALL) + @$(am__tty_colors); \ + list='$(pkgdatadevel_DATA)'; test -n "$(pkgdatadeveldir)" || list=; \ + if test -n "$$list"; then \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadeveldir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(pkgdatadeveldir)$$std"; fi; \ + $(MKDIR_P) "$(DESTDIR)$(pkgdatadeveldir)" || exit 1; \ + fi; \ + for p in $$list; do \ + $(am__strip_dir) \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if $(AM_V_P); then echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(pkgdatadeveldir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(pkgdatadeveldir)/$$f$$std"; fi; \ + $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(pkgdatadeveldir)" || exit $$?; \ + done + +uninstall-pkgdatadevelDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgdatadevel_DATA)'; test -n "$(pkgdatadeveldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(pkgdatadeveldir)'; $(am__uninstall_files_from_dir) install-opari2includeHEADERS: $(opari2include_HEADERS) @$(NORMAL_INSTALL) - @list='$(opari2include_HEADERS)'; test -n "$(opari2includedir)" || list=; \ + @$(am__tty_colors); \ + list='$(opari2include_HEADERS)'; test -n "$(opari2includedir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(opari2includedir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(opari2includedir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(opari2includedir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(opari2includedir)" || exit 1; \ fi; \ for p in $$list; do \ + $(am__strip_dir) \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(opari2includedir)'"; \ - $(INSTALL_HEADER) $$files "$(DESTDIR)$(opari2includedir)" || exit $$?; \ + if $(AM_V_P); then echo " $(INSTALL_HEADER) $$d$$p '$(DESTDIR)$(opari2includedir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(opari2includedir)/$$f$$std"; fi; \ + $(INSTALL_HEADER) $$d$$p "$(DESTDIR)$(opari2includedir)" || exit $$?; \ done uninstall-opari2includeHEADERS: @@ -1579,7 +1738,7 @@ # to avoid problems with "make -n". .log.trs: rm -f $< $@ - $(MAKE) $(AM_MAKEFLAGS) $< + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not # expand to empty, as could happen e.g. with make check TESTS=''. @@ -1786,8 +1945,8 @@ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" + $(AM_V_at)$(am__remove_distdir) + $(AM_V_at)test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1817,7 +1976,7 @@ || exit 1; \ fi; \ done - -test -n "$(am__skip_mode_fix)" \ + -$(AM_V_at)test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ @@ -1825,37 +1984,58 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz"; \ + else echo " DIST $${grn}$(distdir).tar.gz$$std"; fi; \ + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(AM_V_at)$(am__post_remove_distdir) dist-bzip2: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2"; \ + else echo " DIST $${grn}$(distdir).tar.bz2$$std"; fi; \ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-lzip: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz"; \ + else echo " DIST $${grn}$(distdir).tar.lz$$std"; fi; \ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-xz: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz"; \ + else echo " DIST $${grn}$(distdir).tar.xz$$std"; fi; \ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-tarZ: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z"; \ + else echo " DIST $${grn}$(distdir).tar.Z$$std"; fi; \ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) + @$(am__tty_colors); \ + if $(AM_V_P); then echo "shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz"; \ + else echo " DIST $${grn}$(distdir).shar.gz$$std"; fi; \ + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(AM_V_at)$(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip + @$(am__tty_colors); \ + if $(AM_V_P); then echo "zip -rq $(distdir).zip '$(distdir)'"; \ + else echo " DIST $${grn}$(distdir).zip$$std"; fi; \ zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir=':' + $(AM_V_at)$(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -1863,7 +2043,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -1873,7 +2053,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -1911,7 +2091,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -1942,30 +2122,31 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) \ + $(check_PROGRAMS) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \ $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(opari2includedir)"; do \ + for dir in "$(DESTDIR)$(examplelibdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(exampleopenmpdir)" "$(DESTDIR)$(examplepompdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(pkgdatadeveldir)" "$(DESTDIR)$(opari2includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am install-strip: - if test -z '$(STRIP)'; then \ + $(AM_V_at)if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ install; \ @@ -1995,9 +2176,9 @@ clean: clean-am clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \ - clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - clean-pkglibexecPROGRAMS mostlyclean-am + clean-examplelibLTLIBRARIES clean-generic clean-libLTLIBRARIES \ + clean-libtool clean-local clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS clean-pkglibexecPROGRAMS mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -2018,8 +2199,10 @@ info-am: -install-data-am: install-data-local install-opari2includeHEADERS \ - install-pkgdataDATA +install-data-am: install-examplelibLTLIBRARIES \ + install-exampleopenmpDATA install-examplepompDATA \ + install-opari2includeHEADERS install-pkgdataDATA \ + install-pkgdatadevelDATA install-dvi: install-dvi-am @@ -2069,15 +2252,17 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ - uninstall-libLTLIBRARIES uninstall-opari2includeHEADERS \ - uninstall-pkgdataDATA uninstall-pkglibexecPROGRAMS + uninstall-examplelibLTLIBRARIES uninstall-exampleopenmpDATA \ + uninstall-examplepompDATA uninstall-libLTLIBRARIES \ + uninstall-opari2includeHEADERS uninstall-pkgdataDATA \ + uninstall-pkgdatadevelDATA uninstall-pkglibexecPROGRAMS .MAKE: all check check-am install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \ check-am clean clean-binPROGRAMS clean-checkLTLIBRARIES \ - clean-checkPROGRAMS clean-cscope clean-generic \ - clean-libLTLIBRARIES clean-libtool clean-local \ + clean-checkPROGRAMS clean-cscope clean-examplelibLTLIBRARIES \ + clean-generic clean-libLTLIBRARIES clean-libtool clean-local \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ clean-pkglibexecPROGRAMS cscope cscopelist-am ctags ctags-am \ dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ @@ -2086,20 +2271,24 @@ distclean-libtool distclean-tags distcleancheck distdir \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ - install-data-am install-data-local install-dist_binSCRIPTS \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-man \ + install-data-am install-dist_binSCRIPTS install-dvi \ + install-dvi-am install-examplelibLTLIBRARIES \ + install-exampleopenmpDATA install-examplepompDATA install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man \ install-opari2includeHEADERS install-pdf install-pdf-am \ - install-pkgdataDATA install-pkglibexecPROGRAMS install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installcheck-local installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - recheck tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ + install-pkgdataDATA install-pkgdatadevelDATA \ + install-pkglibexecPROGRAMS install-ps install-ps-am \ + install-strip installcheck installcheck-am installcheck-local \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_binSCRIPTS uninstall-examplelibLTLIBRARIES \ + uninstall-exampleopenmpDATA uninstall-examplepompDATA \ uninstall-libLTLIBRARIES uninstall-opari2includeHEADERS \ - uninstall-pkgdataDATA uninstall-pkglibexecPROGRAMS + uninstall-pkgdataDATA uninstall-pkgdatadevelDATA \ + uninstall-pkglibexecPROGRAMS # TESTS_ENVIRONMENT = @@ -2111,8 +2300,8 @@ check-build: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) -# this propagates changes to vendor/common/build-config/config-common.h -../src/config-common.h: $(srcdir)/../vendor/common/build-config/config-common.h +# this propagates changes to build-config/common/config-common.h +../src/config-common.h: $(srcdir)/../build-config/common/config-common.h @$(am__cd) .. && $(MAKE) $(AM_MAKEFLAGS) src/config-common.h opari2_usage.h: $(INC_ROOT)doc/doxygen-user/opari2_usage.dox.in @@ -2128,38 +2317,11 @@ rm -rf ../test/jacobi @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@installcheck-local: -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ @$(am__cd) $(DESTDIR)$(docdir)/example/ && $(MAKE) $(AM_MAKEFLAGS) -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ @$(am__cd) $(DESTDIR)$(docdir)/example_user_instrumentation/ && $(MAKE) $(AM_MAKEFLAGS) +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ @$(am__cd) $(DESTDIR)$(docdir)/example/openmp && $(MAKE) $(AM_MAKEFLAGS) +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_TRUE@ @$(am__cd) $(DESTDIR)$(docdir)/example/pomp && $(MAKE) $(AM_MAKEFLAGS) @HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_FALSE@installcheck-local: -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_FALSE@ @$(am__cd) $(DESTDIR)$(docdir)/example/ && $(MAKE) $(AM_MAKEFLAGS) c -@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_FALSE@ @$(am__cd) $(DESTDIR)$(docdir)/example_user_instrumentation/ && $(MAKE) $(AM_MAKEFLAGS) c - -install-example: -@HAVE_OPENMP_SUPPORT_TRUE@ $(MKDIR_P) $(DESTDIR)$(docdir)/example -@HAVE_OPENMP_SUPPORT_TRUE@ $(INSTALL_DATA) $(abs_srcdir)/../doc/example/example.* $(DESTDIR)$(docdir)/example/ -@HAVE_OPENMP_SUPPORT_TRUE@ $(INSTALL_DATA) $(abs_srcdir)/../include/opari2/pomp2_lib.h $(DESTDIR)$(docdir)/example/ -@HAVE_OPENMP_SUPPORT_TRUE@ $(INSTALL_DATA) $(abs_builddir)/../doc/example/Makefile $(DESTDIR)$(docdir)/example/ -@HAVE_OPENMP_SUPPORT_TRUE@ $(INSTALL_DATA) $(abs_builddir)/../build-frontend/.libs/libpomp.* $(DESTDIR)$(docdir)/example/ -@HAVE_OPENMP_SUPPORT_TRUE@ rm -f $(DESTDIR)$(docdir)/example/libpomp.la - $(MKDIR_P) $(DESTDIR)$(docdir)/example_user_instrumentation - $(INSTALL_DATA) $(abs_srcdir)/../doc/example_user_instrumentation/example_user_instrumentation.* $(DESTDIR)$(docdir)/example_user_instrumentation/ - $(INSTALL_DATA) $(abs_srcdir)/../include/opari2/pomp2_user_lib.h $(DESTDIR)$(docdir)/example_user_instrumentation/ - $(INSTALL_DATA) $(abs_builddir)/../doc/example_user_instrumentation/Makefile $(DESTDIR)$(docdir)/example_user_instrumentation/ -@HAVE_OPENMP_SUPPORT_TRUE@ $(INSTALL_DATA) $(abs_builddir)/../build-frontend/.libs/libpomp.* $(DESTDIR)$(docdir)/example_user_instrumentation/ - rm -f $(DESTDIR)$(docdir)/example_user_instrumentation/libpomp.la - -install-pomp2_region_info: - $(MKDIR_P) $(DESTDIR)$(datadir)/@PACKAGE@/devel - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_token.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_parser.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/opari2_ctc_parser.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_region_info.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_user_region_info.h $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - $(INSTALL_DATA) $(abs_srcdir)/../src/opari-lib-dummy/pomp2_user_region_info.c $(DESTDIR)$(datadir)/@PACKAGE@/devel/ - -install-data-local: install-example install-pomp2_region_info +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_FALSE@ @$(am__cd) $(DESTDIR)$(docdir)/example/openmp && $(MAKE) $(AM_MAKEFLAGS) c +@HAVE_OPENMP_SUPPORT_TRUE@@SCOREP_HAVE_F77_FALSE@ @$(am__cd) $(DESTDIR)$(docdir)/example/pomp && $(MAKE) $(AM_MAKEFLAGS) c # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru opari2-2.0.5/build-includes/common.am opari2-2.0.6/build-includes/common.am --- opari2-2.0.5/build-includes/common.am 2019-07-26 09:16:10.857167370 +0000 +++ opari2-2.0.6/build-includes/common.am 2021-02-25 12:51:08.223909931 +0000 @@ -21,7 +21,7 @@ ## that all build-* Makefiles rely on. -include ../vendor/common/build-config/common.am +include ../build-config/common/common.am ## Convenience variable for referencing public headers that will be ## installed. Use e.g. with the primary nobase_include_HEADERS diff -Nru opari2-2.0.5/build-includes/frontend-only.am opari2-2.0.6/build-includes/frontend-only.am --- opari2-2.0.5/build-includes/frontend-only.am 2019-07-26 09:16:10.861167382 +0000 +++ opari2-2.0.6/build-includes/frontend-only.am 2021-02-25 12:51:08.223909931 +0000 @@ -2,5 +2,7 @@ include ../src/opari/Makefile.inc.am include ../src/opari-lib-dummy/Makefile.inc.am +include ../doc/example/openmp/Makefile.inc.am +include ../doc/example/pomp/Makefile.inc.am include ../test/Makefile.inc.am diff -Nru opari2-2.0.5/ChangeLog opari2-2.0.6/ChangeLog --- opari2-2.0.5/ChangeLog 2019-07-26 09:16:10.797167183 +0000 +++ opari2-2.0.6/ChangeLog 2021-02-25 12:51:08.215909906 +0000 @@ -1,3 +1,11 @@ +------------------- Released version 2.0.6 --------------------------- + +- make check's test/awk_script_test.sh was reported to fail due to + wrong ordering of regions provided by + pomp2_parse_init_regions.awk. Fixed. + +- Handle C++11 multi line strings literals with arbitrary delimiter + ------------------- Released version 2.0.5 --------------------------- - The number of regions reported by POMP2_Get_num_regions() was too diff -Nru opari2-2.0.5/common/utils/test/cutest/CuTest.c opari2-2.0.6/common/utils/test/cutest/CuTest.c --- opari2-2.0.5/common/utils/test/cutest/CuTest.c 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/common/utils/test/cutest/CuTest.c 2021-02-25 12:51:08.227909944 +0000 @@ -0,0 +1,660 @@ +#include + +#include +#include +#include +#include +#include +#include +#include + +#if defined( CUTEST_USE_COLOR ) && CUTEST_USE_COLOR +#include +#endif + +#include "CuTest.h" + +/*-------------------------------------------------------------------------* +* CuStr +*-------------------------------------------------------------------------*/ + +char* +CuStrAlloc( int size ) +{ + char* newStr = ( char* )malloc( sizeof( char ) * ( size ) ); + return newStr; +} + +char* +CuStrCopy( const char* old ) +{ + int len = strlen( old ); + char* newStr = CuStrAlloc( len + 1 ); + strcpy( newStr, old ); + return newStr; +} + +/*-------------------------------------------------------------------------* +* CuString +*-------------------------------------------------------------------------*/ + +void +CuStringInit( CuString* str ) +{ + str->length = 0; + str->size = STRING_MAX; + str->buffer = ( char* )malloc( sizeof( char ) * str->size ); + str->buffer[ 0 ] = '\0'; +} + +CuString* +CuStringNew( void ) +{ + CuString* str = ( CuString* )malloc( sizeof( CuString ) ); + CuStringInit( str ); + return str; +} + +void +CuStringClear( CuString* str ) +{ + if ( str ) + { + free( str->buffer ); + str->buffer = NULL; + } +} + +void +CuStringFree( CuString* str ) +{ + CuStringClear( str ); + free( str ); +} + +void +CuStringReset( CuString* str ) +{ + str->length = 0; + str->buffer[ 0 ] = '\0'; +} + +void +CuStringResize( CuString* str, + int newSize ) +{ + str->buffer = ( char* )realloc( str->buffer, sizeof( char ) * newSize ); + str->size = newSize; +} + +void +CuStringAppend( CuString* str, + const char* text ) +{ + int length; + + if ( text == NULL ) + { + text = "NULL"; + } + + length = strlen( text ); + if ( str->length + length + 1 >= str->size ) + { + CuStringResize( str, str->length + length + 1 + STRING_INC ); + } + str->length += length; + strcat( str->buffer, text ); +} + +void +CuStringAppendChar( CuString* str, + char ch ) +{ + char text[ 2 ]; + text[ 0 ] = ch; + text[ 1 ] = '\0'; + CuStringAppend( str, text ); +} + +void +CuStringAppendFormat( CuString* str, + const char* format, + ... ) +{ + va_list argp; + va_start( argp, format ); + CuStringAppendVFormat( str, format, argp ); + va_end( argp ); +} + +void +CuStringAppendVFormat( CuString* str, + const char* format, + va_list argp ) +{ + char buf[ HUGE_STRING_LEN ]; + vsprintf( buf, format, argp ); + CuStringAppend( str, buf ); +} + +void +CuStringInsert( CuString* str, + const char* text, + int pos ) +{ + int length = strlen( text ); + if ( pos > str->length ) + { + pos = str->length; + } + if ( str->length + length + 1 >= str->size ) + { + CuStringResize( str, str->length + length + 1 + STRING_INC ); + } + memmove( str->buffer + pos + length, str->buffer + pos, ( str->length - pos ) + 1 ); + str->length += length; + memcpy( str->buffer + pos, text, length ); +} + +/*-------------------------------------------------------------------------* +* CuTest +*-------------------------------------------------------------------------*/ +static void +CuTestAllreduceInternal( int* success ) +{ + return; +} + +void +CuTestInit( CuTest* t, + const char* name, + TestFunction function ) +{ + t->name = CuStrCopy( name ); + t->failed = 0; + t->ran = 0; + t->message = NULL; + t->function = function; + t->userArg = NULL; + t->testAllreduce = CuTestAllreduceInternal; + t->jumpBuf = NULL; + t->next = NULL; +} + +CuTest* +CuTestNew( const char* name, + TestFunction function ) +{ + CuTest* tc = CU_ALLOC( CuTest ); + CuTestInit( tc, name, function ); + return tc; +} + +void +CuTestClear( CuTest* t ) +{ + if ( t ) + { + free( ( char* )t->name ); + t->name = NULL; + } +} + +void +CuTestFree( CuTest* t ) +{ + CuTestClear( t ); + free( t ); +} + +void +CuTestRun( CuTest* tc ) +{ + jmp_buf buf; + tc->jumpBuf = &buf; + if ( setjmp( buf ) == 0 ) + { + tc->ran = 1; + ( tc->function )( tc ); + } + tc->jumpBuf = 0; +} + +static void +CuFailInternal( CuTest* tc, + const char* file, + int line, + CuString* string ) +{ + char buf[ HUGE_STRING_LEN ]; + + sprintf( buf, "%s:%d: ", file, line ); + CuStringInsert( string, buf, 0 ); + + tc->failed = 1; + tc->message = string->buffer; + if ( tc->jumpBuf != 0 ) + { + longjmp( *( tc->jumpBuf ), 1 ); + } +} + +void +CuFail_Line( CuTest* tc, + const char* file, + int line, + const char* message2, + const char* message ) +{ + CuString string; + + CuStringInit( &string ); + if ( message2 != NULL ) + { + CuStringAppend( &string, message2 ); + CuStringAppend( &string, ": " ); + } + CuStringAppend( &string, message ); + CuFailInternal( tc, file, line, &string ); + CuStringClear( &string ); +} + +void +CuAssert_Line( CuTest* tc, + const char* file, + int line, + const char* message, + int success ) +{ + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + CuFail_Line( tc, file, line, NULL, message ); +} + +void +CuAssertStrEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + const char* expected, + const char* actual ) +{ + CuString string; + int success = 0; + + if ( ( expected == NULL && actual == NULL ) || + ( expected != NULL && actual != NULL && + strcmp( expected, actual ) == 0 ) ) + { + success = 1; + } + + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + CuStringInit( &string ); + if ( message != NULL ) + { + CuStringAppend( &string, message ); + CuStringAppend( &string, ": " ); + } + CuStringAppend( &string, "expected <" ); + CuStringAppend( &string, expected ); + CuStringAppend( &string, "> but was <" ); + CuStringAppend( &string, actual ); + CuStringAppend( &string, ">" ); + CuFailInternal( tc, file, line, &string ); + CuStringClear( &string ); +} + +void +CuAssertIntEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + int expected, + int actual ) +{ + char buf[ STRING_MAX ]; + int success = 0; + + if ( expected == actual ) + { + success = 1; + } + + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + sprintf( buf, "expected <%d> but was <%d>", expected, actual ); + CuFail_Line( tc, file, line, message, buf ); +} + + +void +CuAssertIntNotEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + int notExpected, + int actual ) +{ + char buf[ STRING_MAX ]; + int success = 0; + + if ( notExpected != actual ) + { + success = 1; + } + + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + sprintf( buf, "Not expected <%d> but was <%d>", notExpected, actual ); + CuFail_Line( tc, file, line, message, buf ); +} + +void +CuAssertDblEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + double expected, + double actual, + double delta ) +{ + char buf[ STRING_MAX ]; + int success = 0; + + if ( fabs( expected - actual ) <= delta ) + { + success = 1; + } + + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + sprintf( buf, "expected <%lf> but was <%lf>", expected, actual ); + CuFail_Line( tc, file, line, message, buf ); +} + +void +CuAssertPtrEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + void* expected, + void* actual ) +{ + char buf[ STRING_MAX ]; + int success = 0; + + if ( expected == actual ) + { + success = 1; + } + + tc->failedLocally = !success; + + tc->testAllreduce( &success ); + if ( success ) + { + return; + } + + sprintf( buf, "expected pointer <%p> but was <%p>", expected, actual ); + CuFail_Line( tc, file, line, message, buf ); +} + + +/*-------------------------------------------------------------------------* +* CuSuite +*-------------------------------------------------------------------------*/ + +static char* color_red = ""; +static char* color_grn = ""; +static char* color_yel = ""; +static char* color_std = ""; + +void +CuUseColors( void ) +{ + if ( 0 != strcmp( getenv( "AM_COLOR_TESTS" ) ? getenv( "AM_COLOR_TESTS" ) : "", "no" ) + && 0 != strcmp( getenv( "TERM" ) ? getenv( "TERM" ) : "", "dumb" ) + && ( ( getenv( "AM_COLOR_TESTS" ) + && 0 == strcmp( getenv( "AM_COLOR_TESTS" ), "always" ) ) +#if defined( CUTEST_USE_COLOR ) && CUTEST_USE_COLOR + || isatty( STDOUT_FILENO ) +#endif + || 0 == system( "test -t 1" ) ) ) + { + color_red = "\033[31m"; + color_grn = "\033[32m"; + color_yel = "\033[33m"; + color_std = "\033[m"; + } +} + +void +CuSuiteInit( const char* name, + CuSuite* testSuite, + int currentRank, + TestAllreduce testAllreduce ) +{ + testSuite->name = CuStrCopy( name ); + testSuite->count = 0; + testSuite->failCount = 0; + testSuite->head = NULL; + testSuite->tail = &testSuite->head; + testSuite->currentRank = currentRank; + testSuite->masterRank = currentRank; + + if ( testAllreduce ) + { + testSuite->testAllreduce = testAllreduce; + /* determine the lowest rank and use this as the master rank */ + testSuite->testAllreduce( &testSuite->masterRank ); + } + else + { + testSuite->testAllreduce = CuTestAllreduceInternal; + } +} + +CuSuite* +CuSuiteNew( const char* name ) +{ + CuSuite* testSuite = CU_ALLOC( CuSuite ); + CuSuiteInit( name, testSuite, 0, NULL ); + return testSuite; +} + +CuSuite* +CuSuiteNewParallel( const char* name, + int currentRank, + TestAllreduce testAllreduce ) +{ + CuSuite* testSuite = CU_ALLOC( CuSuite ); + CuSuiteInit( name, testSuite, currentRank, testAllreduce ); + return testSuite; +} + +void +CuSuiteClear( CuSuite* testSuite ) +{ + if ( testSuite ) + { + CuTest* test = testSuite->head; + while ( test ) + { + CuTest* next = test->next; + CuTestFree( test ); + test = next; + } + + free( ( char* )testSuite->name ); + testSuite->name = NULL; + } +} + +void +CuSuiteFree( CuSuite* testSuite ) +{ + CuSuiteClear( testSuite ); + free( testSuite ); +} + +void +CuSuiteAdd( CuSuite* testSuite, + CuTest* testCase ) +{ + testCase->testAllreduce = testSuite->testAllreduce; + + *testSuite->tail = testCase; + testSuite->tail = &testCase->next; + testSuite->count++; +} + +void +CuSuiteAddSuite( CuSuite* testSuite, + CuSuite* testSuite2 ) +{ + if ( testSuite2->count ) + { + CuSuiteAdd( testSuite, testSuite2->head ); + /* need to adjust count in testSuite */ + testSuite->count += testSuite2->count - 1; + } + CuSuiteClear( testSuite2 ); +} + +void +CuSuiteRun( CuSuite* testSuite ) +{ + int i = 1; + CuTest* testCase = testSuite->head; + + if ( testSuite->masterRank == testSuite->currentRank ) + { + printf( "%s%s:%s\n", color_yel, testSuite->name, color_std ); + } + + while ( testCase ) + { + CuTestRun( testCase ); + + if ( testCase->failed ) + { + testSuite->failCount++; + + int isSerialTest = testSuite->testAllreduce == CuTestAllreduceInternal; + if ( isSerialTest ) + { + printf( " %sFAIL%s %d: %s: %s%s%s\n", color_red, color_std, + i, testCase->name, + color_red, testCase->message, color_std ); + } + else + { + if ( testCase->failedLocally ) + { + printf( " %sFAIL on Rank %d%s %d: %s: %s%s%s\n", + color_red, testSuite->currentRank, color_std, + i, testCase->name, + color_red, testCase->message, color_std ); + } + + int fakeBarrier = 0; + testSuite->testAllreduce( &fakeBarrier ); + } + break; + } + else + { + if ( testSuite->masterRank == testSuite->currentRank ) + { + printf( " %sok%s %d: %s\n", color_grn, color_std, + i, testCase->name ); + } + } + + testCase = testCase->next; + i++; + } +} + +void +CuSuiteSummary( CuSuite* testSuite, + CuString* details ) +{ + int runCount = 0; + const char* testWord; + + if ( testSuite->masterRank != testSuite->currentRank ) + { + return; + } + + if ( testSuite->failCount == 0 ) + { + testWord = testSuite->count == 1 ? "test" : "tests"; + CuStringAppendFormat( details, "%sOK%s (%d %s)\n", + color_grn, color_std, + testSuite->count, testWord ); + } + else + { + for ( CuTest* testCase = testSuite->head; + testCase; + testCase = testCase->next ) + { + if ( !testCase->ran ) + { + continue; + } + runCount++; + } + testWord = testSuite->failCount == 1 ? "test" : "tests"; + CuStringAppendFormat( details, "%sFAIL%s (%d %s)", + color_red, color_std, + testSuite->failCount, testWord ); + if ( runCount - testSuite->failCount ) + { + testWord = ( runCount - testSuite->failCount ) == 1 ? "test" : "tests"; + CuStringAppendFormat( details, " OK (%d %s)", runCount - testSuite->failCount, testWord ); + } + if ( testSuite->count - runCount ) + { + testWord = ( testSuite->count - runCount ) == 1 ? "test" : "tests"; + CuStringAppendFormat( details, " LEFT (%d %s)", testSuite->count - runCount, testWord ); + } + CuStringAppendFormat( details, "\n" ); + } +} diff -Nru opari2-2.0.5/common/utils/test/cutest/CuTest.h opari2-2.0.6/common/utils/test/cutest/CuTest.h --- opari2-2.0.5/common/utils/test/cutest/CuTest.h 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/common/utils/test/cutest/CuTest.h 2021-02-25 12:51:08.227909944 +0000 @@ -0,0 +1,224 @@ +#ifndef CU_TEST_H +#define CU_TEST_H + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* CuString */ + +char* +CuStrAlloc( int size ); +char* +CuStrCopy( const char* old ); + +#define CU_ALLOC( TYPE ) ( ( TYPE* )calloc( 1, sizeof( TYPE ) ) ) + +#define HUGE_STRING_LEN 8192 +#define STRING_MAX 256 +#define STRING_INC 256 + +typedef struct +{ + int length; + int size; + char* buffer; +} CuString; + +void +CuStringInit( CuString* str ); +CuString* +CuStringNew( void ); +void +CuStringClear( CuString* str ); +void +CuStringFree( CuString* str ); +void +CuStringReset( CuString* str ); +void +CuStringAppend( CuString* str, + const char* text ); +void +CuStringAppendChar( CuString* str, + char ch ); +void +CuStringAppendFormat( CuString* str, + const char* format, + ... ); +void +CuStringAppendVFormat( CuString* str, + const char* format, + va_list argp ); +void +CuStringInsert( CuString* str, + const char* text, + int pos ); +void +CuStringResize( CuString* str, + int newSize ); + +/* CuTest */ + +typedef struct CuTest CuTest; + +typedef void ( * TestFunction )( CuTest* ); +typedef void ( * TestAllreduce )( int* ); + +struct CuTest +{ + const char* name; + TestFunction function; + void* userArg; + TestAllreduce testAllreduce; + int failed; + int failedLocally; + int ran; + const char* message; + jmp_buf* jumpBuf; + struct CuTest* next; +}; + +void +CuTestInit( CuTest* t, + const char* name, + TestFunction function ); +CuTest* +CuTestNew( const char* name, + TestFunction function ); +void +CuTestClear( CuTest* t ); +void +CuTestFree( CuTest* t ); +void +CuTestRun( CuTest* tc ); + +/* Internal versions of assert functions -- use the public versions */ +void +CuFail_Line( CuTest* tc, + const char* file, + int line, + const char* message2, + const char* message ); +void +CuAssert_Line( CuTest* tc, + const char* file, + int line, + const char* message, + int success ); +void +CuAssertStrEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + const char* expected, + const char* actual ); +void +CuAssertIntEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + int expected, + int actual ); + +void +CuAssertIntNotEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + int notExpected, + int actual ); +void +CuAssertDblEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + double expected, + double actual, + double delta ); +void +CuAssertPtrEquals_LineMsg( CuTest* tc, + const char* file, + int line, + const char* message, + void* expected, + void* actual ); + +/* public assert functions */ + +#define __CuStringify( x ) #x +#define _CuStringify( x ) __CuStringify( x ) +#define CuFail( tc, ms ) CuFail_Line( ( tc ), __FILE__, __LINE__, NULL, ( ms ) ) +#define CuAssert( tc, ms, cond ) CuAssert_Line( ( tc ), __FILE__, __LINE__, ms ": " _CuStringify( cond ), ( cond ) ) +#define CuAssertTrue( tc, cond ) CuAssert_Line( ( tc ), __FILE__, __LINE__, "assert failed", ( cond ) ) + +#define CuAssertStrEquals( tc, ex, ac ) CuAssertStrEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) +#define CuAssertStrEqualsMsg( tc, ms, ex, ac ) CuAssertStrEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) +#define CuAssertIntNotEquals( tc, nex, ac ) CuAssertIntNotEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( nex ), ( ac ) ) +#define CuAssertIntNotEqualsMsg( tc, ms, nex, ac ) CuAssertIntNotEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( nex ), ( ac ) ) +#define CuAssertIntEquals( tc, ex, ac ) CuAssertIntEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) +#define CuAssertIntEqualsMsg( tc, ms, ex, ac ) CuAssertIntEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) +#define CuAssertDblEquals( tc, ex, ac, dl ) CuAssertDblEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ), ( dl ) ) +#define CuAssertDblEqualsMsg( tc, ms, ex, ac, dl ) CuAssertDblEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ), ( dl ) ) +#define CuAssertPtrEquals( tc, ex, ac ) CuAssertPtrEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) +#define CuAssertPtrEqualsMsg( tc, ms, ex, ac ) CuAssertPtrEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) + +#define CuAssertPtrNotNull( tc, p ) CuAssert_Line( ( tc ), __FILE__, __LINE__, "null pointer unexpected", ( p != NULL ) ) +#define CuAssertPtrNotNullMsg( tc, msg, p ) CuAssert_Line( ( tc ), __FILE__, __LINE__, ( msg ), ( p != NULL ) ) + +/* CuSuite */ + +#define SUITE_ADD_TEST( SUITE, TEST ) CuSuiteAdd( SUITE, CuTestNew( _CuStringify( TEST ), TEST ) ) +#define SUITE_ADD_TEST_NAME( SUITE, TEST, NAME ) CuSuiteAdd( SUITE, CuTestNew( NAME, TEST ) ) + +typedef struct +{ + const char* name; + int count; + CuTest* head; + CuTest** tail; + int failCount; + + int currentRank; + int masterRank; + TestAllreduce testAllreduce; +} CuSuite; + + +void +CuUseColors( void ); + +void +CuSuiteInit( const char* name, + CuSuite* testSuite, + int currentRank, + TestAllreduce testAllreduce ); +CuSuite* +CuSuiteNew( const char* name ); +CuSuite* +CuSuiteNewParallel( const char* name, + int currentRank, + TestAllreduce testAllreduce ); +void +CuSuiteClear( CuSuite* testSuite ); +void +CuSuiteFree( CuSuite* testSuite ); +void +CuSuiteAdd( CuSuite* testSuite, + CuTest* testCase ); +void +CuSuiteAddSuite( CuSuite* testSuite, + CuSuite* testSuite2 ); +void +CuSuiteRun( CuSuite* testSuite ); +void +CuSuiteSummary( CuSuite* testSuite, + CuString* summary ); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* CU_TEST_H */ diff -Nru opari2-2.0.5/common/utils/test/cutest/license.txt opari2-2.0.6/common/utils/test/cutest/license.txt --- opari2-2.0.5/common/utils/test/cutest/license.txt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/common/utils/test/cutest/license.txt 2021-02-25 12:51:08.227909944 +0000 @@ -0,0 +1,38 @@ +NOTE + +The license is based on the zlib/libpng license. For more details see +http://www.opensource.org/licenses/zlib-license.html. The intent of the +license is to: + +- keep the license as simple as possible +- encourage the use of CuTest in both free and commercial applications + and libraries +- keep the source code together +- give credit to the CuTest contributors for their work + +If you ship CuTest in source form with your source distribution, the +following license document must be included with it in unaltered form. +If you find CuTest useful we would like to hear about it. + +LICENSE + +Copyright (c) 2003 Asim Jalis + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not +claim that you wrote the original software. If you use this software in +a product, an acknowledgment in the product documentation would be +appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and must not +be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. diff -Nru opari2-2.0.5/common/utils/test/cutest/README.txt opari2-2.0.6/common/utils/test/cutest/README.txt --- opari2-2.0.5/common/utils/test/cutest/README.txt 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/common/utils/test/cutest/README.txt 2021-02-25 12:51:08.227909944 +0000 @@ -0,0 +1,211 @@ +HOW TO USE + +You can use CuTest to create unit tests to drive your development +in the style of Extreme Programming. You can also add unit tests to +existing code to ensure that it works as you suspect. + +Your unit tests are an investment. They let you to change your +code and add new features confidently without worrying about +accidentally breaking earlier features. + + +LICENSING + +For details on licensing see license.txt. + + +GETTING STARTED + +To add unit testing to your C code the only files you need are +CuTest.c and CuTest.h. + +CuTestTest.c and AllTests.c have been included to provide an +example of how to write unit tests and then how to aggregate them +into suites and into a single AllTests.c file. Suites allow you +to put group tests into logical sets. AllTests.c combines all the +suites and runs them. + +You should not have to look inside CuTest.c. Looking in +CuTestTest.c and AllTests.c (for example usage) should be +sufficient. + +After downloading the sources, run your compiler to create an +executable called AllTests.exe. For example, if you are using +Windows with the cl.exe compiler you would type: + + cl.exe AllTests.c CuTest.c CuTestTest.c + AllTests.exe + +This will run all the unit tests associated with CuTest and print +the output on the console. You can replace cl.exe with gcc or +your favorite compiler in the command above. + + +DETAILED EXAMPLE + +Here is a more detailed example. We will work through a simple +test first exercise. The goal is to create a library of string +utilities. First, lets write a function that converts a +null-terminated string to all upper case. + +Ensure that CuTest.c and CuTest.h are accessible from your C +project. Next, create a file called StrUtil.c with these +contents: + + #include "CuTest.h" + + char* StrToUpper(char* str) { + return str; + } + + void TestStrToUpper(CuTest *tc) { + char* input = strdup("hello world"); + char* actual = StrToUpper(input); + char* expected = "HELLO WORLD"; + CuAssertStrEquals(tc, expected, actual); + } + + CuSuite* StrUtilGetSuite() { + CuSuite* suite = CuSuiteNew(); + SUITE_ADD_TEST(suite, TestStrToUpper); + return suite; + } + +Create another file called AllTests.c with these contents: + + #include "CuTest.h" + + CuSuite* StrUtilGetSuite(); + + void RunAllTests(void) { + CuString *output = CuStringNew(); + CuSuite* suite = CuSuiteNew(); + + CuSuiteAddSuite(suite, StrUtilGetSuite()); + + CuSuiteRun(suite); + CuSuiteSummary(suite, output); + CuSuiteDetails(suite, output); + printf("%s\n", output->buffer); + } + + int main(void) { + RunAllTests(); + } + +Then type this on the command line: + + gcc AllTests.c CuTest.c StrUtil.c + +to compile. You can replace gcc with your favorite compiler. +CuTest should be portable enough to handle all Windows and Unix +compilers. Then to run the tests type: + + a.out + +This will print an error because we haven't implemented the +StrToUpper function correctly. We are just returning the string +without changing it to upper case. + + char* StrToUpper(char* str) { + return str; + } + +Rewrite this as follows: + + char* StrToUpper(char* str) { + char* p; + for (p = str ; *p ; ++p) *p = toupper(*p); + return str; + } + +Recompile and run the tests again. The test should pass this +time. + + +WHAT TO DO NEXT + +At this point you might want to write more tests for the +StrToUpper function. Here are some ideas: + +TestStrToUpper_EmptyString : pass in "" +TestStrToUpper_UpperCase : pass in "HELLO WORLD" +TestStrToUpper_MixedCase : pass in "HELLO world" +TestStrToUpper_Numbers : pass in "1234 hello" + +As you write each one of these tests add it to StrUtilGetSuite +function. If you don't the tests won't be run. Later as you write +other functions and write tests for them be sure to include those +in StrUtilGetSuite also. The StrUtilGetSuite function should +include all the tests in StrUtil.c + +Over time you will create another file called FunkyStuff.c +containing other functions unrelated to StrUtil. Follow the same +pattern. Create a FunkyStuffGetSuite function in FunkyStuff.c. +And add FunkyStuffGetSuite to AllTests.c. + +The framework is designed in the way it is so that it is easy to +organize a lot of tests. + +THE BIG PICTURE + +Each individual test corresponds to a CuTest. These are grouped +to form a CuSuite. CuSuites can hold CuTests or other CuSuites. +AllTests.c collects all the CuSuites in the program into a single +CuSuite which it then runs as a single CuSuite. + +The project is open source so feel free to take a peek under the +hood at the CuTest.c file to see how it works. CuTestTest.c +contains tests for CuTest.c. So CuTest tests itself. + +Since AllTests.c has a main() you will need to exclude this when +you are building your product. Here is a nicer way to do this if +you want to avoid messing with multiple builds. Remove the main() +in AllTests.c. Note that it just calls RunAllTests(). Instead +we'll call this directly from the main program. + +Now in the main() of the actual program check to see if the +command line option "--test" was passed. If it was then I call +RunAllTests() from AllTests.c. Otherwise run the real program. + +Shipping the tests with the code can be useful. If you customers +complain about a problem you can ask them to run the unit tests +and send you the output. This can help you to quickly isolate the +piece of your system that is malfunctioning in the customer's +environment. + +CuTest offers a rich set of CuAssert functions. Here is a list: + +void CuAssert(CuTest* tc, char* message, int condition); +void CuAssertTrue(CuTest* tc, int condition); +void CuAssertStrEquals(CuTest* tc, char* expected, char* actual); +void CuAssertIntEquals(CuTest* tc, int expected, int actual); +void CuAssertPtrEquals(CuTest* tc, void* expected, void* actual); +void CuAssertPtrNotNull(CuTest* tc, void* pointer); + +The project is open source and so you can add other more powerful +asserts to make your tests easier to write and more concise. +Please feel free to send me changes you make so that I can +incorporate them into future releases. + +If you see any errors in this document please contact me at +asimjalis@peakprogramming.com. + + +AUTOMATING TEST SUITE GENERATION + +make-tests.sh will grep through all the .c files in the current +directory and generate the code to run all the tests contained in +them. Using this script you don't have to worry about writing +AllTests.c or dealing with any of the other suite code. + + +CREDITS + +These people have contributed useful code changes to the CuTest project. +Thanks! + +- [02.23.2003] Dave Glowacki +- [04.17.2009] Tobias Lippert +- [11.13.2009] Eli Bendersky +- [12.14.2009] Andrew Brown diff -Nru opari2-2.0.5/configure opari2-2.0.6/configure --- opari2-2.0.5/configure 2019-07-26 09:16:14.489178674 +0000 +++ opari2-2.0.6/configure 2021-02-25 12:51:12.079922204 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for OPARI2 2.0.5. +# Generated by GNU Autoconf 2.69 for OPARI2 2.0.6. # # Report bugs to . # @@ -81,6 +81,37 @@ fi +# need to catch these variables, before unsetting them later +: ${AS_COLOR:=$CLICOLOR}; export AS_COLOR +: ${AS_COLOR_FORCE:=$CLICOLOR_FORCE}; export AS_COLOR_FORCE + +as__red= +as__grn= +as__yel= +as__blu= +as__mag= +as__cya= +as__gry= +as__std= +as__color=no +if test "X$AS_COLOR_FORCE" = X0; then + as__color=no; +elif test "X$AS_COLOR_FORCE" = X1; then + as__color=yes +elif { test "X$TERM" != Xdumb || test "X$AS_COLOR" = X1; } && { test -t 1; } 2>/dev/null; then + as__color=yes +fi +if test $as__color = yes; then + as__red='' + as__grn='' + as__yel='' + as__blu='' + as__mag='' + as__cya='' + as__gry='' + as__std='' +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -525,7 +556,7 @@ ax_sub_configure=$ac_aux_dir/configure else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ax_subdir" >&5 -$as_echo "$as_me: WARNING: no configuration information is in $ax_subdir" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: no configuration information is in $ax_subdir${as__std}" >&2;} ax_sub_configure= fi @@ -538,8 +569,8 @@ ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +$as_echo "$as_me: ${as__blu}info: running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir${as__std}" >&2;} # The eval makes quoting arguments work. eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || @@ -562,7 +593,7 @@ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: ${as__red}error: $2${as__std}" >&2 as_fn_exit $as_status } # as_fn_error @@ -727,8 +758,8 @@ # Identity of this package. PACKAGE_NAME='OPARI2' PACKAGE_TARNAME='opari2' -PACKAGE_VERSION='2.0.5' -PACKAGE_STRING='OPARI2 2.0.5' +PACKAGE_VERSION='2.0.6' +PACKAGE_STRING='OPARI2 2.0.6' PACKAGE_BUGREPORT='support@score-p.org' PACKAGE_URL='' @@ -739,7 +770,6 @@ ac_subst_vars='LTLIBOBJS LIBOBJS OPARI2_AWK -SED ax_config_subdirs CROSS_BUILD_FALSE CROSS_BUILD_TRUE @@ -756,6 +786,9 @@ HAVE_UNCRUSTIFY_FALSE HAVE_UNCRUSTIFY_TRUE ac_scorep_have_uncrustify +has_ftn +has_CC +has_cc build_os build_vendor build_cpu @@ -790,8 +823,9 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -SVN_CONTROLLED_FALSE -SVN_CONTROLLED_TRUE +SED +GIT_CONTROLLED_FALSE +GIT_CONTROLLED_TRUE LIBRARY_AGE LIBRARY_REVISION LIBRARY_CURRENT @@ -799,6 +833,7 @@ PACKAGE_BUGFIX PACKAGE_MINOR PACKAGE_MAJOR +afs_srcdir AFS_PACKAGE_NAME AFS_PACKAGE_name target_alias @@ -1252,9 +1287,9 @@ *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: ${as__yel}WARNING: you should use --build, --host, --target${as__std}" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: ${as__yel}WARNING: invalid host type: $ac_option${as__std}" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1270,7 +1305,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) $as_echo "$as_me: ${as__yel}WARNING: unrecognized options: $ac_unrecognized_opts${as__std}" >&2 ;; esac fi @@ -1391,7 +1426,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures OPARI2 2.0.5 to adapt to many kinds of systems. +\`configure' configures OPARI2 2.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1460,7 +1495,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of OPARI2 2.0.5:";; + short | recursive ) echo "Configuration of OPARI2 2.0.6:";; esac cat <<\_ACEOF @@ -1484,7 +1519,7 @@ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-custom-compilers Customize compiler settings by 1. copying the files - /vendor/common/build-config/platforms/platform-*-user-provided + /build-config/common/platforms/platform-*-user-provided to the directory where you run configure , 2. editing those files to your needs, and 3. running configure. Alternatively, edit the files under @@ -1550,7 +1585,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: ${as__yel}WARNING: no configuration information is in $ac_dir${as__std}" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1559,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -OPARI2 configure 2.0.5 +OPARI2 configure 2.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1576,7 +1611,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by OPARI2 $as_me 2.0.5, which was +It was created by OPARI2 $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1699,7 +1734,7 @@ *${as_nl}*) case $ac_var in #( *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: cache variable $ac_var contains a newline${as__std}" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1828,14 +1863,14 @@ do test "x$ac_site_file" = xNONE && continue if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: loading site script $ac_site_file" >&5 +$as_echo "$as_me: ${as__blu}info: loading site script $ac_site_file${as__std}" >&2;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +$as_echo "$as_me: ${as__red}error: in \`$ac_pwd':${as__std}" >&2;} +as_fn_error $? "failed to load site script $ac_site_file" "$LINENO" 5 +as_fn_error $? "See \`config.log' for more details" "$LINENO" 5; } fi done @@ -1843,16 +1878,16 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: loading cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: loading cache $cache_file${as__std}" >&2;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: creating cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: creating cache $cache_file${as__std}" >&2;} >$cache_file fi @@ -1935,6 +1970,44 @@ +afs_srcdir=$srcdir + + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Git controlled" >&5 +$as_echo_n "checking Git controlled... " >&6; } +ac_scorep_git_controlled="no" + +# test if ${afs_srcdir} is a git top-level, not any parent directory: +# * if ${afs_srcdir} is a top-level, than the prefix is empty (e.g., we are git controlled) +# * if ${afs_srcdir} is below a top-level, than it wont be empty (e.g., we operate in a +# tarball, which was extracted below a top-level) +# * if git could not find any top-level, it prints an error to stderr and stop, +# we catch this error, which makes the test also fail (e.g., we operate in a +# tarball which is *not* below any top-level) +if test -z "$( + unset $(git rev-parse --local-env-vars 2>/dev/null) && + cd ${afs_srcdir} && + git rev-parse --show-prefix 2>&1)"; then : + ac_scorep_git_controlled="yes" + +$as_echo "#define SCOREP_IN_DEVELOPEMENT /**/" >>confdefs.h + +else + +$as_echo "#define SCOREP_IN_PRODUCTION /**/" >>confdefs.h + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_git_controlled" >&5 +case "$ac_scorep_git_controlled" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_git_controlled${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_git_controlled${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_git_controlled${as__std}" >&6 ;; +esac; } PACKAGE_MAJOR=2 @@ -1943,7 +2016,7 @@ PACKAGE_MINOR=0 - PACKAGE_BUGFIX=5 + PACKAGE_BUGFIX=6 PACKAGE_SUFFIX= @@ -1963,6 +2036,7 @@ + # When in a working copy, write REVISION* files. The REVISION* files # are updated during each configure call and also at make # doxygen-user. @@ -1971,32 +2045,25 @@ # are provided. component_revision="invalid" -common_revision="invalid" -which svnversion 2>&1 >/dev/null -if test $? -eq 0; then : - component_revision=`svnversion -c $srcdir | cut -d ':' -f 2` - common_revision=`svnversion -c $srcdir/vendor/common | cut -d ':' -f 2` - # If we are in a working copy, update the REVISION* files. - if test "x$component_revision" != "xexported" && \ - test "x$component_revision" != "xUnversioned directory"; then : - echo $component_revision > $srcdir/build-config/REVISION -fi - if test "x$common_revision" != "xexported" && \ - test "x$component_revision" != "xUnversioned directory"; then : - echo $common_revision > $srcdir/build-config/REVISION_COMMON -fi -fi - -# Warn if the REVISION* files contain anything but plain numbers. -if grep -E [A-Z] $srcdir/build-config/REVISION > /dev/null || \ - grep ":" $srcdir/build-config/REVISION > /dev/null || \ - grep -E [A-Z] $srcdir/build-config/REVISION_COMMON > /dev/null || \ - grep ":" $srcdir/build-config/REVISION_COMMON > /dev/null; then : - component_revision=`cat $srcdir/build-config/REVISION` - common_revision=`cat $srcdir/build-config/REVISION_COMMON` - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: distribution does not match a single, unmodified revision, but $component_revision (${PACKAGE_NAME}) and $common_revision (common)." >&5 -$as_echo "$as_me: WARNING: distribution does not match a single, unmodified revision, but $component_revision (${PACKAGE_NAME}) and $common_revision (common)." >&2;} -fi +if test "x${ac_scorep_git_controlled}" = xyes && + component_revision=$( + unset $(git rev-parse --local-env-vars 2>/dev/null) && + cd ${afs_srcdir} && + git describe --always --dirty 2>/dev/null); then : + echo "$component_revision" >${afs_srcdir}/build-config/REVISION +else + component_revision=external +fi + +# Warn if the REVISION files contain -dirty prefix or is external. +case `cat ${afs_srcdir}/build-config/REVISION` in #( + *-dirty|external|invalid) : + component_revision=`cat ${afs_srcdir}/build-config/REVISION` + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: distribution does not match a single, unmodified revision, but $component_revision." >&5 +$as_echo "$as_me: ${as__yel}WARNING: distribution does not match a single, unmodified revision, but $component_revision.${as__std}" >&2;} ;; #( + *) : + ;; +esac @@ -2064,25 +2131,177 @@ ## Set the default installation prefix to /opt/opari2 instead of /usr/local +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi -ac_scorep_svn_controlled="no" -svn info ${srcdir} > /dev/null 2>&1 -if test $? -eq 0; then : - ac_scorep_svn_controlled="yes" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +case "$ac_cv_path_SED" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_SED${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_SED${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_SED${as__std}" >&6 ;; +esac; } + SED="$ac_cv_path_SED" + rm -f conftest.sed -$as_echo "#define SCOREP_IN_DEVELOPEMENT /**/" >>confdefs.h + + +# afs_fn_summary DESCR VALUE INDENT WRAP-MARGIN=128 +# ---------------------------------------------------------------------- +# Produces a line-wrapped summary line with DESCR and VALUE, indented by +# INDENT and wrapped at WRAP-MARGIN. +afs_fn_summary () +{ + _afs_summary_wrap_width=${4-128} + _afs_summary_column_width=32 + _afs_summary_prefix="${3-} ${1-}:" + printf "%s" "${_afs_summary_prefix}" + _afs_summary_padding="$(printf "%-${_afs_summary_column_width}s" "")" + _afs_summary_value="$(echo "${2-}" | $SED -e 's/ */ /g' -e 's/^ //' -e 's/ $//')" + if test ${#_afs_summary_prefix} -ge ${#_afs_summary_padding}; then : + + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" else -$as_echo "#define SCOREP_IN_PRODUCTION /**/" >>confdefs.h + as_fn_arith ${#_afs_summary_padding} - ${#_afs_summary_prefix} && + _afs_summary_nl="$(printf "%-${as_val}s" "")" fi - if test "x${ac_scorep_svn_controlled}" = xyes; then - SVN_CONTROLLED_TRUE= - SVN_CONTROLLED_FALSE='#' + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + while test -n "${_afs_summary_value}" + do + _afs_summary_entry="${_afs_summary_value%% *}" + printf "%s" "${_afs_summary_nl}${_afs_summary_sep}${_afs_summary_entry}" + + case "${_afs_summary_value}" in + (*" "*) _afs_summary_value="${_afs_summary_value#* }" ;; + (*) _afs_summary_value="" ;; + esac + + as_fn_arith ${_afs_summary_column} + ${#_afs_summary_entry} + ${#_afs_summary_sep} && + _afs_summary_column=$as_val + if test ${_afs_summary_column} -ge ${_afs_summary_wrap_width}; then : + + _afs_summary_nl=" \\$as_nl${_afs_summary_padding}" + _afs_summary_sep="" + as_fn_arith ${#_afs_summary_padding} + 1 && + _afs_summary_column=$as_val + else - SVN_CONTROLLED_TRUE='#' - SVN_CONTROLLED_FALSE= + + _afs_summary_sep=" " + _afs_summary_nl="" + +fi + done + echo +{ _afs_summary_column_width=; unset _afs_summary_column_width;} +{ _afs_summary_wrap_width=; unset _afs_summary_wrap_width;} +{ _afs_summary_prefix=; unset _afs_summary_prefix;} +{ _afs_summary_padding=; unset _afs_summary_padding;} +{ _afs_summary_value=; unset _afs_summary_value;} +{ _afs_summary_nl=; unset _afs_summary_nl;} +{ _afs_summary_sep=; unset _afs_summary_sep;} +{ _afs_summary_column=; unset _afs_summary_column;} +{ _afs_summary_entry=; unset _afs_summary_entry;} +{ _afs_summary_tag=; unset _afs_summary_tag;} +{ _afs_summary_tag_final=; unset _afs_summary_tag_final;} + +} # afs_fn_summary + + +rm -f opari2.summary +LC_ALL=C find . -name 'config.summary*' -exec rm -f '{}' \; + +afs_fn_summary \ + "OPARI2 2.0.6" \ + "" \ + "" \ + >config.summary + + + + if test "x${ac_scorep_git_controlled}" = xyes; then + GIT_CONTROLLED_TRUE= + GIT_CONTROLLED_FALSE='#' +else + GIT_CONTROLLED_TRUE='#' + GIT_CONTROLLED_FALSE= +fi + + + +if test "x${verbose}" = "xyes"; then : + + +afs_fn_summary "Git controlled" "$ac_scorep_git_controlled" " " >>config.summary + fi @@ -2173,7 +2392,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +case "$INSTALL" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$INSTALL${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$INSTALL${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$INSTALL${as__std}" >&6 ;; +esac; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2239,7 +2465,7 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -2277,7 +2503,7 @@ else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: 'missing' script is too old or missing${as__std}" >&2;} fi if test x"${install_sh}" != xset; then @@ -2325,10 +2551,17 @@ STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } +case "$STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -2365,10 +2598,17 @@ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } +case "$ac_ct_STRIP" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_ct_STRIP${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_ct_STRIP${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_ct_STRIP${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2377,7 +2617,7 @@ case $cross_compiling:$ac_tool_warned in yes:) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: using cross tools not prefixed with host triplet${as__std}" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2429,7 +2669,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +case "$MKDIR_P" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$MKDIR_P${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$MKDIR_P${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$MKDIR_P${as__std}" >&6 ;; +esac; } for ac_prog in gawk mawk nawk awk do @@ -2463,10 +2710,17 @@ AWK=$ac_cv_prog_AWK if test -n "$AWK"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } +case "$AWK" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$AWK${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$AWK${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$AWK${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -2496,11 +2750,11 @@ fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +$as_echo "${as__grn}yes${as__std}" >&6; } SET_MAKE= else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2542,7 +2796,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +case "$am_cv_make_support_nested_variables" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_make_support_nested_variables${as__std}" >&6 ;; +esac; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -2574,7 +2835,7 @@ # Define the identity of the package. PACKAGE='opari2' - VERSION='2.0.5' + VERSION='2.0.6' cat >>confdefs.h <<_ACEOF @@ -2703,7 +2964,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 -$as_echo "$am_cv_prog_tar_pax" >&6; } +case "$am_cv_prog_tar_pax" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_prog_tar_pax${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_prog_tar_pax${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_prog_tar_pax${as__std}" >&6 ;; +esac; } @@ -2739,7 +3007,14 @@ fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +case "$am_cv_make_support_nested_variables" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$am_cv_make_support_nested_variables${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$am_cv_make_support_nested_variables${as__std}" >&6 ;; +esac; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -2750,7 +3025,7 @@ AM_BACKSLASH='\' -if test "x${ac_scorep_svn_controlled}" = xyes; then : +if test "x${ac_scorep_git_controlled}" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } @@ -2762,7 +3037,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } +case "$USE_MAINTAINER_MODE" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$USE_MAINTAINER_MODE${as__std}" >&6 ;; +esac; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -2786,7 +3068,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } +case "$USE_MAINTAINER_MODE" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$USE_MAINTAINER_MODE${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$USE_MAINTAINER_MODE${as__std}" >&6 ;; +esac; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -2819,7 +3108,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +case "$ac_cv_build" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_build${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_build${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_build${as__std}" >&6 ;; +esac; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2839,14 +3135,6 @@ -rm -f opari2.summary -LC_ALL=C find . -name config.summary -exec rm -f '{}' \; - -cat >config.summary <<_ACEOF - OPARI2 2.0.5: -_ACEOF - - # Notes about platform detection on Cray systems: # First, we check for x86-64 CPU type and an existing /opt/cray/pmi/default link. @@ -2872,8 +3160,6 @@ # /opt/cray/pe/pmi/default. They still provide the network via # /opt/cray/ari/modulefiles. # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform" >&5 -$as_echo_n "checking for platform... " >&6; } # Check whether --enable-platform-mic was given. if test "${enable_platform_mic+set}" = set; then : enableval=$enable_platform_mic; case ${enableval} in #( @@ -2900,7 +3186,8 @@ elif test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys; then : ac_scorep_platform="bgp" elif (test "x${build_cpu}" = "xx86_64" || test "x${build_cpu}" = "xaarch64") && test -d /opt/cray; then : - if test -L /opt/cray/pmi/default; then : + ac_scorep_platform="crayunknown" + if test -L /opt/cray/pmi/default; then : if test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[a-z]*$ | grep -q ss && echo TRUE`" = "xTRUE"; then : ac_scorep_platform="crayxt" elif test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[a-z]*$ | grep -q gem && echo TRUE`" = "xTRUE" && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x1"; then : @@ -2921,11 +3208,153 @@ ac_scorep_platform="crayxc" fi fi - if test "x${ac_scorep_platform}" = "x"; then : - as_fn_error $? "Unknown Cray platform." "$LINENO" 5 + if test "x${ac_scorep_platform}" = "xcrayunknown"; then : + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_has_cc+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$has_cc"; then + ac_cv_prog_has_cc="$has_cc" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_has_cc="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_has_cc" && ac_cv_prog_has_cc="no" +fi +fi +has_cc=$ac_cv_prog_has_cc +if test -n "$has_cc"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_cc" >&5 +case "$has_cc" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$has_cc${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$has_cc${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$has_cc${as__std}" >&6 ;; +esac; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "${as__red}no${as__std}" >&6; } +fi + + + # Extract the first word of "CC", so it can be a program name with args. +set dummy CC; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_has_CC+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$has_CC"; then + ac_cv_prog_has_CC="$has_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_has_CC="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_has_CC" && ac_cv_prog_has_CC="no" +fi +fi +has_CC=$ac_cv_prog_has_CC +if test -n "$has_CC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_CC" >&5 +case "$has_CC" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$has_CC${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$has_CC${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$has_CC${as__std}" >&6 ;; +esac; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "${as__red}no${as__std}" >&6; } +fi + + + # Extract the first word of "ftn", so it can be a program name with args. +set dummy ftn; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_has_ftn+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$has_ftn"; then + ac_cv_prog_has_ftn="$has_ftn" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_has_ftn="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_has_ftn" && ac_cv_prog_has_ftn="no" +fi +fi +has_ftn=$ac_cv_prog_has_ftn +if test -n "$has_ftn"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_ftn" >&5 +case "$has_ftn" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$has_ftn${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$has_ftn${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$has_ftn${as__std}" >&6 ;; +esac; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "${as__red}no${as__std}" >&6; } +fi + + + if test "${has_cc}${has_CC}${has_ftn}" != yesyesyes; then : + # System seems to be a Cray, but doensn't provide + # compiler wrappers cc, CC, ftn. Try 'linux' as fallback. + ac_scorep_platform=linux + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown Cray platform, no compiler wrappers provided, assume linux. Please contact ." >&5 +$as_echo "$as_me: ${as__yel}WARNING: Unknown Cray platform, no compiler wrappers provided, assume linux. Please contact .${as__std}" >&2;} +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unknown Cray platform, please contact ." >&5 +$as_echo "$as_me: ${as__yel}WARNING: Unknown Cray platform, please contact .${as__std}" >&2;} +fi fi -elif test "x${build_cpu}" = "xarmv7l" || test "x${build_cpu}" = "xarmv7hl" || test "x${build_cpu}" = "xaarch64" ; then : - ac_scorep_platform="arm" elif test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVtclang; then : ac_scorep_platform="k" elif test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVfxlang; then : @@ -2949,29 +3378,47 @@ ac_scorep_platform="unknown" ;; esac + # Keep 'checking' and 'result' close to each other in oder to not interfere with CICD platform check + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform" >&5 +$as_echo_n "checking for platform... " >&6; } if test "x${ac_scorep_platform}" = "xunknown"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_platform, please contact if you encounter any problems." >&5 -$as_echo "$ac_scorep_platform, please contact if you encounter any problems." >&6; } +case "$ac_scorep_platform, please contact if you encounter any problems." in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_platform, please contact if you encounter any problems.${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_platform, please contact if you encounter any problems.${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_platform, please contact if you encounter any problems.${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_platform (auto detected)" >&5 -$as_echo "$ac_scorep_platform (auto detected)" >&6; } - - -cat >>config.summary <<_ACEOF - Platform: $ac_scorep_platform (auto detected) -_ACEOF +case "$ac_scorep_platform (auto detected)" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_platform (auto detected)${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_platform (auto detected)${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_platform (auto detected)${as__std}" >&6 ;; +esac; } +afs_fn_summary "Platform" "$ac_scorep_platform (auto detected)" " " >>config.summary fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_platform (provided)" >&5 -$as_echo "$ac_scorep_platform (provided)" >&6; } - - -cat >>config.summary <<_ACEOF - Platform: $ac_scorep_platform (provided) -_ACEOF + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for platform" >&5 +$as_echo_n "checking for platform... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_platform (provided)" >&5 +case "$ac_scorep_platform (provided)" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_platform (provided)${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_platform (provided)${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_platform (provided)${as__std}" >&6 ;; +esac; } +afs_fn_summary "Platform" "$ac_scorep_platform (provided)" " " >>config.summary fi @@ -2994,8 +3441,8 @@ ac_scorep_cross_compiling="yes" ;; #( crayxc) : ac_scorep_cross_compiling="yes" ;; #( - arm) : - ac_scorep_cross_compiling="no" ;; #( + crayunknown) : + ac_scorep_cross_compiling="yes" ;; #( k) : ac_scorep_cross_compiling="yes" ;; #( fx10) : @@ -3022,11 +3469,7 @@ as_fn_error $? "provided platform '${ac_scorep_platform}' unknown." "$LINENO" 5 ;; esac - -cat >>config.summary <<_ACEOF - Cross compiling: $ac_scorep_cross_compiling (auto detected) -_ACEOF - +afs_fn_summary "Cross compiling" "$ac_scorep_cross_compiling (auto detected)" " " >>config.summary else # honor ac_scorep_cross_compiling from the commandline @@ -3035,18 +3478,21 @@ as_fn_error $? "invalid value '${ac_scorep_cross_compiling}' for provided 'ac_scorep_cross_compiling'" "$LINENO" 5 fi - -cat >>config.summary <<_ACEOF - Cross compiling: $ac_scorep_cross_compiling (provided) -_ACEOF - +afs_fn_summary "Cross compiling" "$ac_scorep_cross_compiling (provided)" " " >>config.summary fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross compilation" >&5 $as_echo_n "checking for cross compilation... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_cross_compiling" >&5 -$as_echo "$ac_scorep_cross_compiling" >&6; } +case "$ac_scorep_cross_compiling" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_cross_compiling${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_cross_compiling${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_cross_compiling${as__std}" >&6 ;; +esac; } # don't detect and load defaults in nested configures (e.g. otf2) @@ -3065,19 +3511,19 @@ test -f ./platform-frontend-user-provided && \ test -f ./platform-mpi-user-provided && \ test -f ./platform-shmem-user-provided; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: Using compiler specification from ./platform-*-user-provided files." >&5 -$as_echo "$as_me: Using compiler specification from ./platform-*-user-provided files." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: Using compiler specification from ./platform-*-user-provided files." >&5 +$as_echo "$as_me: ${as__blu}info: Using compiler specification from ./platform-*-user-provided files.${as__std}" >&2;} ac_scorep_compilers_backend="./platform-backend-user-provided" ac_scorep_compilers_frontend="./platform-frontend-user-provided" ac_scorep_compilers_mpi="./platform-mpi-user-provided" ac_scorep_compilers_shmem="./platform-shmem-user-provided" else - { $as_echo "$as_me:${as_lineno-$LINENO}: Using compiler specification from $srcdir/vendor/common/build-config/platforms/platform-*-user-provided files." >&5 -$as_echo "$as_me: Using compiler specification from $srcdir/vendor/common/build-config/platforms/platform-*-user-provided files." >&6;} - ac_scorep_compilers_backend="$srcdir/vendor/common/build-config/platforms/platform-backend-user-provided" - ac_scorep_compilers_frontend="$srcdir/vendor/common/build-config/platforms/platform-frontend-user-provided" - ac_scorep_compilers_mpi="$srcdir/vendor/common/build-config/platforms/platform-mpi-user-provided" - ac_scorep_compilers_shmem="$srcdir/vendor/common/build-config/platforms/platform-shmem-user-provided" + { $as_echo "$as_me:${as_lineno-$LINENO}: info: Using compiler specification from $srcdir/build-config/common/platforms/platform-*-user-provided files." >&5 +$as_echo "$as_me: ${as__blu}info: Using compiler specification from $srcdir/build-config/common/platforms/platform-*-user-provided files.${as__std}" >&2;} + ac_scorep_compilers_backend="$srcdir/build-config/common/platforms/platform-backend-user-provided" + ac_scorep_compilers_frontend="$srcdir/build-config/common/platforms/platform-frontend-user-provided" + ac_scorep_compilers_mpi="$srcdir/build-config/common/platforms/platform-mpi-user-provided" + ac_scorep_compilers_shmem="$srcdir/build-config/common/platforms/platform-shmem-user-provided" fi ;; #( *) : @@ -3130,17 +3576,17 @@ if test -f "$srcdir/build-config/platforms/${ac_scorep_compilers_frontend}"; then : ac_scorep_compilers_frontend="$srcdir/build-config/platforms/${ac_scorep_compilers_frontend}" else - ac_scorep_compilers_frontend="$srcdir/vendor/common/build-config/platforms/${ac_scorep_compilers_frontend}" + ac_scorep_compilers_frontend="$srcdir/build-config/common/platforms/${ac_scorep_compilers_frontend}" fi if test -f "$srcdir/build-config/platforms/${ac_scorep_compilers_backend}"; then : ac_scorep_compilers_backend="$srcdir/build-config/platforms/${ac_scorep_compilers_backend}" else - ac_scorep_compilers_backend="$srcdir/vendor/common/build-config/platforms/${ac_scorep_compilers_backend}" + ac_scorep_compilers_backend="$srcdir/build-config/common/platforms/${ac_scorep_compilers_backend}" fi fi # determine arguments for subdir configures - args="`$AWK -f $srcdir/vendor/common/build-config/process_arguments.awk \ + args="`$AWK -f $srcdir/build-config/common/process_arguments.awk \ $ac_scorep_compilers_backend \ $ac_scorep_compilers_frontend \ user_provided_configure_args`" @@ -3149,10 +3595,10 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: platform data provided by toplevel configure." >&5 -$as_echo "$as_me: platform data provided by toplevel configure." >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: platform data provided by toplevel configure." >&5 +$as_echo "$as_me: ${as__blu}info: platform data provided by toplevel configure.${as__std}" >&2;} # determine arguments for subdir configures - args="`$AWK -f $srcdir/vendor/common/build-config/process_arguments.awk \ + args="`$AWK -f $srcdir/build-config/common/process_arguments.awk \ user_provided_configure_args`" if test $? -ne 0; then : as_fn_error $? "cannot process provided arguments. Please contact and provide the above output. Thanks." "$LINENO" 5 @@ -3192,10 +3638,17 @@ ac_scorep_have_uncrustify=$ac_cv_prog_ac_scorep_have_uncrustify if test -n "$ac_scorep_have_uncrustify"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_scorep_have_uncrustify" >&5 -$as_echo "$ac_scorep_have_uncrustify" >&6; } +case "$ac_scorep_have_uncrustify" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_scorep_have_uncrustify${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_scorep_have_uncrustify${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_scorep_have_uncrustify${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3246,10 +3699,17 @@ DOXYGEN=$ac_cv_path_DOXYGEN if test -n "$DOXYGEN"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOXYGEN" >&5 -$as_echo "$DOXYGEN" >&6; } +case "$DOXYGEN" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$DOXYGEN${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$DOXYGEN${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$DOXYGEN${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3296,10 +3756,17 @@ have_dot=$ac_cv_prog_have_dot if test -n "$have_dot"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_dot" >&5 -$as_echo "$have_dot" >&6; } +case "$have_dot" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$have_dot${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$have_dot${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$have_dot${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3334,10 +3801,17 @@ have_pdflatex=$ac_cv_prog_have_pdflatex if test -n "$have_pdflatex"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_pdflatex" >&5 -$as_echo "$have_pdflatex" >&6; } +case "$have_pdflatex" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$have_pdflatex${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$have_pdflatex${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$have_pdflatex${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3372,10 +3846,17 @@ have_makeindex=$ac_cv_prog_have_makeindex if test -n "$have_makeindex"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_makeindex" >&5 -$as_echo "$have_makeindex" >&6; } +case "$have_makeindex" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$have_makeindex${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$have_makeindex${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$have_makeindex${as__std}" >&6 ;; +esac; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +$as_echo "${as__red}no${as__std}" >&6; } fi @@ -3402,7 +3883,7 @@ -if test "x${ac_scorep_svn_controlled}" = xyes; then : +if test "x${ac_scorep_git_controlled}" = xyes; then : ac_config_files="$ac_config_files doc/doxygen-user.cfg:doc/doxygen-user/doxygen-user.cfg.in" ac_config_files="$ac_config_files doc/doxygen-dev.cfg:doc/doxygen-dev/doxygen-dev.cfg.in" @@ -3501,14 +3982,21 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +case "$ac_cv_path_SED" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}$ac_cv_path_SED${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}$ac_cv_path_SED${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}$ac_cv_path_SED${as__std}" >&6 ;; +esac; } SED="$ac_cv_path_SED" rm -f conftest.sed OPARI2_AWK=`which ${AWK}` -ac_config_files="$ac_config_files Makefile src/config-common.h:vendor/common/build-config/config-common.h" +ac_config_files="$ac_config_files Makefile src/config-common.h:build-config/common/config-common.h" ac_config_files="$ac_config_files test/c_test.sh" @@ -3550,7 +4038,7 @@ *${as_nl}*) case $ac_var in #( *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; +$as_echo "$as_me: ${as__yel}WARNING: cache variable $ac_var contains a newline${as__std}" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -3587,8 +4075,8 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: updating cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: updating cache $cache_file${as__std}" >&2;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -3602,8 +4090,8 @@ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: ${as__blu}info: not updating unwritable cache $cache_file${as__std}" >&2;} fi fi rm -f confcache @@ -3667,8 +4155,8 @@ LTLIBOBJS=$ac_ltlibobjs -if test -z "${SVN_CONTROLLED_TRUE}" && test -z "${SVN_CONTROLLED_FALSE}"; then - as_fn_error $? "conditional \"SVN_CONTROLLED\" was never defined. +if test -z "${GIT_CONTROLLED_TRUE}" && test -z "${GIT_CONTROLLED_FALSE}"; then + as_fn_error $? "conditional \"GIT_CONTROLLED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 @@ -3678,7 +4166,14 @@ wait $am_sleep_pid 2>/dev/null fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } +case "done" in #( + yes|ok|yes[\ ,]*) : + $as_echo "${as__grn}done${as__std}" >&6 ;; #( + no|failed|unsupported|no[\ ,]*) : + $as_echo "${as__red}done${as__std}" >&6 ;; #( + *) : + $as_echo "${as__blu}done${as__std}" >&6 ;; +esac; } if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. @@ -3709,8 +4204,8 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ $as_echo "$as_me:${as_lineno-$LINENO}: info: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: ${as__blu}info: creating $CONFIG_STATUS${as__std}" >&2;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -3798,6 +4293,37 @@ fi +# need to catch these variables, before unsetting them later +: ${AS_COLOR:=$CLICOLOR}; export AS_COLOR +: ${AS_COLOR_FORCE:=$CLICOLOR_FORCE}; export AS_COLOR_FORCE + +as__red= +as__grn= +as__yel= +as__blu= +as__mag= +as__cya= +as__gry= +as__std= +as__color=no +if test "X$AS_COLOR_FORCE" = X0; then + as__color=no; +elif test "X$AS_COLOR_FORCE" = X1; then + as__color=yes +elif { test "X$TERM" != Xdumb || test "X$AS_COLOR" = X1; } && { test -t 1; } 2>/dev/null; then + as__color=yes +fi +if test $as__color = yes; then + as__red='' + as__grn='' + as__yel='' + as__blu='' + as__mag='' + as__cya='' + as__gry='' + as__std='' +fi + # IFS # We need space, tab and new line, in precisely that order. Quoting is # there to prevent editors from complaining about space-tab. @@ -3864,7 +4390,7 @@ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: ${as__red}error: $2${as__std}" >&2 as_fn_exit $as_status } # as_fn_error @@ -4101,7 +4627,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by OPARI2 $as_me 2.0.5, which was +This file was extended by OPARI2 $as_me 2.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4154,7 +4680,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -OPARI2 config.status 2.0.5 +OPARI2 config.status 2.0.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -4270,7 +4796,7 @@ "doc/doxygen-user.cfg") CONFIG_FILES="$CONFIG_FILES doc/doxygen-user.cfg:doc/doxygen-user/doxygen-user.cfg.in" ;; "doc/doxygen-dev.cfg") CONFIG_FILES="$CONFIG_FILES doc/doxygen-dev.cfg:doc/doxygen-dev/doxygen-dev.cfg.in" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/config-common.h") CONFIG_FILES="$CONFIG_FILES src/config-common.h:vendor/common/build-config/config-common.h" ;; + "src/config-common.h") CONFIG_FILES="$CONFIG_FILES src/config-common.h:build-config/common/config-common.h" ;; "test/c_test.sh") CONFIG_FILES="$CONFIG_FILES test/c_test.sh" ;; "test/f90_test.sh") CONFIG_FILES="$CONFIG_FILES test/f90_test.sh" ;; "test/f77_test.sh") CONFIG_FILES="$CONFIG_FILES test/f77_test.sh" ;; @@ -4528,8 +5054,8 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: info: creating $ac_file" >&5 +$as_echo "$as_me: ${as__blu}info: creating $ac_file${as__std}" >&2;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( @@ -4640,7 +5166,7 @@ *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: $ac_file_inputs seems to ignore the --datarootdir setting${as__std}" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -4686,8 +5212,8 @@ "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined${as__std}" >&2;} rm -f "$ac_tmp/stdin" case $ac_file in @@ -4755,6 +5281,6 @@ fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +$as_echo "$as_me: ${as__yel}WARNING: unrecognized options: $ac_unrecognized_opts${as__std}" >&2;} fi diff -Nru opari2-2.0.5/configure.ac opari2-2.0.6/configure.ac --- opari2-2.0.5/configure.ac 2019-07-26 09:16:10.893167481 +0000 +++ opari2-2.0.6/configure.ac 2021-02-25 12:51:08.227909944 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT([OPARI2], m4_esyscmd([vendor/common/build-config/generate-package-version.sh build-config/VERSION]), [support@score-p.org], [opari2]) +AC_INIT([OPARI2], m4_esyscmd([build-config/common/generate-package-version.sh build-config/VERSION]), [support@score-p.org], [opari2]) AFS_PACKAGE_INIT @@ -15,12 +15,12 @@ ## in this directory. AC_CONFIG_AUX_DIR([build-config]) ## See also ACLOCAL_AMFLAGS in Makefile.am. -AC_CONFIG_MACRO_DIRS([build-config/m4 vendor/common/build-config/m4]) +AC_CONFIG_MACRO_DIRS([build-config/m4 build-config/common/m4]) ## Set the default installation prefix to /opt/opari2 instead of /usr/local AC_PREFIX_DEFAULT([/opt/opari2]) -AC_SCOREP_SVN_CONTROLLED +AC_SCOREP_GIT_CONTROLLED ## Call not before AC_CONFIG_MACRO_DIR AM_INIT_AUTOMAKE([foreign color-tests 1.13.4 -Wall tar-pax]) @@ -37,7 +37,7 @@ AS_IF([test "x${afs_custom_compilers_given}" = "xno"], [AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE]) # determine arguments for subdir configures - args="`$AWK -f $srcdir/vendor/common/build-config/process_arguments.awk \ + args="`$AWK -f $srcdir/build-config/common/process_arguments.awk \ $ac_scorep_compilers_backend \ $ac_scorep_compilers_frontend \ user_provided_configure_args`" @@ -45,7 +45,7 @@ ], [AC_MSG_NOTICE([platform data provided by toplevel configure.]) # determine arguments for subdir configures - args="`$AWK -f $srcdir/vendor/common/build-config/process_arguments.awk \ + args="`$AWK -f $srcdir/build-config/common/process_arguments.awk \ user_provided_configure_args`" AS_IF([test $? -ne 0], [AC_MSG_ERROR([cannot process provided arguments. Please contact and provide the above output. Thanks.])]) ]) @@ -53,7 +53,7 @@ AC_SCOREP_UNCRUSTIFY AC_SCOREP_DOXYGEN -AS_IF([test "x${ac_scorep_svn_controlled}" = xyes], +AS_IF([test "x${ac_scorep_git_controlled}" = xyes], [AC_CONFIG_FILES([doc/doxygen-user.cfg:doc/doxygen-user/doxygen-user.cfg.in]) AC_CONFIG_FILES([doc/doxygen-dev.cfg:doc/doxygen-dev/doxygen-dev.cfg.in])]) @@ -75,7 +75,7 @@ AC_CONFIG_FILES([ Makefile - src/config-common.h:vendor/common/build-config/config-common.h + src/config-common.h:build-config/common/config-common.h ]) AC_CONFIG_FILES([test/c_test.sh], [chmod +x test/c_test.sh]) AC_CONFIG_FILES([test/f90_test.sh], [chmod +x test/f90_test.sh]) diff -Nru opari2-2.0.5/COPYING opari2-2.0.6/COPYING --- opari2-2.0.5/COPYING 2019-07-26 09:16:11.109168154 +0000 +++ opari2-2.0.6/COPYING 2021-02-25 12:51:08.211909893 +0000 @@ -14,11 +14,11 @@ RWTH Aachen University, Germany Copyright (c) 2009-2013, Gesellschaft fuer numerische Simulation mbH, Braunschweig, Germany -Copyright (c) 2009-2013, 2016, 2018, +Copyright (c) 2009-2013, 2016, 2018-2020, Technische Universitaet Dresden, Germany Copyright (c) 2009-2013, University of Oregon, Eugene, USA -Copyright (c) 2009-2019, +Copyright (c) 2009-2021, Forschungszentrum Juelich GmbH, Germany Copyright (c) 2009-2014, German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany diff -Nru opari2-2.0.5/debian/changelog opari2-2.0.6/debian/changelog --- opari2-2.0.5/debian/changelog 2021-01-02 15:15:48.000000000 +0000 +++ opari2-2.0.6/debian/changelog 2021-08-27 19:42:11.000000000 +0000 @@ -1,3 +1,21 @@ +opari2 (2.0.6-2) unstable; urgency=medium + + * patches/install-html-doc: Fix installing documentation. + + -- Samuel Thibault Fri, 27 Aug 2021 21:42:11 +0200 + +opari2 (2.0.6-1) unstable; urgency=medium + + * New upstream release. + - patches/awk-for-loop: Upstreamed. + - patches/PROG_CC_C99: Fix autoreconf. + - libpomp2-dev.install: Update libpomp.a path. + * control: Set Rules-Requires-Root to no. + * watch: Fix URL. + * gbp.conf: Use filter to clean upstream tarball. + + -- Samuel Thibault Fri, 27 Aug 2021 20:07:29 +0200 + opari2 (2.0.5-2) unstable; urgency=medium * control: Bump Standards-Version to 4.5.0 (no change) diff -Nru opari2-2.0.5/debian/control opari2-2.0.6/debian/control --- opari2-2.0.5/debian/control 2020-10-31 23:40:29.000000000 +0000 +++ opari2-2.0.6/debian/control 2021-08-27 19:41:04.000000000 +0000 @@ -4,6 +4,7 @@ Build-Depends: debhelper-compat (= 12), gfortran, +Rules-Requires-Root: no Standards-Version: 4.5.0 Section: libs Homepage: http://www.vi-hps.org/Tools/OPARI2.html @@ -13,7 +14,7 @@ Package: opari2 Section: devel Architecture: any -Multi-arch: foreign +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends}, libpomp2-dev Description: OpenMP Pragma And Region Instrumentor - translation tool OPARI2 is a source-to-source translation tool which automatically adds all diff -Nru opari2-2.0.5/debian/gbp.conf opari2-2.0.6/debian/gbp.conf --- opari2-2.0.5/debian/gbp.conf 2020-03-03 11:43:33.000000000 +0000 +++ opari2-2.0.6/debian/gbp.conf 2021-08-27 18:06:10.000000000 +0000 @@ -1,6 +1,2 @@ -[DEFAULT] -upstream-branch = upstream-dfsg - [import-orig] -upstream-branch = upstream -merge = False +filter = [ 'doc/pdf/opari2.pdf' ] diff -Nru opari2-2.0.5/debian/libpomp2-dev.install opari2-2.0.6/debian/libpomp2-dev.install --- opari2-2.0.5/debian/libpomp2-dev.install 2020-10-31 23:46:38.000000000 +0000 +++ opari2-2.0.6/debian/libpomp2-dev.install 2021-08-27 18:37:11.000000000 +0000 @@ -1,5 +1,5 @@ usr/include/* usr/bin/opari2-config -usr/share/doc/opari2/example/libpomp.a usr/lib/ +usr/share/doc/opari2/example/lib/libpomp.a usr/lib/ usr/libexec/pomp2-parse-init-regions.awk usr/share/opari2/devel diff -Nru opari2-2.0.5/debian/patches/awk-for-loop opari2-2.0.6/debian/patches/awk-for-loop --- opari2-2.0.5/debian/patches/awk-for-loop 2020-03-03 11:43:33.000000000 +0000 +++ opari2-2.0.6/debian/patches/awk-for-loop 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -The for loop order is implementation-dependent, see -http://kirste.userpage.fu-berlin.de/chemnet/use/info/gawk/gawk_12.html#SEC117 - ---- - src/opari-lib-dummy/pomp2_parse_init_regions.awk.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in -+++ b/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in -@@ -136,7 +136,7 @@ END{ - } - - # declare XXXXX_Init_reg_* functions extern -- for (i in regions) -+ for (i = 0 ; i < counter; i++) - { - print "extern void " regions[i] "();"; - } diff -Nru opari2-2.0.5/debian/patches/install-html-doc opari2-2.0.6/debian/patches/install-html-doc --- opari2-2.0.5/debian/patches/install-html-doc 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/debian/patches/install-html-doc 2021-08-27 19:40:15.000000000 +0000 @@ -0,0 +1,15 @@ +--- + Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/Makefile.am ++++ b/Makefile.am +@@ -149,6 +149,8 @@ dist-hook: doc/doxygen-user/main.dox dox + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2_usage.h + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2-config_usage.h + ++install-data-local: doxygen-user-install ++ + clean-local: doxygen-user-clean + rm -rf test/tmp + diff -Nru opari2-2.0.5/debian/patches/PROG_CC_C99 opari2-2.0.6/debian/patches/PROG_CC_C99 --- opari2-2.0.5/debian/patches/PROG_CC_C99 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/debian/patches/PROG_CC_C99 2021-08-27 18:35:32.000000000 +0000 @@ -0,0 +1,20 @@ +It seems there is some incompatibility between scoreP's +AC_SCOREP_PROG_CC_C99 and autoconf's AC_PROG_CC_C99 implementation + +We are fine with using gnu99 anyway. + +--- + build-frontend/configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/build-frontend/configure.ac ++++ b/build-frontend/configure.ac +@@ -54,7 +54,7 @@ AC_SCOREP_PLATFORM_SETTINGS + AC_PROG_CC + AC_SCOREP_COMPILER_CHECKS + +-AC_SCOREP_PROG_CC_C99([], [AC_MSG_ERROR([No ISO C99 support in C compiler.])]) ++AC_PROG_CC_C99([], [AC_MSG_ERROR([No ISO C99 support in C compiler.])]) + + AC_PROG_CXX + diff -Nru opari2-2.0.5/debian/patches/series opari2-2.0.6/debian/patches/series --- opari2-2.0.5/debian/patches/series 2020-03-03 11:43:33.000000000 +0000 +++ opari2-2.0.6/debian/patches/series 2021-08-27 19:20:17.000000000 +0000 @@ -1 +1,3 @@ -awk-for-loop +# +PROG_CC_C99 +install-html-doc diff -Nru opari2-2.0.5/debian/watch opari2-2.0.6/debian/watch --- opari2-2.0.5/debian/watch 2020-03-03 11:43:33.000000000 +0000 +++ opari2-2.0.6/debian/watch 2021-08-27 18:06:10.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -opts=dversionmangle=s/\+dfsg$// https://www.vi-hps.org/projects/score-p#opari2 upload/packages/opari2/opari2-@ANY_VERSION@@ARCHIVE_EXT@ +opts=dversionmangle=s/\+dfsg$// https://www.vi-hps.org/projects/score-p#opari2 http://perftools.pages.jsc.fz-juelich.de/cicd/opari2/tags/opari2-[0-9.]*/opari2-@ANY_VERSION@@ARCHIVE_EXT@ diff -Nru opari2-2.0.5/doc/doxygen-dev/doxygen-dev.cfg.in opari2-2.0.6/doc/doxygen-dev/doxygen-dev.cfg.in --- opari2-2.0.5/doc/doxygen-dev/doxygen-dev.cfg.in 2019-07-26 09:16:11.057167992 +0000 +++ opari2-2.0.6/doc/doxygen-dev/doxygen-dev.cfg.in 2021-02-25 12:51:08.231909957 +0000 @@ -611,7 +611,7 @@ # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = */.svn* +EXCLUDE_PATTERNS = */.git/* # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the diff -Nru opari2-2.0.5/doc/doxygen-user/doxygen-user.cfg.in opari2-2.0.6/doc/doxygen-user/doxygen-user.cfg.in --- opari2-2.0.5/doc/doxygen-user/doxygen-user.cfg.in 2019-07-26 09:16:11.093168104 +0000 +++ opari2-2.0.6/doc/doxygen-user/doxygen-user.cfg.in 2021-02-25 12:51:08.231909957 +0000 @@ -237,8 +237,6 @@ "seclabel{1}=\latexonly\label{sec:\1} \endlatexonly" \ "secref{1}=\if LATEX \latexonly~\ref{sec:\1}\xspace \endlatexonly \else   '@ref \1'   \endif" \ "verb{1}=\latexonly\verb+\1+\endlatexonly\htmlonly\1\endhtmlonly" \ - "tabref{1}=\if LATEX \latexonly~\ref{tab:\1}\xspace \endlatexonly \else   @ref \1   \endif" \ - "tablabel{1}=\latexonly\label{tab:\1}\endlatexonly" \ "htmlimg{3}=@anchor \2 @image html \1 \"Figure \2: \3\"" \ "teximg{4}=\latexonly\begin{figure}[hbt]\begin{center}\includegraphics[\4]{@abs_top_srcdir@/doc/images/\1}\caption{\3}\label{fig:\2}\end{center}\end{figure}\endlatexonly" \ "img{4}=\if LATEX @teximg{\1.pdf,\2,\3,\4} \else @htmlimg{\1.png,\2,\3} \endif" \ @@ -843,7 +841,7 @@ # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = */.svn/* +EXCLUDE_PATTERNS = */.git/* # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the diff -Nru opari2-2.0.5/doc/doxygen-user/opari2-config_usage.dox.in opari2-2.0.6/doc/doxygen-user/opari2-config_usage.dox.in --- opari2-2.0.5/doc/doxygen-user/opari2-config_usage.dox.in 2019-07-26 09:16:11.093168104 +0000 +++ opari2-2.0.6/doc/doxygen-user/opari2-config_usage.dox.in 2021-02-25 12:51:08.231909957 +0000 @@ -36,12 +36,9 @@ --interface-version Prints the pomp2 API version that instrumented files conform too. - --opari2-revision Prints the revision number of the + --revision Prints the revision number of the OPARI2 package. - --common-revision Prints the revision number of the - common package. - --help Prints this help text. and the following options: diff -Nru opari2-2.0.5/doc/example/example.c opari2-2.0.6/doc/example/example.c --- opari2-2.0.5/doc/example/example.c 2019-07-26 09:16:11.097168116 +0000 +++ opari2-2.0.6/doc/example/example.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ -/* - * This file is part of the Score-P software (http://www.score-p.org) - * - * Copyright (c) 2009-2011, - * RWTH Aachen University, Germany - * - * Copyright (c) 2009-2011, - * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - * - * Copyright (c) 2009-2011, - * Technische Universitaet Dresden, Germany - * - * Copyright (c) 2009-2011, - * University of Oregon, Eugene, USA - * - * Copyright (c) 2009-2011, 2013 - * Forschungszentrum Juelich GmbH, Germany - * - * Copyright (c) 2009-2011, - * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - * - * Copyright (c) 2009-2011, - * Technische Universitaet Muenchen, Germany - * - * This software may be modified and distributed under the terms of - * a BSD-style license. See the COPYING file in the package base - * directory for details. - * - */ - -#include - -int -main( int argc, char** argv ) -{ - int i, lsum, sum; - - sum = 0; - -#pragma omp parallel private(i, lsum) reduction(+:sum) - { - lsum = 0; - - #pragma omp for - for ( i = 0; i < 21; i++ ) - { - lsum += i; - } - printf( "local sum: %d\n", lsum ); - - sum += lsum; - } - - printf( "total sum: %d\n", sum ); - - return 0; -} diff -Nru opari2-2.0.5/doc/example/example.f90 opari2-2.0.6/doc/example/example.f90 --- opari2-2.0.5/doc/example/example.f90 2019-07-26 09:16:11.097168116 +0000 +++ opari2-2.0.6/doc/example/example.f90 1970-01-01 00:00:00.000000000 +0000 @@ -1,50 +0,0 @@ -!> -!> This file is part of the Score-P software (http://www.score-p.org) -!> -!> Copyright (c) 2009-2011, -!> RWTH Aachen University, Germany -!> -!> Copyright (c) 2009-2011, -!> Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -!> -!> Copyright (c) 2009-2011, -!> Technische Universitaet Dresden, Germany -!> -!> Copyright (c) 2009-2011, -!> University of Oregon, Eugene, USA -!> -!> Copyright (c) 2009-2011, 2013 -!> Forschungszentrum Juelich GmbH, Germany -!> -!> Copyright (c) 2009-2011, -!> German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -!> -!> Copyright (c) 2009-2011, -!> Technische Universitaet Muenchen, Germany -!> -!> This software may be modified and distributed under the terms of -!> a BSD-style license. See the COPYING file in the package base -!> directory for details. - - PROGRAM EXAMPLE - - INTEGER i, lsum, sum - - sum = 0 - -!$omp parallel private(i, lsum) reduction(+:sum) - lsum = 0 - -!$omp do - do i=1,20 - lsum = lsum + i - enddo -!$omp end do - - write(*,*) "LOCAL SUM: ", lsum - sum = sum + lsum -!$omp end parallel - - write(*,*) "TOTAL SUM: ", sum - - END diff -Nru opari2-2.0.5/doc/example/Makefile.in opari2-2.0.6/doc/example/Makefile.in --- opari2-2.0.5/doc/example/Makefile.in 2019-07-26 09:16:11.097168116 +0000 +++ opari2-2.0.6/doc/example/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -# This file is part of the Score-P software (http://www.score-p.org) - -# Copyright (c) 2009-2013, -# RWTH Aachen University, Germany - -# Copyright (c) 2009-2013, -# Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - -# Copyright (c) 2009-2013, -# Technische Universitaet Dresden, Germany - -# Copyright (c) 2009-2013, -# University of Oregon, Eugene, USA - -# Copyright (c) 2009-2013, 2016, -# Forschungszentrum Juelich GmbH, Germany - -# Copyright (c) 2009-2013, -# German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - -# Copyright (c) 2009-2013, -# Technische Universitaet Muenchen, Germany - -# This software may be modified and distributed under the terms of -# a BSD-style license. See the COPYING file in the package base -# directory for details. - -###################################################### -# Compiler # -###################################################### -CC=@CC@ -FORTRAN=@FC@ -OPENMP_C_FLAG=@OPENMP_CFLAGS@ @CFLAGS@ -OPENMP_F_FLAG=@OPENMP_FFLAGS@ @FFLAGS@ - -###################################################### -# OPARI & DUMMY LIBRARY # -###################################################### -POMP_INC=-I@prefix@/include -POMPLIBDIR=@prefix@/share/doc/opari2/example -POMPLIB=-L${POMPLIBDIR} -lpomp - -BINDIR=@BINDIR@ -OPARI=$(BINDIR)/opari2 -OPARI2_CONFIG=$(BINDIR)/opari2-config - -# We need to make sure that we use the right versions -# of nm, awk and grep. opari2-config returns the right -# commands with the necessary options. -NM=`$(OPARI2_CONFIG) --nm` -AWK_SCRIPT=`$(OPARI2_CONFIG) --region-initialization` - -all: c fortran - -###################################################### -# C EXAMPLE # -###################################################### - -c: example_c example_c_inst - -# Build without instrumentation -example_c: example.c - $(CC) $(OPENMP_C_FLAG) $? -o $@ - -# Linking step -example_c_inst: example_c.mod.o pompregions_c.o - $(CC) $(OPENMP_C_FLAG) $? $(POMPLIB) -o $@ - -pompregions_c.o : pompregions_c.c - $(CC) $(POMP_INC) -c $? -o $@ - -# Use nm to find the initialization functions in the -# object file of the instrumented user code. Then the -# awk script generates these functions. -pompregions_c.c : example_c.mod.o - $(NM) example_c.mod.o | $(AWK_SCRIPT) > pompregions_c.c - -example_c.mod.o: example.mod.c - $(CC) $(OPENMP_C_FLAG) $(POMP_INC) -c $? -o $@ - -example.mod.c: example.c - $(OPARI) example.c - -###################################################### -# FORTRAN EXAMPLE # -###################################################### - -fortran: example_f example_f_inst - -# Build without instrumentation -example_f: example.f90 - $(FORTRAN) $(OPENMP_F_FLAG) $? -o $@ - -# Linking step -example_f_inst: example_f.mod.o pompregions_f.o - $(FORTRAN) $(OPENMP_F_FLAG) $? $(POMPLIB) -o $@ - -pompregions_f.o : pompregions_f.c - $(CC) $(POMP_INC) -c $? -o $@ - -# Use nm to find the initialization functions in the -# object file of the instrumented user code. Then the -# awk script generates these functions. -pompregions_f.c : example_f.mod.o - $(NM) example_f.mod.o | $(AWK_SCRIPT) > pompregions_f.c - -example_f.mod.o : example.mod.F90 - $(FORTRAN) $(OPENMP_F_FLAG) -c -o $@ $? - -example.mod.F90: example.f90 - $(OPARI) example.f90 - -###################################################### - -clean: - rm -rf example_? - rm -rf example_?_inst - rm -rf example.mod.? - rm -rf example.?.opari.inc - rm -rf pompregions_?.c - - rm -rf *.o diff -Nru opari2-2.0.5/doc/example/openmp/example.c opari2-2.0.6/doc/example/openmp/example.c --- opari2-2.0.5/doc/example/openmp/example.c 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/openmp/example.c 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,57 @@ +/* + * This file is part of the Score-P software (http://www.score-p.org) + * + * Copyright (c) 2009-2011, + * RWTH Aachen University, Germany + * + * Copyright (c) 2009-2011, + * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + * + * Copyright (c) 2009-2011, + * Technische Universitaet Dresden, Germany + * + * Copyright (c) 2009-2011, + * University of Oregon, Eugene, USA + * + * Copyright (c) 2009-2011, 2013 + * Forschungszentrum Juelich GmbH, Germany + * + * Copyright (c) 2009-2011, + * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + * + * Copyright (c) 2009-2011, + * Technische Universitaet Muenchen, Germany + * + * This software may be modified and distributed under the terms of + * a BSD-style license. See the COPYING file in the package base + * directory for details. + * + */ + +#include + +int +main( int argc, char** argv ) +{ + int i, lsum, sum; + + sum = 0; + +#pragma omp parallel private(i, lsum) reduction(+:sum) + { + lsum = 0; + + #pragma omp for + for ( i = 0; i < 21; i++ ) + { + lsum += i; + } + printf( "local sum: %d\n", lsum ); + + sum += lsum; + } + + printf( "total sum: %d\n", sum ); + + return 0; +} diff -Nru opari2-2.0.5/doc/example/openmp/example.f90 opari2-2.0.6/doc/example/openmp/example.f90 --- opari2-2.0.5/doc/example/openmp/example.f90 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/openmp/example.f90 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,50 @@ +!> +!> This file is part of the Score-P software (http://www.score-p.org) +!> +!> Copyright (c) 2009-2011, +!> RWTH Aachen University, Germany +!> +!> Copyright (c) 2009-2011, +!> Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +!> +!> Copyright (c) 2009-2011, +!> Technische Universitaet Dresden, Germany +!> +!> Copyright (c) 2009-2011, +!> University of Oregon, Eugene, USA +!> +!> Copyright (c) 2009-2011, 2013 +!> Forschungszentrum Juelich GmbH, Germany +!> +!> Copyright (c) 2009-2011, +!> German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +!> +!> Copyright (c) 2009-2011, +!> Technische Universitaet Muenchen, Germany +!> +!> This software may be modified and distributed under the terms of +!> a BSD-style license. See the COPYING file in the package base +!> directory for details. + + PROGRAM EXAMPLE + + INTEGER i, lsum, sum + + sum = 0 + +!$omp parallel private(i, lsum) reduction(+:sum) + lsum = 0 + +!$omp do + do i=1,20 + lsum = lsum + i + enddo +!$omp end do + + write(*,*) "LOCAL SUM: ", lsum + sum = sum + lsum +!$omp end parallel + + write(*,*) "TOTAL SUM: ", sum + + END diff -Nru opari2-2.0.5/doc/example/openmp/Makefile.in opari2-2.0.6/doc/example/openmp/Makefile.in --- opari2-2.0.5/doc/example/openmp/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/openmp/Makefile.in 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,122 @@ +# This file is part of the Score-P software (http://www.score-p.org) + +# Copyright (c) 2009-2013, +# RWTH Aachen University, Germany + +# Copyright (c) 2009-2013, +# Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + +# Copyright (c) 2009-2013, 2020, +# Technische Universitaet Dresden, Germany + +# Copyright (c) 2009-2013, +# University of Oregon, Eugene, USA + +# Copyright (c) 2009-2013, 2016, +# Forschungszentrum Juelich GmbH, Germany + +# Copyright (c) 2009-2013, +# German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + +# Copyright (c) 2009-2013, +# Technische Universitaet Muenchen, Germany + +# This software may be modified and distributed under the terms of +# a BSD-style license. See the COPYING file in the package base +# directory for details. + +###################################################### +# Compiler # +###################################################### +CC=@CC@ +FORTRAN=@FC@ +OPENMP_C_FLAG=@OPENMP_CFLAGS@ @CFLAGS@ +OPENMP_F_FLAG=@OPENMP_FFLAGS@ @FFLAGS@ + +###################################################### +# OPARI & DUMMY LIBRARY # +###################################################### +POMP_INC=-I@prefix@/include +POMPLIBDIR=@prefix@/share/doc/opari2/example/lib +POMPLIB=-L${POMPLIBDIR} -lpomp + +BINDIR=@BINDIR@ +OPARI=$(BINDIR)/opari2 +OPARI2_CONFIG=$(BINDIR)/opari2-config + +# We need to make sure that we use the right versions +# of nm, awk and grep. opari2-config returns the right +# commands with the necessary options. +NM=`$(OPARI2_CONFIG) --nm` +AWK_SCRIPT=`$(OPARI2_CONFIG) --region-initialization` + +all: c fortran + +###################################################### +# C EXAMPLE # +###################################################### + +c: example_c example_c_inst + +# Build without instrumentation +example_c: example.c + $(CC) $(OPENMP_C_FLAG) $? -o $@ + +# Linking step +example_c_inst: example_c.mod.o pompregions_c.o + $(CC) $(OPENMP_C_FLAG) $? $(POMPLIB) -o $@ + +pompregions_c.o : pompregions_c.c + $(CC) $(POMP_INC) -c $? -o $@ + +# Use nm to find the initialization functions in the +# object file of the instrumented user code. Then the +# awk script generates these functions. +pompregions_c.c : example_c.mod.o + $(NM) example_c.mod.o | $(AWK_SCRIPT) > pompregions_c.c + +example_c.mod.o: example.mod.c + $(CC) $(OPENMP_C_FLAG) $(POMP_INC) -c $? -o $@ + +example.mod.c: example.c + $(OPARI) example.c + +###################################################### +# FORTRAN EXAMPLE # +###################################################### + +fortran: example_f example_f_inst + +# Build without instrumentation +example_f: example.f90 + $(FORTRAN) $(OPENMP_F_FLAG) $? -o $@ + +# Linking step +example_f_inst: example_f.mod.o pompregions_f.o + $(FORTRAN) $(OPENMP_F_FLAG) $? $(POMPLIB) -o $@ + +pompregions_f.o : pompregions_f.c + $(CC) $(POMP_INC) -c $? -o $@ + +# Use nm to find the initialization functions in the +# object file of the instrumented user code. Then the +# awk script generates these functions. +pompregions_f.c : example_f.mod.o + $(NM) example_f.mod.o | $(AWK_SCRIPT) > pompregions_f.c + +example_f.mod.o : example.mod.F90 + $(FORTRAN) $(OPENMP_F_FLAG) -c -o $@ $? + +example.mod.F90: example.f90 + $(OPARI) example.f90 + +###################################################### + +clean: + rm -rf example_? + rm -rf example_?_inst + rm -rf example.mod.* + rm -rf example.*.opari.inc + rm -rf pompregions_?.c + + rm -rf *.o diff -Nru opari2-2.0.5/doc/example/openmp/Makefile.inc.am opari2-2.0.6/doc/example/openmp/Makefile.inc.am --- opari2-2.0.5/doc/example/openmp/Makefile.inc.am 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/openmp/Makefile.inc.am 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,22 @@ +## -*- mode: makefile -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2020, +## Technische Universitaet Dresden, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +if HAVE_OPENMP_SUPPORT + +exampleopenmpdir = $(docdir)/example/openmp +exampleopenmp_DATA = \ + $(SRC_ROOT)doc/example/openmp/example.c \ + $(SRC_ROOT)doc/example/openmp/example.f90 \ + ../doc/example/openmp/Makefile + +endif HAVE_OPENMP_SUPPORT diff -Nru opari2-2.0.5/doc/example/pomp/example.c opari2-2.0.6/doc/example/pomp/example.c --- opari2-2.0.5/doc/example/pomp/example.c 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/pomp/example.c 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,63 @@ +/* + * This file is part of the Score-P software (http://www.score-p.org) + * + * Copyright (c) 2009-2011, + * RWTH Aachen University, Germany + * + * Copyright (c) 2009-2011, + * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + * + * Copyright (c) 2009-2011, + * Technische Universitaet Dresden, Germany + * + * Copyright (c) 2009-2011, + * University of Oregon, Eugene, USA + * + * Copyright (c) 2009-2011, 2013 + * Forschungszentrum Juelich GmbH, Germany + * + * Copyright (c) 2009-2011, + * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + * + * Copyright (c) 2009-2011, + * Technische Universitaet Muenchen, Germany + * + * This software may be modified and distributed under the terms of + * a BSD-style license. See the COPYING file in the package base + * directory for details. + * + */ + +#include +/*Disable unknown pragma warning for the intel compiler. + * This avoids warnings for pomp pragmas if the file is + * not preprocessed with opari.*/ +#ifdef __INTEL_COMPILER +#pragma warning disable 161 +#endif + +int +foo() +{ + int i = 0; +#pragma pomp inst begin(foo) + //usefull work could be done here which changes i + printf( "Hello from foo.\n" ); + if ( i == 0 ) + { +#pragma pomp inst altend(foo) + return 42; + } + //other work might be done here +#pragma pomp inst end(foo) + return i; +} + +int +main( int argc, char** argv ) +{ +#pragma pomp inst init + printf( "Hello from main.\n" ); + foo(); + return 0; +} diff -Nru opari2-2.0.5/doc/example/pomp/example.f90 opari2-2.0.6/doc/example/pomp/example.f90 --- opari2-2.0.5/doc/example/pomp/example.f90 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/pomp/example.f90 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,48 @@ +!> +!> This file is part of the Score-P software (http://www.score-p.org) +!> +!> Copyright (c) 2009-2011, +!> RWTH Aachen University, Germany +!> +!> Copyright (c) 2009-2011, +!> Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany +!> +!> Copyright (c) 2009-2011, +!> Technische Universitaet Dresden, Germany +!> +!> Copyright (c) 2009-2011, +!> University of Oregon, Eugene, USA +!> +!> Copyright (c) 2009-2011, 2013 +!> Forschungszentrum Juelich GmbH, Germany +!> +!> Copyright (c) 2009-2011, +!> German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany +!> +!> Copyright (c) 2009-2011, +!> Technische Universitaet Muenchen, Germany +!> +!> This software may be modified and distributed under the terms of +!> a BSD-style license. See the COPYING file in the package base +!> directory for details. + + SUBROUTINE FOO + INTEGER i +!$POMP INST BEGIN(FOO) + WRITE (*,*) 'Hello from FOO.' +! work is done here + if (i.eq.0) THEN +!$POMP INST ALTEND(FOO) + RETURN + END IF +! other work is done here +!$POMP INST END(FOO) + + END + + + PROGRAM EXAMPLE_USER_INSTRUMENTATION +!$POMP INST INIT + WRITE (*,*) 'Hello from PROGRAM.' + CALL FOO() + END diff -Nru opari2-2.0.5/doc/example/pomp/Makefile.in opari2-2.0.6/doc/example/pomp/Makefile.in --- opari2-2.0.5/doc/example/pomp/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/pomp/Makefile.in 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,122 @@ +# This file is part of the Score-P software (http://www.score-p.org) + +# Copyright (c) 2009-2013, +# RWTH Aachen University, Germany + +# Copyright (c) 2009-2013, +# Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + +# Copyright (c) 2009-2013, 2020, +# Technische Universitaet Dresden, Germany + +# Copyright (c) 2009-2013, +# University of Oregon, Eugene, USA + +# Copyright (c) 2009-2013, 2016, +# Forschungszentrum Juelich GmbH, Germany + +# Copyright (c) 2009-2013, +# German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + +# Copyright (c) 2009-2013, +# Technische Universitaet Muenchen, Germany + +# This software may be modified and distributed under the terms of +# a BSD-style license. See the COPYING file in the package base +# directory for details. + +###################################################### +# Compiler # +###################################################### +CC=@CC@ +FORTRAN=@FC@ +OPENMP_C_FLAG=@OPENMP_CFLAGS@ @CFLAGS@ +OPENMP_F_FLAG=@OPENMP_FFLAGS@ @FFLAGS@ + +###################################################### +# OPARI & DUMMY LIBRARY # +###################################################### +POMP_INC=-I@prefix@/include +POMPLIBDIR=@prefix@/share/doc/opari2/example/lib +POMPLIB=-L${POMPLIBDIR} -lpomp + +BINDIR=@BINDIR@ +OPARI=$(BINDIR)/opari2 +OPARI2_CONFIG=$(BINDIR)/opari2-config + +# We need to make sure that we use the right versions +# of nm, awk and grep. opari2-config returns the right +# commands with the necessary options. +NM=`$(OPARI2_CONFIG) --nm` +AWK_SCRIPT=`$(OPARI2_CONFIG) --region-initialization` + +all: c fortran + +###################################################### +# C EXAMPLE # +###################################################### + +c: example_c example_c_inst + +# Build without instrumentation +example_c: example.c + $(CC) $(OPENMP_C_FLAG) $? -o $@ + +# Linking step +example_c_inst: example_c.mod.o pompregions_c.o + $(CC) $(OPENMP_C_FLAG) $? $(POMPLIB) -o $@ + +pompregions_c.o : pompregions_c.c + $(CC) $(POMP_INC) -c $? -o $@ + +# Use nm to find the initialization functions in the +# object file of the instrumented user code. Then the +# awk script generates these functions. +pompregions_c.c : example_c.mod.o + $(NM) example_c.mod.o | $(AWK_SCRIPT) > pompregions_c.c + +example_c.mod.o: example.mod.c + $(CC) $(OPENMP_C_FLAG) $(POMP_INC) -c $? -o $@ + +example.mod.c: example.c + $(OPARI) example.c + +###################################################### +# FORTRAN EXAMPLE # +###################################################### + +fortran: example_f example_f_inst + +# Build without instrumentation +example_f: example.f90 + $(FORTRAN) $(OPENMP_F_FLAG) $? -o $@ + +# Linking step +example_f_inst: example_f.mod.o pompregions_f.o + $(FORTRAN) $(OPENMP_F_FLAG) $? $(POMPLIB) -o $@ + +pompregions_f.o : pompregions_f.c + $(CC) $(POMP_INC) -c $? -o $@ + +# Use nm to find the initialization functions in the +# object file of the instrumented user code. Then the +# awk script generates these functions. +pompregions_f.c : example_f.mod.o + $(NM) example_f.mod.o | $(AWK_SCRIPT) > pompregions_f.c + +example_f.mod.o : example.mod.F90 + $(FORTRAN) $(OPENMP_F_FLAG) -c -o $@ $? + +example.mod.F90: example.f90 + $(OPARI) example.f90 + +###################################################### + +clean: + rm -rf example_? + rm -rf example_?_inst + rm -rf example.mod.* + rm -rf example.*.opari.inc + rm -rf pompregions_?.c + + rm -rf *.o diff -Nru opari2-2.0.5/doc/example/pomp/Makefile.inc.am opari2-2.0.6/doc/example/pomp/Makefile.inc.am --- opari2-2.0.5/doc/example/pomp/Makefile.inc.am 1970-01-01 00:00:00.000000000 +0000 +++ opari2-2.0.6/doc/example/pomp/Makefile.inc.am 2021-02-25 12:51:08.231909957 +0000 @@ -0,0 +1,18 @@ +## -*- mode: makefile -*- + +## +## This file is part of the Score-P software (http://www.score-p.org) +## +## Copyright (c) 2020, +## Technische Universitaet Dresden, Germany +## +## This software may be modified and distributed under the terms of +## a BSD-style license. See the COPYING file in the package base +## directory for details. +## + +examplepompdir = $(docdir)/example/pomp +examplepomp_DATA = \ + $(SRC_ROOT)doc/example/pomp/example.c \ + $(SRC_ROOT)doc/example/pomp/example.f90 \ + ../doc/example/pomp/Makefile diff -Nru opari2-2.0.5/doc/example_user_instrumentation/example_user_instrumentation.c opari2-2.0.6/doc/example_user_instrumentation/example_user_instrumentation.c --- opari2-2.0.5/doc/example_user_instrumentation/example_user_instrumentation.c 2019-07-26 09:16:11.101168129 +0000 +++ opari2-2.0.6/doc/example_user_instrumentation/example_user_instrumentation.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - * This file is part of the Score-P software (http://www.score-p.org) - * - * Copyright (c) 2009-2011, - * RWTH Aachen University, Germany - * - * Copyright (c) 2009-2011, - * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - * - * Copyright (c) 2009-2011, - * Technische Universitaet Dresden, Germany - * - * Copyright (c) 2009-2011, - * University of Oregon, Eugene, USA - * - * Copyright (c) 2009-2011, 2013 - * Forschungszentrum Juelich GmbH, Germany - * - * Copyright (c) 2009-2011, - * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - * - * Copyright (c) 2009-2011, - * Technische Universitaet Muenchen, Germany - * - * This software may be modified and distributed under the terms of - * a BSD-style license. See the COPYING file in the package base - * directory for details. - * - */ - -#include -/*Disable unknown pragma warning for the intel compiler. - * This avoids warnings for pomp pragmas if the file is - * not preprocessed with opari.*/ -#ifdef __INTEL_COMPILER -#pragma warning disable 161 -#endif - -int -foo() -{ - int i = 0; -#pragma pomp inst begin(foo) - //usefull work could be done here which changes i - printf( "Hello from foo.\n" ); - if ( i == 0 ) - { -#pragma pomp inst altend(foo) - return 42; - } - //other work might be done here -#pragma pomp inst end(foo) - return i; -} - -int -main( int argc, char** argv ) -{ -#pragma pomp inst init - printf( "Hello from main.\n" ); - foo(); - return 0; -} diff -Nru opari2-2.0.5/doc/example_user_instrumentation/example_user_instrumentation.f90 opari2-2.0.6/doc/example_user_instrumentation/example_user_instrumentation.f90 --- opari2-2.0.5/doc/example_user_instrumentation/example_user_instrumentation.f90 2019-07-26 09:16:11.101168129 +0000 +++ opari2-2.0.6/doc/example_user_instrumentation/example_user_instrumentation.f90 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -!> -!> This file is part of the Score-P software (http://www.score-p.org) -!> -!> Copyright (c) 2009-2011, -!> RWTH Aachen University, Germany -!> -!> Copyright (c) 2009-2011, -!> Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -!> -!> Copyright (c) 2009-2011, -!> Technische Universitaet Dresden, Germany -!> -!> Copyright (c) 2009-2011, -!> University of Oregon, Eugene, USA -!> -!> Copyright (c) 2009-2011, 2013 -!> Forschungszentrum Juelich GmbH, Germany -!> -!> Copyright (c) 2009-2011, -!> German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -!> -!> Copyright (c) 2009-2011, -!> Technische Universitaet Muenchen, Germany -!> -!> This software may be modified and distributed under the terms of -!> a BSD-style license. See the COPYING file in the package base -!> directory for details. - - SUBROUTINE FOO - INTEGER i -!$POMP INST BEGIN(FOO) - WRITE (*,*) 'Hello from FOO.' -! work is done here - if (i.eq.0) THEN -!$POMP INST ALTEND(FOO) - RETURN - END IF -! other work is done here -!$POMP INST END(FOO) - - END - - - PROGRAM EXAMPLE_USER_INSTRUMENTATION -!$POMP INST INIT - WRITE (*,*) 'Hello from PROGRAM.' - CALL FOO() - END diff -Nru opari2-2.0.5/doc/example_user_instrumentation/Makefile.in opari2-2.0.6/doc/example_user_instrumentation/Makefile.in --- opari2-2.0.5/doc/example_user_instrumentation/Makefile.in 2019-07-26 09:16:11.101168129 +0000 +++ opari2-2.0.6/doc/example_user_instrumentation/Makefile.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -# This file is part of the Score-P software (http://www.score-p.org) - -# Copyright (c) 2009-2013, -# RWTH Aachen University, Germany - -# Copyright (c) 2009-2013, -# Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - -# Copyright (c) 2009-2013, -# Technische Universitaet Dresden, Germany - -# Copyright (c) 2009-2013, -# University of Oregon, Eugene, USA - -# Copyright (c) 2009-2013, 2016, -# Forschungszentrum Juelich GmbH, Germany - -# Copyright (c) 2009-2013, -# German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - -# Copyright (c) 2009-2013, -# Technische Universitaet Muenchen, Germany - -# This software may be modified and distributed under the terms of -# a BSD-style license. See the COPYING file in the package base -# directory for details. - -###################################################### -# Compiler # -###################################################### -CC=@CC@ -FORTRAN=@FC@ -OPENMP_C_FLAG=@OPENMP_CFLAGS@ @CFLAGS@ -OPENMP_F_FLAG=@OPENMP_FFLAGS@ @FFLAGS@ - -###################################################### -# OPARI & DUMMY LIBRARY # -###################################################### -POMP_INC=-I@prefix@/include -POMPLIBDIR=@prefix@/share/doc/opari2/example_user_instrumentation -POMPLIB=-L${POMPLIBDIR} -lpomp - -BINDIR=@BINDIR@ -OPARI=$(BINDIR)/opari2 -OPARI2_CONFIG=$(BINDIR)/opari2-config - -# We need to make sure that we use the right versions -# of nm, awk and grep. opari2-config returns the right -# commands with the necessary options. -NM=`$(OPARI2_CONFIG) --nm` -AWK_SCRIPT=`$(OPARI2_CONFIG) --region-initialization` - -all: c fortran - -###################################################### -# C EXAMPLE # -###################################################### - -c: example_user_instrumentation_c example_user_instrumentation_c_inst - -# Build without instrumentation -example_user_instrumentation_c: example_user_instrumentation.c - $(CC) $(OPENMP_C_FLAG) $? -o $@ - -# Linking step -example_user_instrumentation_c_inst: example_user_instrumentation_c.mod.o pompregions_c.o - $(CC) $(OPENMP_C_FLAG) $? $(POMPLIB) -o $@ - -pompregions_c.o : pompregions_c.c - $(CC) $(POMP_INC) -c $? -o $@ - -# Use nm to find the initialization functions in the -# object file of the instrumented user code. Then the -# awk script generates these functions. -pompregions_c.c : example_user_instrumentation_c.mod.o - $(NM) example_user_instrumentation_c.mod.o | $(AWK_SCRIPT) > pompregions_c.c - -example_user_instrumentation_c.mod.o: example_user_instrumentation.mod.c - $(CC) $(OPENMP_C_FLAG) $(POMP_INC) -c $? -o $@ - -example_user_instrumentation.mod.c: example_user_instrumentation.c - $(OPARI) example_user_instrumentation.c - -###################################################### -# FORTRAN EXAMPLE # -###################################################### - -fortran: example_user_instrumentation_f example_user_instrumentation_f_inst - -# Build without instrumentation -example_user_instrumentation_f: example_user_instrumentation.f90 - $(FORTRAN) $(OPENMP_F_FLAG) $? -o $@ - -# Linking step -example_user_instrumentation_f_inst: example_user_instrumentation_f.mod.o pompregions_f.o - $(FORTRAN) $(OPENMP_F_FLAG) $? $(POMPLIB) -o $@ - -pompregions_f.o : pompregions_f.c - $(CC) $(POMP_INC) -c $? -o $@ - -# Use nm to find the initialization functions in the -# object file of the instrumented user code. Then the -# awk script generates these functions. -pompregions_f.c : example_user_instrumentation_f.mod.o - $(NM) example_user_instrumentation_f.mod.o | $(AWK_SCRIPT) > pompregions_f.c - -example_user_instrumentation_f.mod.o : example_user_instrumentation.mod.F90 - $(FORTRAN) $(OPENMP_F_FLAG) -c -o $@ $? - -example_user_instrumentation.mod.F90: example_user_instrumentation.f90 - $(OPARI) example_user_instrumentation.f90 - -###################################################### - -clean: - rm -rf example_user_instrumentation_? - rm -rf example_user_instrumentation_?_inst - rm -rf example_user_instrumentation.mod.? - rm -rf example_user_instrumentation.?.opari.inc - rm -rf pompregions_?.c - - rm -rf *.o Binary files /tmp/tmpv3i5zx2i/q1zr_i27zq/opari2-2.0.5/doc/html.tar.gz and /tmp/tmpv3i5zx2i/YDgq6bMmD8/opari2-2.0.6/doc/html.tar.gz differ diff -Nru opari2-2.0.5/doc/Makefile.inc.am opari2-2.0.6/doc/Makefile.inc.am --- opari2-2.0.5/doc/Makefile.inc.am 2019-07-26 09:16:10.893167481 +0000 +++ opari2-2.0.6/doc/Makefile.inc.am 2021-02-25 12:51:08.227909944 +0000 @@ -9,13 +9,13 @@ ## Copyright (c) 2009-2011, ## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany ## -## Copyright (c) 2009-2011, +## Copyright (c) 2009-2011, 2019-2020, ## Technische Universitaet Dresden, Germany ## ## Copyright (c) 2009-2011, ## University of Oregon, Eugene, USA ## -## Copyright (c) 2009-2011, 2015, +## Copyright (c) 2009-2011, 2015, 2019, ## Forschungszentrum Juelich GmbH, Germany ## ## Copyright (c) 2009-2011, @@ -45,7 +45,7 @@ ## make dist. When creating a distribution, the developer should make sure ## that she has doxygen and related tools e.g. pdflatex in PATH in order to ## generate a complete documentation, see also -## vendor/common/build-config/m4/ac_scorep_doxygen.m4. +## build-config/common/m4/ac_scorep_doxygen.m4. ## ## make install is ignorant of documentation issues in developer mode. ## @@ -58,7 +58,7 @@ doxygen-uninstall: rm -rf $(DESTDIR)$(docdir) -if SVN_CONTROLLED #----------------------------------------------------------- +if GIT_CONTROLLED USER_DOC_DIR = $(top_distdir)$(ac_scorep_doxygen_distdir)/doc @@ -67,25 +67,25 @@ doxygen-user-generate: doxygen-user-pdf doxygen-user-html-compress copy-revision-file-to-dist update-revision: - echo `svnversion $(srcdir)` > "$(srcdir)/build-config/REVISION" + @$(am__tty_colors); \ + if $(AM_V_P); then echo "cd $(srcdir) && git describe --always --dirty > 'build-config/REVISION'"; \ + else echo " GEN $${mgn}$(srcdir)/build-config/REVISION$$std"; fi; \ + cd $(srcdir) && git describe --always --dirty > "build-config/REVISION" copy-revision-file-to-dist: - $(MKDIR_P) "$(distdir)/build-config/" - for i in REVISION REVISION_COMMON; do \ - cp -p "$(srcdir)/build-config/$$i" "$(distdir)/build-config/"; \ - if grep -E [A-Z] "$(srcdir)/build-config/$$i" || \ - grep "-" "$(srcdir)/build-config/$$i"; then \ - echo "WARNING: distribution does not match a single, unmodified revision." >&2; \ - fi \ - done + @$(MKDIR_P) "$(distdir)/build-config/" + @cp -p "$(srcdir)/build-config/REVISION" "$(distdir)/build-config/" + @case `cat "$(distdir)/build-config/REVISION"` in *-dirty) \ + echo >&2 "WARNING: distribution does not match a single, unmodified revision.";; \ + esac doxygen-user-html-compress: - if test -d "$(USER_DOC_DIR)/html"; then \ - cd "$(USER_DOC_DIR)"; tar czvf html.tar.gz html; rm -rf html/; \ + $(AM_V_at)if test -d "$(USER_DOC_DIR)/html"; then \ + cd "$(USER_DOC_DIR)"; tar czf html.tar.gz html; rm -rf html/; \ fi doxygen-project-number: update-revision - echo "PROJECT_NUMBER = \"@PACKAGE_VERSION@ (revision `cat $(srcdir)/build-config/REVISION`)\"" > doc/doxygen-project-number.cfg + $(AM_V_at)echo "PROJECT_NUMBER = \"@PACKAGE_VERSION@ (revision `cat $(srcdir)/build-config/REVISION`)\"" > doc/doxygen-project-number.cfg CLEANFILES += doc/doxygen-project-number.cfg @@ -93,51 +93,72 @@ rm -rf $(USER_DOC_DIR)/* -if HAVE_DOXYGEN #----------------------------------------------------- +if HAVE_DOXYGEN + +OPARI2_V_DOXYGEN = $(opari2__v_DOXYGEN_@AM_V@) +opari2__v_DOXYGEN_ = $(opari2__v_DOXYGEN_@AM_DEFAULT_V@) +opari2__v_DOXYGEN_0 = @$(am__tty_colors); echo " DOXYGEN $${blu}$@$$std"; +opari2__v_DOXYGEN_1 = + +OPARI2_V_DEVNULL = $(opari2__v_DEVNULL_@AM_V@) +opari2__v_DEVNULL_ = $(opari2__v_DEVNULL_@AM_DEFAULT_V@) +opari2__v_DEVNULL_0 = >/dev/null 2>&1 +opari2__v_DEVNULL_1 = doxygen-user: doxygen-project-number doc/doxygen-user/main.dox doc/doxygen-user.cfg - $(MKDIR_P) "$(USER_DOC_DIR)/tags" - echo "OUTPUT_DIRECTORY = $(USER_DOC_DIR)" > doc/doxygen-user-at-make-time.cfg - echo "GENERATE_TAGFILE = $(USER_DOC_DIR)/tags/@PACKAGE@.tag" >> doc/doxygen-user-at-make-time.cfg - cat doc/doxygen-project-number.cfg doc/doxygen-user-at-make-time.cfg doc/doxygen-user.cfg > doc/doxygen-user-html.cfg - $(MKDIR_P) "$(USER_DOC_DIR)/html" - cp $(abs_srcdir)/doc/images/* $(USER_DOC_DIR)/html - $(DOXYGEN) doc/doxygen-user-html.cfg + $(AM_V_at)$(MKDIR_P) "$(USER_DOC_DIR)/tags" + $(AM_V_at)echo "OUTPUT_DIRECTORY = $(USER_DOC_DIR)" > doc/doxygen-user-at-make-time.cfg + $(AM_V_at)echo "GENERATE_TAGFILE = $(USER_DOC_DIR)/tags/@PACKAGE@.tag" >> doc/doxygen-user-at-make-time.cfg + $(AM_V_at)cat doc/doxygen-project-number.cfg doc/doxygen-user-at-make-time.cfg doc/doxygen-user.cfg > doc/doxygen-user-html.cfg + $(AM_V_at)$(MKDIR_P) "$(USER_DOC_DIR)/html" + $(AM_V_at)cp $(abs_srcdir)/doc/images/* $(USER_DOC_DIR)/html + $(AM_V_at)if $(AM_V_P); then echo "QUIET = NO"; \ + else echo "QUIET = YES"; fi >>doc/doxygen-user-html.cfg + $(OPARI2_V_DOXYGEN)$(DOXYGEN) doc/doxygen-user-html.cfg CLEANFILES += doc/doxygen-user-html.cfg doc/doxygen-user-at-make-time.cfg doxygen.err -else # i.e. ! HAVE_DOXYGEN ------------------------------------------- +else !HAVE_DOXYGEN doxygen-user: echo "WARNING: doxygen not available. Cannot generate documentation." >&2 -endif # HAVE_DOXYGEN ------------------------------------------------- +endif !HAVE_DOXYGEN + +if HAVE_DOXYGEN_LATEX -if HAVE_DOXYGEN_LATEX #----------------------------------------------- +OPARI2_V_pdflatex = $(opari2__v_pdflatex_@AM_V@) +opari2__v_pdflatex_ = $(opari2__v_pdflatex_@AM_DEFAULT_V@) +opari2__v_pdflatex_0 = -interaction batchmode +opari2__v_pdflatex_1 = -interaction nonstopmode doxygen-user-pdf: doxygen-user - cat doc/doxygen-user-html.cfg > doc/doxygen-user-pdf.cfg - echo "ENABLED_SECTIONS = LATEX" >> doc/doxygen-user-pdf.cfg - echo "GENERATE_HTML = NO" >> doc/doxygen-user-pdf.cfg - cp $(abs_srcdir)/doc/doxygen-user/opari2.sty $(USER_DOC_DIR)/pdf/ - cp $(DOC_SRC_DIR)/license.tex $(USER_DOC_DIR)/pdf/ - -cp $(DOC_SRC_DIR)/images/project_logo.pdf $(USER_DOC_DIR)/pdf/ - $(DOXYGEN) doc/doxygen-user-pdf.cfg - cd "$(USER_DOC_DIR)/pdf" && \ - make && \ - mv refman.pdf ../ && \ - rm -f * && \ + $(AM_V_at)cat doc/doxygen-user-html.cfg > doc/doxygen-user-pdf.cfg + $(AM_V_at)echo "ENABLED_SECTIONS = LATEX" >> doc/doxygen-user-pdf.cfg + $(AM_V_at)echo "GENERATE_HTML = NO" >> doc/doxygen-user-pdf.cfg + $(AM_V_at)cp $(DOC_SRC_DIR)/license.tex $(USER_DOC_DIR)/pdf/ + -$(AM_V_at)cp $(DOC_SRC_DIR)/images/project_logo.pdf $(USER_DOC_DIR)/pdf/ + $(AM_V_at)echo "LATEX_CMD_NAME = \"pdflatex -file-line-error $(OPARI2_V_pdflatex)\"" >>doc/doxygen-user-pdf.cfg + $(AM_V_at)if $(AM_V_P); then echo "QUIET = NO"; \ + else echo "QUIET = YES"; \ + echo "MAKEINDEX_CMD_NAME = \"makeindex -q\""; \ + fi >>doc/doxygen-user-pdf.cfg + $(OPARI2_V_DOXYGEN)$(DOXYGEN) doc/doxygen-user-pdf.cfg + $(AM_V_at)cd "$(USER_DOC_DIR)/pdf" && \ + make $(OPARI2_V_DEVNULL) && \ + mv refman.pdf ../ && \ + rm -f * && \ mv ../refman.pdf @PACKAGE@.pdf -else # i.e. ! HAVE_DOXYGEN_LATEX ------------------------------------- +else !HAVE_DOXYGEN_LATEX doxygen-user-pdf: doxygen-user echo "WARNING: pdflatex not available. Cannot generate doxygen pdf documentation." >&2 if test -d "$(USER_DOC_DIR)/pdf"; then rm -rf "$(USER_DOC_DIR)/pdf"; fi -endif # HAVE_DOXYGEN_LATEX ------------------------------------------- +endif !HAVE_DOXYGEN_LATEX -else # i.e. ! SVN_CONTROLLED ----------------------------------------- +else !GIT_CONTROLLED doxygen-user-clean: @@ -146,14 +167,14 @@ doxygen-user-pdf: doxygen-user-install: - if test -f "$(DOC_SRC_DIR)/html.tar.gz"; then \ + $(AM_V_at)if test -f "$(DOC_SRC_DIR)/html.tar.gz"; then \ $(MKDIR_P) $(DESTDIR)$(docdir); \ $(INSTALL_DATA) $(DOC_SRC_DIR)/html.tar.gz $(DESTDIR)$(docdir)/html.tar.gz; \ - cd $(DESTDIR)$(docdir); \ - tar xzvf html.tar.gz; \ - rm -f html.tar.gz; \ - fi - if test -d "$(DOC_SRC_DIR)"; then \ + cd $(DESTDIR)$(docdir); \ + tar xzf html.tar.gz; \ + rm -f html.tar.gz; \ + fi + $(AM_V_at)if test -d "$(DOC_SRC_DIR)"; then \ cd $(DOC_SRC_DIR); \ dirs="pdf tags"; \ cd -; \ @@ -172,7 +193,7 @@ copy-revision-file-to-dist: -endif # SVN_CONTROLLED +endif !GIT_CONTROLLED ## ## ############################################################################### Binary files /tmp/tmpv3i5zx2i/q1zr_i27zq/opari2-2.0.5/doc/pdf/opari2.pdf and /tmp/tmpv3i5zx2i/YDgq6bMmD8/opari2-2.0.6/doc/pdf/opari2.pdf differ diff -Nru opari2-2.0.5/doc/tags/opari2.tag opari2-2.0.6/doc/tags/opari2.tag --- opari2-2.0.5/doc/tags/opari2.tag 2019-07-26 09:16:34.213240043 +0000 +++ opari2-2.0.6/doc/tags/opari2.tag 2021-02-25 12:51:38.836007378 +0000 @@ -2,13 +2,13 @@ opari2_region_info.h - /CI/build/tmp.FZhmHoSQQU/src/src/opari-lib-dummy/ + /CI/build/_work/src/src/opari-lib-dummy/ opari2__region__info_8h OPARI2_Region_info pomp2_lib.h - /CI/build/tmp.FZhmHoSQQU/src/include/opari2/ + /CI/build/_work/src/include/opari2/ pomp2__lib_8h void * @@ -76,7 +76,7 @@ pomp2_region_info.h - /CI/build/tmp.FZhmHoSQQU/src/src/opari-lib-dummy/ + /CI/build/_work/src/src/opari-lib-dummy/ pomp2__region__info_8h opari2_region_info.h POMP2_Region_info @@ -146,7 +146,7 @@ pomp2_user_lib.h - /CI/build/tmp.FZhmHoSQQU/src/include/opari2/ + /CI/build/_work/src/include/opari2/ pomp2__user__lib_8h void * @@ -298,7 +298,7 @@ pomp2_user_region_info.h - /CI/build/tmp.FZhmHoSQQU/src/src/opari-lib-dummy/ + /CI/build/_work/src/src/opari-lib-dummy/ pomp2__user__region__info_8h opari2_region_info.h POMP2_USER_Region_info diff -Nru opari2-2.0.5/Makefile.am opari2-2.0.6/Makefile.am --- opari2-2.0.5/Makefile.am 2019-07-26 09:16:11.109168154 +0000 +++ opari2-2.0.6/Makefile.am 2021-02-25 12:51:08.215909906 +0000 @@ -9,7 +9,7 @@ ## Copyright (c) 2009-2011, ## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany ## -## Copyright (c) 2009-2011, +## Copyright (c) 2009-2011, 2019-2020, ## Technische Universitaet Dresden, Germany ## ## Copyright (c) 2009-2011, @@ -39,11 +39,11 @@ ## ACLOCAL_AMFLAGS should be replaced by AC_CONFIG_MACRO_DIRS, aclocal-1.13.4 ## doesn't honor the paths provided to AC_CONFIG_MACRO_DIRS. See ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=21352 -ACLOCAL_AMFLAGS = -I build-config/m4 -I vendor/common/build-config/m4 +ACLOCAL_AMFLAGS = -I build-config/m4 -I build-config/common/m4 -include vendor/common/build-config/Makefile.inc.am +include build-config/common/Makefile.inc.am include doc/Makefile.inc.am -include vendor/common/build-config/platforms.am +include build-config/common/platforms.am ## Still, sometimes there are files that must be distributed, but which are not ## covered in the automatic rules. These files should be listed in the @@ -58,10 +58,10 @@ $(srcdir)/test/replacePaths_c.awk \ $(srcdir)/test/replacePaths_f77.awk \ $(srcdir)/test/replacePaths_f90.awk \ - $(srcdir)/doc/example/example.c \ - $(srcdir)/doc/example/example.f90 \ - $(srcdir)/doc/example_user_instrumentation/example_user_instrumentation.c \ - $(srcdir)/doc/example_user_instrumentation/example_user_instrumentation.f90 \ + $(srcdir)/doc/example/openmp/example.c \ + $(srcdir)/doc/example/openmp/example.f90 \ + $(srcdir)/doc/example/pomp/example.c \ + $(srcdir)/doc/example/pomp/example.f90 \ $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in \ $(srcdir)/doc/doxygen-dev/doxygen-dev.cfg.in \ @@ -83,55 +83,56 @@ CLEANFILES += doc/doxygen-user/main.dox -.PHONY: doc/doxygen-user/main.dox remove-svn-files-from-dist +.PHONY: doc/doxygen-user/main.dox -if SVN_CONTROLLED +if GIT_CONTROLLED doc/doxygen-user/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox - $(MKDIR_P) doc/doxygen-user + $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ doc/doxygen-user/main_user_usage.dox \ - $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ - doc/doxygen-user/main_user_linking.dox \ - $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ + doc/doxygen-user/main_user_linking.dox \ + $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ > doc/doxygen-user/main.dox ## The developer documentation is compiled of the user documentation ## and additional information for developers doc/doxygen-dev/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox - $(MKDIR_P) doc/doxygen-dev + $(AM_V_GEN)$(MKDIR_P) doc/doxygen-dev && \ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ - $(srcdir)/doc/doxygen-dev/main_dev.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ + $(srcdir)/doc/doxygen-dev/main_dev.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ doc/doxygen-user/main_user_usage.dox \ - $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ - doc/doxygen-user/main_user_linking.dox \ - $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ + doc/doxygen-user/main_user_linking.dox \ + $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ $(srcdir)/doc/doxygen-dev/main_dev_parser.dox.in \ $(srcdir)/doc/doxygen-dev/main_dev_new-paradigm.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ > doc/doxygen-dev/main.dox doc/doxygen-user/main_user_usage.dox: - $(MKDIR_P) doc/doxygen-user + $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ cat $(srcdir)/doc/doxygen-user/main_user_usage.dox.in \ - $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ - $(srcdir)/doc/doxygen-user/main_user_usage-end.dox.in \ + $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ + $(srcdir)/doc/doxygen-user/main_user_usage-end.dox.in \ > doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox: - $(MKDIR_P) doc/doxygen-user - cat $(srcdir)/doc/doxygen-user/main_user_linking.dox.in \ - $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in \ - > doc/doxygen-user/main_user_linking.dox - echo "\endverbatim" >> doc/doxygen-user/main_user_linking.dox + $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ + ( \ + cat $(srcdir)/doc/doxygen-user/main_user_linking.dox.in \ + $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in; \ + echo "\endverbatim"; \ + ) > doc/doxygen-user/main_user_linking.dox else doc/doxygen-user/main.dox: # touch doc/doxygen-user/main.dox @@ -144,22 +145,16 @@ $(MKDIR_P) doxygen-dev-doc/opari2/tags $(DOXYGEN) doc/doxygen-dev.cfg -remove-svn-files-from-dist: - files=`find $(top_distdir) -type d | grep "\.svn"`; \ - for i in $$files; do rm -rf $$i; done - -dist-hook: remove-svn-files-from-dist prohibit-svn-files-in-dist doc/doxygen-user/main.dox doxygen-user-generate - rm -f $(top_distdir)/build-frontend/opari2_usage.h - rm -f $(top_distdir)/build-frontend/opari2-config_usage.h +dist-hook: doc/doxygen-user/main.dox doxygen-user-generate + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2_usage.h + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2-config_usage.h clean-local: doxygen-user-clean rm -rf test/tmp -install-exec-local: - $(MKDIR_P) $(DESTDIR)$(libexecdir) - $(INSTALL_SCRIPT) $(builddir)/build-frontend/pomp2-parse-init-regions.awk $(DESTDIR)$(libexecdir)/ +uninstall-hook: doxygen-uninstall common-uninstall -install-data-local: doxygen-user-install +libexec_SCRIPTS = build-frontend/pomp2-parse-init-regions.awk -uninstall-hook: doxygen-uninstall common-uninstall - rm -f $(DESTDIR)$(libexecdir)/pomp2-parse-init-regions.awk +# non-color automake only provides $(am__tty_colors) if tests are in use +TESTS = diff -Nru opari2-2.0.5/Makefile.in opari2-2.0.6/Makefile.in --- opari2-2.0.5/Makefile.in 2019-07-26 09:16:15.021180329 +0000 +++ opari2-2.0.6/Makefile.in 2021-02-25 12:51:12.871924725 +0000 @@ -17,8 +17,9 @@ ############################################################################### # Create platform entries for EXTRA_DIST using e.g.: -# cd vendor/common/build-config/platforms -# for i in *; do echo " \$(srcdir)/vendor/common/build-config/platforms/$i \\"; done +# cd build-config/common/platforms +# for i in *; do echo " \$(srcdir)/build-config/common/platforms/$i \\"; done + VPATH = @srcdir@ am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' @@ -83,30 +84,52 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ -DIST_COMMON = $(srcdir)/vendor/common/build-config/Makefile.inc.am \ +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +DIST_COMMON = $(srcdir)/build-config/common/Makefile.inc.am \ $(srcdir)/doc/Makefile.inc.am \ - $(srcdir)/vendor/common/build-config/platforms.am \ + $(srcdir)/build-config/common/platforms.am \ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/doc/doxygen-user/doxygen-user.cfg.in \ $(top_srcdir)/doc/doxygen-dev/doxygen-dev.cfg.in \ - $(top_srcdir)/vendor/common/build-config/config-common.h \ + $(top_srcdir)/build-config/common/config-common.h \ $(top_srcdir)/test/c_test.sh.in \ $(top_srcdir)/test/f90_test.sh.in \ $(top_srcdir)/test/f77_test.sh.in \ $(top_srcdir)/test/awk_script_test.sh.in \ $(top_srcdir)/test/data/awk_script_test.out.in \ $(top_srcdir)/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in \ - AUTHORS COPYING ChangeLog INSTALL README THANKS \ - build-config/config.guess build-config/config.sub \ - build-config/install-sh build-config/missing \ - $(top_srcdir)/build-config/config.guess \ + $(top_srcdir)/build-config/test-driver AUTHORS COPYING \ + ChangeLog INSTALL README THANKS build-config/config.guess \ + build-config/config.sub build-config/install-sh \ + build-config/missing $(top_srcdir)/build-config/config.guess \ $(top_srcdir)/build-config/config.sub \ $(top_srcdir)/build-config/install-sh \ $(top_srcdir)/build-config/missing -@HAVE_UNCRUSTIFY_TRUE@@SVN_CONTROLLED_TRUE@am__append_1 = beautify-recursive -@SVN_CONTROLLED_TRUE@am__append_2 = doc/doxygen-project-number.cfg -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@am__append_3 = doc/doxygen-user-html.cfg doc/doxygen-user-at-make-time.cfg doxygen.err +@GIT_CONTROLLED_TRUE@@HAVE_UNCRUSTIFY_TRUE@am__append_1 = beautify-recursive +@GIT_CONTROLLED_TRUE@am__append_2 = doc/doxygen-project-number.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@am__append_3 = doc/doxygen-user-html.cfg doc/doxygen-user-at-make-time.cfg doxygen.err @CROSS_BUILD_FALSE@am__append_4 = $(srcdir)/build-frontend/configure.ac \ @CROSS_BUILD_FALSE@ $(srcdir)/build-frontend/aclocal.m4 \ @CROSS_BUILD_FALSE@ $(srcdir)/build-frontend/Makefile.am \ @@ -114,19 +137,21 @@ @CROSS_BUILD_FALSE@ $(srcdir)/build-frontend/configure \ @CROSS_BUILD_FALSE@ $(srcdir)/src/config-frontend.h.in +TESTS = subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/vendor/common/build-config/m4/ac_common_package.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_doxygen.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_toplevel_args.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_uncrustify.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/afs_compiler_backend.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/afs_maintainer_mode.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/afs_summary.m4 \ - $(top_srcdir)/vendor/common/build-config/m4/ax_config_subdir.m4 \ +am__aclocal_m4_deps = \ + $(top_srcdir)/build-config/common/m4/ac_common_package.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_doxygen.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_git_controlled.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_sys_detection.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_toplevel_args.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_uncrustify.m4 \ + $(top_srcdir)/build-config/common/m4/ac_scorep_version_and_revision.m4 \ + $(top_srcdir)/build-config/common/m4/afs_compiler_backend.m4 \ + $(top_srcdir)/build-config/common/m4/afs_maintainer_mode.m4 \ + $(top_srcdir)/build-config/common/m4/afs_summary.m4 \ + $(top_srcdir)/build-config/common/m4/ax_config_subdir.m4 \ $(top_srcdir)/build-config/m4/opari2_compiler_and_flags.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -140,33 +165,6 @@ test/awk_script_test.output \ build-frontend/pomp2-parse-init-regions.awk CONFIG_CLEAN_VPATH_FILES = -AM_V_P = $(am__v_P_@AM_V@) -am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) -am__v_P_0 = false -am__v_P_1 = : -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ -am__v_at_1 = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ - ctags-recursive dvi-recursive html-recursive info-recursive \ - install-data-recursive install-dvi-recursive \ - install-exec-recursive install-html-recursive \ - install-info-recursive install-pdf-recursive \ - install-ps-recursive install-recursive installcheck-recursive \ - installdirs-recursive pdf-recursive ps-recursive \ - tags-recursive uninstall-recursive -am__can_run_installinfo = \ - case $$AM_UPDATE_INFO_DIR in \ - n|no|NO) false;; \ - *) (install-info --version) >/dev/null 2>&1;; \ - esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -194,7 +192,35 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(docdir)" +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(docdir)" +SCRIPTS = $(libexec_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @$(am__tty_colors); echo " GEN $${mgn}$@$$std"; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(doc_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive @@ -203,7 +229,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope check recheck distdir dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -224,6 +250,157 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = .test +am__test_logs1 = $(TESTS:=.log) +TEST_LOGS = $(am__test_logs1:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-config/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -320,6 +497,7 @@ abs_top_srcdir = @abs_top_srcdir@ ac_scorep_doxygen_distdir = @ac_scorep_doxygen_distdir@ ac_scorep_have_uncrustify = @ac_scorep_have_uncrustify@ +afs_srcdir = @afs_srcdir@ am__leading_dot = @am__leading_dot@ am__tar = @am__tar@ am__untar = @am__untar@ @@ -336,6 +514,9 @@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +has_CC = @has_CC@ +has_cc = @has_cc@ +has_ftn = @has_ftn@ have_dot = @have_dot@ have_doxygen_latex = @have_doxygen_latex@ have_makeindex = @have_makeindex@ @@ -365,131 +546,134 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = $(subdirs) $(ax_config_subdirs) -ACLOCAL_AMFLAGS = -I build-config/m4 -I vendor/common/build-config/m4 +ACLOCAL_AMFLAGS = -I build-config/m4 -I build-config/common/m4 # Testing framework -EXTRA_DIST = $(srcdir)/vendor/common/build-config/generate-config-backend-for-frontend.sh \ - $(srcdir)/vendor/common/build-config/generate-library-dependencies.sh \ - $(srcdir)/vendor/common/build-config/generate-library-dependencies-la-object.hpp \ - $(srcdir)/vendor/common/build-config/generate-library-version.sh \ - $(srcdir)/vendor/common/build-config/generate-package-version.sh \ - $(srcdir)/vendor/common/cutest/CuTest.c \ - $(srcdir)/vendor/common/cutest/CuTest.h \ - $(srcdir)/vendor/common/cutest/license.txt \ - $(srcdir)/vendor/common/cutest/README.txt \ - $(srcdir)/vendor/common/build-config/process_arguments.awk \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-gcc \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-ibm \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-pgi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-studio \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-clang \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-bullxmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-hp \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-ibmpoe \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intelpoe \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-lam \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpibull2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-openmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-openmpi3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-platform \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-scali \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sgimpt \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-spectrum \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sun \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-without \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openmpi3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openshmem \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-sgimpt \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-spectrum \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-without \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-gcc \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-ibm \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-pgi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-studio \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-clang \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mingw \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mingw \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-user-provided \ +EXTRA_DIST = $(srcdir)/build-config/common/generate-config-backend-for-frontend.sh \ + $(srcdir)/build-config/common/generate-library-dependencies.sh \ + $(srcdir)/build-config/common/generate-library-dependencies-la-object.hpp \ + $(srcdir)/build-config/common/generate-library-version.sh \ + $(srcdir)/build-config/common/generate-package-version.sh \ + $(srcdir)/common/utils/test/cutest/CuTest.c \ + $(srcdir)/common/utils/test/cutest/CuTest.h \ + $(srcdir)/common/utils/test/cutest/license.txt \ + $(srcdir)/common/utils/test/cutest/README.txt \ + $(srcdir)/build-config/common/process_arguments.awk \ + $(srcdir)/build-config/common/platforms/compiler-frontend-gcc \ + $(srcdir)/build-config/common/platforms/compiler-frontend-ibm \ + $(srcdir)/build-config/common/platforms/compiler-frontend-intel \ + $(srcdir)/build-config/common/platforms/compiler-frontend-pgi \ + $(srcdir)/build-config/common/platforms/compiler-frontend-studio \ + $(srcdir)/build-config/common/platforms/compiler-frontend-clang \ + $(srcdir)/build-config/common/platforms/compiler-frontend-aocc \ + $(srcdir)/build-config/common/platforms/compiler-mpi-bullxmpi \ + $(srcdir)/build-config/common/platforms/compiler-mpi-hp \ + $(srcdir)/build-config/common/platforms/compiler-mpi-ibmpoe \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intel3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-intelpoe \ + $(srcdir)/build-config/common/platforms/compiler-mpi-lam \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpibull2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich2 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-mpich3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-openmpi \ + $(srcdir)/build-config/common/platforms/compiler-mpi-openmpi3 \ + $(srcdir)/build-config/common/platforms/compiler-mpi-platform \ + $(srcdir)/build-config/common/platforms/compiler-mpi-scali \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sgimpt \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sgimptwrapper \ + $(srcdir)/build-config/common/platforms/compiler-mpi-spectrum \ + $(srcdir)/build-config/common/platforms/compiler-mpi-sun \ + $(srcdir)/build-config/common/platforms/compiler-mpi-without \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openmpi \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openmpi3 \ + $(srcdir)/build-config/common/platforms/compiler-shmem-openshmem \ + $(srcdir)/build-config/common/platforms/compiler-shmem-sgimpt \ + $(srcdir)/build-config/common/platforms/compiler-shmem-sgimptwrapper \ + $(srcdir)/build-config/common/platforms/compiler-shmem-spectrum \ + $(srcdir)/build-config/common/platforms/compiler-shmem-without \ + $(srcdir)/build-config/common/platforms/compiler-nocross-gcc \ + $(srcdir)/build-config/common/platforms/compiler-nocross-ibm \ + $(srcdir)/build-config/common/platforms/compiler-nocross-intel \ + $(srcdir)/build-config/common/platforms/compiler-nocross-pgi \ + $(srcdir)/build-config/common/platforms/compiler-nocross-studio \ + $(srcdir)/build-config/common/platforms/compiler-nocross-clang \ + $(srcdir)/build-config/common/platforms/compiler-nocross-aocc \ + $(srcdir)/build-config/common/platforms/platform-backend-altix \ + $(srcdir)/build-config/common/platforms/platform-backend-bgl \ + $(srcdir)/build-config/common/platforms/platform-backend-bgp \ + $(srcdir)/build-config/common/platforms/platform-backend-bgq \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxt \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxe \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxk \ + $(srcdir)/build-config/common/platforms/platform-backend-crayxc \ + $(srcdir)/build-config/common/platforms/platform-backend-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-backend-aix \ + $(srcdir)/build-config/common/platforms/platform-backend-linux \ + $(srcdir)/build-config/common/platforms/platform-backend-mac \ + $(srcdir)/build-config/common/platforms/platform-backend-mic \ + $(srcdir)/build-config/common/platforms/platform-backend-mingw \ + $(srcdir)/build-config/common/platforms/platform-backend-necsx \ + $(srcdir)/build-config/common/platforms/platform-backend-solaris \ + $(srcdir)/build-config/common/platforms/platform-backend-k \ + $(srcdir)/build-config/common/platforms/platform-backend-fx10 \ + $(srcdir)/build-config/common/platforms/platform-backend-fx100 \ + $(srcdir)/build-config/common/platforms/platform-backend-user-provided \ + $(srcdir)/build-config/common/platforms/platform-frontend-altix \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgl \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgp \ + $(srcdir)/build-config/common/platforms/platform-frontend-bgq \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxt \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxe \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxk \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayxc \ + $(srcdir)/build-config/common/platforms/platform-frontend-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-frontend-aix \ + $(srcdir)/build-config/common/platforms/platform-frontend-linux \ + $(srcdir)/build-config/common/platforms/platform-frontend-mac \ + $(srcdir)/build-config/common/platforms/platform-frontend-mic \ + $(srcdir)/build-config/common/platforms/platform-frontend-mingw \ + $(srcdir)/build-config/common/platforms/platform-frontend-necsx \ + $(srcdir)/build-config/common/platforms/platform-frontend-solaris \ + $(srcdir)/build-config/common/platforms/platform-frontend-k \ + $(srcdir)/build-config/common/platforms/platform-frontend-fx10 \ + $(srcdir)/build-config/common/platforms/platform-frontend-fx100 \ + $(srcdir)/build-config/common/platforms/platform-frontend-user-provided \ + $(srcdir)/build-config/common/platforms/platform-mpi-altix \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgl \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgp \ + $(srcdir)/build-config/common/platforms/platform-mpi-bgq \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxt \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxe \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxk \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayxc \ + $(srcdir)/build-config/common/platforms/platform-mpi-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-mpi-aix \ + $(srcdir)/build-config/common/platforms/platform-mpi-linux \ + $(srcdir)/build-config/common/platforms/platform-mpi-mac \ + $(srcdir)/build-config/common/platforms/platform-mpi-mic \ + $(srcdir)/build-config/common/platforms/platform-mpi-necsx \ + $(srcdir)/build-config/common/platforms/platform-mpi-solaris \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxk \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxe \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxt \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayxc \ + $(srcdir)/build-config/common/platforms/platform-shmem-crayunknown \ + $(srcdir)/build-config/common/platforms/platform-shmem-user-provided \ + $(srcdir)/build-config/common/platforms/platform-mpi-k \ + $(srcdir)/build-config/common/platforms/platform-mpi-fx10 \ + $(srcdir)/build-config/common/platforms/platform-mpi-fx100 \ + $(srcdir)/build-config/common/platforms/platform-mpi-user-provided \ $(srcdir)/src/config.h $(srcdir)/src/config-custom.h \ $(srcdir)/test/replacePaths_c.awk \ $(srcdir)/test/replacePaths_f77.awk \ $(srcdir)/test/replacePaths_f90.awk \ - $(srcdir)/doc/example/example.c \ - $(srcdir)/doc/example/example.f90 \ - $(srcdir)/doc/example_user_instrumentation/example_user_instrumentation.c \ - $(srcdir)/doc/example_user_instrumentation/example_user_instrumentation.f90 \ + $(srcdir)/doc/example/openmp/example.c \ + $(srcdir)/doc/example/openmp/example.f90 \ + $(srcdir)/doc/example/pomp/example.c \ + $(srcdir)/doc/example/pomp/example.f90 \ $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in \ $(srcdir)/doc/doxygen-dev/doxygen-dev.cfg.in \ @@ -507,54 +691,68 @@ CONFIGURE_DEPENDENCIES = $(srcdir)/build-config/VERSION SCOREP_RECURSIVE_TARGETS = $(am__append_1) check-build-recursive DOC_SRC_DIR = $(srcdir)/doc -@SVN_CONTROLLED_TRUE@USER_DOC_DIR = $(top_distdir)$(ac_scorep_doxygen_distdir)/doc +@GIT_CONTROLLED_TRUE@USER_DOC_DIR = $(top_distdir)$(ac_scorep_doxygen_distdir)/doc +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@OPARI2_V_DOXYGEN = $(opari2__v_DOXYGEN_@AM_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DOXYGEN_ = $(opari2__v_DOXYGEN_@AM_DEFAULT_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DOXYGEN_0 = @$(am__tty_colors); echo " DOXYGEN $${blu}$@$$std"; +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DOXYGEN_1 = +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@OPARI2_V_DEVNULL = $(opari2__v_DEVNULL_@AM_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DEVNULL_ = $(opari2__v_DEVNULL_@AM_DEFAULT_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DEVNULL_0 = >/dev/null 2>&1 +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@opari2__v_DEVNULL_1 = +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@OPARI2_V_pdflatex = $(opari2__v_pdflatex_@AM_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@opari2__v_pdflatex_ = $(opari2__v_pdflatex_@AM_DEFAULT_V@) +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@opari2__v_pdflatex_0 = -interaction batchmode +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@opari2__v_pdflatex_1 = -interaction nonstopmode doc_DATA = $(srcdir)/OPEN_ISSUES \ $(srcdir)/ChangeLog +libexec_SCRIPTS = build-frontend/pomp2-parse-init-regions.awk all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-recursive + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: +.SUFFIXES: .log .test .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/vendor/common/build-config/Makefile.inc.am $(srcdir)/doc/Makefile.inc.am $(srcdir)/vendor/common/build-config/platforms.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/build-config/common/Makefile.inc.am $(srcdir)/doc/Makefile.inc.am $(srcdir)/build-config/common/platforms.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \ + if $(AM_V_P); then echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; fi; \ $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + if $(AM_V_P); then echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; fi; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ - echo ' $(SHELL) ./config.status'; \ + if $(AM_V_P); then echo ' $(SHELL) ./config.status'; fi; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + if $(AM_V_P); then echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; fi; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/vendor/common/build-config/Makefile.inc.am $(srcdir)/doc/Makefile.inc.am $(srcdir)/vendor/common/build-config/platforms.am: +$(srcdir)/build-config/common/Makefile.inc.am $(srcdir)/doc/Makefile.inc.am $(srcdir)/build-config/common/platforms.am: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck + $(AM_V_at)$(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - $(am__cd) $(srcdir) && $(AUTOCONF) + $(AM_V_at)$(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(AM_V_at)$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) $(am__aclocal_m4_deps): doc/doxygen-user.cfg: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen-user/doxygen-user.cfg.in cd $(top_builddir) && $(SHELL) ./config.status $@ doc/doxygen-dev.cfg: $(top_builddir)/config.status $(top_srcdir)/doc/doxygen-dev/doxygen-dev.cfg.in cd $(top_builddir) && $(SHELL) ./config.status $@ -src/config-common.h: $(top_builddir)/config.status $(top_srcdir)/vendor/common/build-config/config-common.h +src/config-common.h: $(top_builddir)/config.status $(top_srcdir)/build-config/common/config-common.h cd $(top_builddir) && $(SHELL) ./config.status $@ test/c_test.sh: $(top_builddir)/config.status $(top_srcdir)/test/c_test.sh.in cd $(top_builddir) && $(SHELL) ./config.status $@ @@ -568,20 +766,60 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ build-frontend/pomp2-parse-init-regions.awk: $(top_builddir)/config.status $(top_srcdir)/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in cd $(top_builddir) && $(SHELL) ./config.status $@ +install-libexecSCRIPTS: $(libexec_SCRIPTS) + @$(NORMAL_INSTALL) + @$(am__tty_colors); \ + list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(libexecdir)$$std"; fi; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { for p in $$files; do \ + $(am__strip_dir) \ + if $(AM_V_P); then echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + else echo " INSTALL $${grn}$(DESTDIR)$(libexecdir)$$dir/$$f$$std"; fi; \ + $(INSTALL_SCRIPT) $$p "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + done; } \ + ; done + +uninstall-libexecSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + @$(am__tty_colors); \ + list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + if $(AM_V_P); then echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + else echo " MKDIR $${mgn}$(DESTDIR)$(docdir)$$std"; fi; \ $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ fi; \ for p in $$list; do \ + $(am__strip_dir) \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \ + if $(AM_V_P); then echo " $(INSTALL_DATA) $$d$$p '$(DESTDIR)$(docdir)'"; \ + else echo " INSTALL $${blu}$(DESTDIR)$(docdir)/$$f$$std"; fi; \ + $(INSTALL_DATA) $$d$$p "$(DESTDIR)$(docdir)" || exit $$?; \ done uninstall-docDATA: @@ -610,7 +848,7 @@ *) list='$(SUBDIRS)' ;; \ esac; \ for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ + if $(AM_V_P); then echo "Making $$target in $$subdir"; fi; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ local_target="$$target-am"; \ @@ -696,9 +934,158 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ + fi; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ + else \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ + fi; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ + else \ + color_start= color_end=; \ + fi; \ + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) + distdir: $(DISTFILES) - $(am__remove_distdir) - test -d "$(distdir)" || mkdir "$(distdir)" + $(AM_V_at)$(am__remove_distdir) + $(AM_V_at)test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -740,8 +1127,10 @@ dir1=$$subdir; dir2="$(top_distdir)"; \ $(am__relativize); \ new_top_distdir=$$reldir; \ - echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ - echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + if $(AM_V_P); then \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + fi; \ ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$new_top_distdir" \ @@ -753,10 +1142,10 @@ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -test -n "$(am__skip_mode_fix)" \ + -$(AM_V_at)test -n "$(am__skip_mode_fix)" \ || find "$(distdir)" -type d ! -perm -755 \ -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ @@ -764,37 +1153,58 @@ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__post_remove_distdir) + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz"; \ + else echo " DIST $${grn}$(distdir).tar.gz$$std"; fi; \ + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz + $(AM_V_at)$(am__post_remove_distdir) dist-bzip2: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2"; \ + else echo " DIST $${grn}$(distdir).tar.bz2$$std"; fi; \ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-lzip: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz"; \ + else echo " DIST $${grn}$(distdir).tar.lz$$std"; fi; \ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-xz: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz"; \ + else echo " DIST $${grn}$(distdir).tar.xz$$std"; fi; \ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-tarZ: distdir + @$(am__tty_colors); \ + if $(AM_V_P); then echo "tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z"; \ + else echo " DIST $${grn}$(distdir).tar.Z$$std"; fi; \ tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist-shar: distdir - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__post_remove_distdir) + @$(am__tty_colors); \ + if $(AM_V_P); then echo "shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz"; \ + else echo " DIST $${grn}$(distdir).shar.gz$$std"; fi; \ + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz + $(AM_V_at)$(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip + @$(am__tty_colors); \ + if $(AM_V_P); then echo "zip -rq $(distdir).zip '$(distdir)'"; \ + else echo " DIST $${grn}$(distdir).zip$$std"; fi; \ zip -rq $(distdir).zip $(distdir) - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) dist dist-all: - $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' - $(am__post_remove_distdir) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir=':' + $(AM_V_at)$(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -802,7 +1212,7 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -812,7 +1222,7 @@ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac @@ -850,7 +1260,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__post_remove_distdir) + $(AM_V_at)$(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -881,26 +1291,27 @@ $(distcleancheck_listfiles) ; \ exit 1; } >&2 check-am: all-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(DATA) + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check-recursive +all-am: Makefile $(SCRIPTS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(docdir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(docdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) install-recursive + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-recursive install-strip: - if test -z '$(STRIP)'; then \ + $(AM_V_at)if test -z '$(STRIP)'; then \ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ install; \ @@ -910,6 +1321,9 @@ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -944,13 +1358,13 @@ info-am: -install-data-am: install-data-local install-docDATA +install-data-am: install-docDATA install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-exec-local +install-exec-am: install-libexecSCRIPTS install-html: install-html-recursive @@ -990,65 +1404,46 @@ ps-am: -uninstall-am: uninstall-docDATA +uninstall-am: uninstall-docDATA uninstall-libexecSCRIPTS @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-hook -.MAKE: $(am__recursive_targets) all check install install-am \ + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) uninstall-hook +.MAKE: $(am__recursive_targets) all check check-am install install-am \ install-strip uninstall-am .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--refresh check check-am clean clean-cscope clean-generic \ - clean-local cscope cscopelist-am ctags ctags-am dist dist-all \ - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local \ + am--refresh check check-TESTS check-am clean clean-cscope \ + clean-generic clean-local cscope cscopelist-am ctags ctags-am \ + dist dist-all dist-bzip2 dist-gzip dist-hook dist-lzip \ + dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ install-docDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-local install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-am uninstall uninstall-am uninstall-docDATA \ - uninstall-hook - - -prohibit-svn-files-in-dist: - @find $(top_distdir) -type d | grep "\.svn"; \ - if [ $$? -eq 0 ]; then \ - echo "ERROR: subversion files found in distribution. This is usually caused by"; \ - echo "referencing directories in EXTRA_DIST. Please specify the files that need"; \ - echo "to go into the distribution explicitly."; \ - exit 1; \ - fi + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecSCRIPTS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \ + uninstall uninstall-am uninstall-docDATA uninstall-hook \ + uninstall-libexecSCRIPTS + common-uninstall: rm -rf $(DESTDIR)$(datadir)/@PACKAGE@ ############################################################################### -@HAVE_UNCRUSTIFY_TRUE@@SVN_CONTROLLED_TRUE@beautify-sp: -@HAVE_UNCRUSTIFY_TRUE@@SVN_CONTROLLED_TRUE@ @$(am__cd) $(srcdir) && ./vendor/common/beautifier/beautify -@HAVE_UNCRUSTIFY_TRUE@@SVN_CONTROLLED_TRUE@beautify: beautify-recursive +@GIT_CONTROLLED_TRUE@@HAVE_UNCRUSTIFY_TRUE@beautify-sp: +@GIT_CONTROLLED_TRUE@@HAVE_UNCRUSTIFY_TRUE@ @$(am__cd) $(srcdir) && ./common/beautifier/beautify +@GIT_CONTROLLED_TRUE@@HAVE_UNCRUSTIFY_TRUE@beautify: beautify-recursive -@HAVE_UNCRUSTIFY_TRUE@@SVN_CONTROLLED_TRUE@beautify-clean: +@GIT_CONTROLLED_TRUE@@HAVE_UNCRUSTIFY_TRUE@beautify-clean: ############################################################################### ############################################################################### -bitten-copy-tarball-to-prefix: $(distdir).tar.gz - $(MKDIR_P) $(DESTDIR)$(prefix) - $(INSTALL_DATA) $(distdir).tar.gz $(DESTDIR)$(prefix)/$(PACKAGE)-latest.tar.gz - -bitten-print-environment: - env -############################################################################### - -############################################################################### - check-build-sp: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) check-build: check-build-recursive @@ -1082,174 +1477,170 @@ doxygen-uninstall: rm -rf $(DESTDIR)$(docdir) -@SVN_CONTROLLED_TRUE@doxygen-user-install: - -@SVN_CONTROLLED_TRUE@doxygen-user-generate: doxygen-user-pdf doxygen-user-html-compress copy-revision-file-to-dist +@GIT_CONTROLLED_TRUE@doxygen-user-install: -@SVN_CONTROLLED_TRUE@update-revision: -@SVN_CONTROLLED_TRUE@ echo `svnversion $(srcdir)` > "$(srcdir)/build-config/REVISION" +@GIT_CONTROLLED_TRUE@doxygen-user-generate: doxygen-user-pdf doxygen-user-html-compress copy-revision-file-to-dist -@SVN_CONTROLLED_TRUE@copy-revision-file-to-dist: -@SVN_CONTROLLED_TRUE@ $(MKDIR_P) "$(distdir)/build-config/" -@SVN_CONTROLLED_TRUE@ for i in REVISION REVISION_COMMON; do \ -@SVN_CONTROLLED_TRUE@ cp -p "$(srcdir)/build-config/$$i" "$(distdir)/build-config/"; \ -@SVN_CONTROLLED_TRUE@ if grep -E [A-Z] "$(srcdir)/build-config/$$i" || \ -@SVN_CONTROLLED_TRUE@ grep "-" "$(srcdir)/build-config/$$i"; then \ -@SVN_CONTROLLED_TRUE@ echo "WARNING: distribution does not match a single, unmodified revision." >&2; \ -@SVN_CONTROLLED_TRUE@ fi \ -@SVN_CONTROLLED_TRUE@ done - -@SVN_CONTROLLED_TRUE@doxygen-user-html-compress: -@SVN_CONTROLLED_TRUE@ if test -d "$(USER_DOC_DIR)/html"; then \ -@SVN_CONTROLLED_TRUE@ cd "$(USER_DOC_DIR)"; tar czvf html.tar.gz html; rm -rf html/; \ -@SVN_CONTROLLED_TRUE@ fi - -@SVN_CONTROLLED_TRUE@doxygen-project-number: update-revision -@SVN_CONTROLLED_TRUE@ echo "PROJECT_NUMBER = \"@PACKAGE_VERSION@ (revision `cat $(srcdir)/build-config/REVISION`)\"" > doc/doxygen-project-number.cfg - -@SVN_CONTROLLED_TRUE@doxygen-user-clean: -@SVN_CONTROLLED_TRUE@ rm -rf $(USER_DOC_DIR)/* - -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@doxygen-user: doxygen-project-number doc/doxygen-user/main.dox doc/doxygen-user.cfg -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ $(MKDIR_P) "$(USER_DOC_DIR)/tags" -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ echo "OUTPUT_DIRECTORY = $(USER_DOC_DIR)" > doc/doxygen-user-at-make-time.cfg -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ echo "GENERATE_TAGFILE = $(USER_DOC_DIR)/tags/@PACKAGE@.tag" >> doc/doxygen-user-at-make-time.cfg -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ cat doc/doxygen-project-number.cfg doc/doxygen-user-at-make-time.cfg doc/doxygen-user.cfg > doc/doxygen-user-html.cfg -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ $(MKDIR_P) "$(USER_DOC_DIR)/html" -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ cp $(abs_srcdir)/doc/images/* $(USER_DOC_DIR)/html -@HAVE_DOXYGEN_TRUE@@SVN_CONTROLLED_TRUE@ $(DOXYGEN) doc/doxygen-user-html.cfg - -@HAVE_DOXYGEN_FALSE@@SVN_CONTROLLED_TRUE@doxygen-user: -@HAVE_DOXYGEN_FALSE@@SVN_CONTROLLED_TRUE@ echo "WARNING: doxygen not available. Cannot generate documentation." >&2 - -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@doxygen-user-pdf: doxygen-user -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ cat doc/doxygen-user-html.cfg > doc/doxygen-user-pdf.cfg -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ echo "ENABLED_SECTIONS = LATEX" >> doc/doxygen-user-pdf.cfg -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ echo "GENERATE_HTML = NO" >> doc/doxygen-user-pdf.cfg -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ cp $(abs_srcdir)/doc/doxygen-user/opari2.sty $(USER_DOC_DIR)/pdf/ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ cp $(DOC_SRC_DIR)/license.tex $(USER_DOC_DIR)/pdf/ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ -cp $(DOC_SRC_DIR)/images/project_logo.pdf $(USER_DOC_DIR)/pdf/ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ $(DOXYGEN) doc/doxygen-user-pdf.cfg -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ cd "$(USER_DOC_DIR)/pdf" && \ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ make && \ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ mv refman.pdf ../ && \ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ rm -f * && \ -@HAVE_DOXYGEN_LATEX_TRUE@@SVN_CONTROLLED_TRUE@ mv ../refman.pdf @PACKAGE@.pdf - -@HAVE_DOXYGEN_LATEX_FALSE@@SVN_CONTROLLED_TRUE@doxygen-user-pdf: doxygen-user -@HAVE_DOXYGEN_LATEX_FALSE@@SVN_CONTROLLED_TRUE@ echo "WARNING: pdflatex not available. Cannot generate doxygen pdf documentation." >&2 -@HAVE_DOXYGEN_LATEX_FALSE@@SVN_CONTROLLED_TRUE@ if test -d "$(USER_DOC_DIR)/pdf"; then rm -rf "$(USER_DOC_DIR)/pdf"; fi - -@SVN_CONTROLLED_FALSE@doxygen-user-clean: - -@SVN_CONTROLLED_FALSE@doxygen-user-generate: - -@SVN_CONTROLLED_FALSE@doxygen-user-pdf: - -@SVN_CONTROLLED_FALSE@doxygen-user-install: -@SVN_CONTROLLED_FALSE@ if test -f "$(DOC_SRC_DIR)/html.tar.gz"; then \ -@SVN_CONTROLLED_FALSE@ $(MKDIR_P) $(DESTDIR)$(docdir); \ -@SVN_CONTROLLED_FALSE@ $(INSTALL_DATA) $(DOC_SRC_DIR)/html.tar.gz $(DESTDIR)$(docdir)/html.tar.gz; \ -@SVN_CONTROLLED_FALSE@ cd $(DESTDIR)$(docdir); \ -@SVN_CONTROLLED_FALSE@ tar xzvf html.tar.gz; \ -@SVN_CONTROLLED_FALSE@ rm -f html.tar.gz; \ -@SVN_CONTROLLED_FALSE@ fi -@SVN_CONTROLLED_FALSE@ if test -d "$(DOC_SRC_DIR)"; then \ -@SVN_CONTROLLED_FALSE@ cd $(DOC_SRC_DIR); \ -@SVN_CONTROLLED_FALSE@ dirs="pdf tags"; \ -@SVN_CONTROLLED_FALSE@ cd -; \ -@SVN_CONTROLLED_FALSE@ for i in $$dirs; do \ -@SVN_CONTROLLED_FALSE@ if test -d "$(DOC_SRC_DIR)/$$i"; then \ -@SVN_CONTROLLED_FALSE@ $(MKDIR_P) $(DESTDIR)$(docdir)/$$i; \ -@SVN_CONTROLLED_FALSE@ cd $(DOC_SRC_DIR)/$$i; \ -@SVN_CONTROLLED_FALSE@ files=`find . -type f`; \ -@SVN_CONTROLLED_FALSE@ cd -; \ -@SVN_CONTROLLED_FALSE@ for j in $$files; do \ -@SVN_CONTROLLED_FALSE@ $(INSTALL_DATA) $(DOC_SRC_DIR)/$$i/$$j $(DESTDIR)$(docdir)/$$i/$$j; \ -@SVN_CONTROLLED_FALSE@ done; \ -@SVN_CONTROLLED_FALSE@ fi; \ -@SVN_CONTROLLED_FALSE@ done; \ -@SVN_CONTROLLED_FALSE@ fi +@GIT_CONTROLLED_TRUE@update-revision: +@GIT_CONTROLLED_TRUE@ @$(am__tty_colors); \ +@GIT_CONTROLLED_TRUE@ if $(AM_V_P); then echo "cd $(srcdir) && git describe --always --dirty > 'build-config/REVISION'"; \ +@GIT_CONTROLLED_TRUE@ else echo " GEN $${mgn}$(srcdir)/build-config/REVISION$$std"; fi; \ +@GIT_CONTROLLED_TRUE@ cd $(srcdir) && git describe --always --dirty > "build-config/REVISION" + +@GIT_CONTROLLED_TRUE@copy-revision-file-to-dist: +@GIT_CONTROLLED_TRUE@ @$(MKDIR_P) "$(distdir)/build-config/" +@GIT_CONTROLLED_TRUE@ @cp -p "$(srcdir)/build-config/REVISION" "$(distdir)/build-config/" +@GIT_CONTROLLED_TRUE@ @case `cat "$(distdir)/build-config/REVISION"` in *-dirty) \ +@GIT_CONTROLLED_TRUE@ echo >&2 "WARNING: distribution does not match a single, unmodified revision.";; \ +@GIT_CONTROLLED_TRUE@ esac + +@GIT_CONTROLLED_TRUE@doxygen-user-html-compress: +@GIT_CONTROLLED_TRUE@ $(AM_V_at)if test -d "$(USER_DOC_DIR)/html"; then \ +@GIT_CONTROLLED_TRUE@ cd "$(USER_DOC_DIR)"; tar czf html.tar.gz html; rm -rf html/; \ +@GIT_CONTROLLED_TRUE@ fi + +@GIT_CONTROLLED_TRUE@doxygen-project-number: update-revision +@GIT_CONTROLLED_TRUE@ $(AM_V_at)echo "PROJECT_NUMBER = \"@PACKAGE_VERSION@ (revision `cat $(srcdir)/build-config/REVISION`)\"" > doc/doxygen-project-number.cfg + +@GIT_CONTROLLED_TRUE@doxygen-user-clean: +@GIT_CONTROLLED_TRUE@ rm -rf $(USER_DOC_DIR)/* + +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@doxygen-user: doxygen-project-number doc/doxygen-user/main.dox doc/doxygen-user.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)$(MKDIR_P) "$(USER_DOC_DIR)/tags" +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)echo "OUTPUT_DIRECTORY = $(USER_DOC_DIR)" > doc/doxygen-user-at-make-time.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)echo "GENERATE_TAGFILE = $(USER_DOC_DIR)/tags/@PACKAGE@.tag" >> doc/doxygen-user-at-make-time.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)cat doc/doxygen-project-number.cfg doc/doxygen-user-at-make-time.cfg doc/doxygen-user.cfg > doc/doxygen-user-html.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)$(MKDIR_P) "$(USER_DOC_DIR)/html" +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)cp $(abs_srcdir)/doc/images/* $(USER_DOC_DIR)/html +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(AM_V_at)if $(AM_V_P); then echo "QUIET = NO"; \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ else echo "QUIET = YES"; fi >>doc/doxygen-user-html.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_TRUE@ $(OPARI2_V_DOXYGEN)$(DOXYGEN) doc/doxygen-user-html.cfg + +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_FALSE@doxygen-user: +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_FALSE@ echo "WARNING: doxygen not available. Cannot generate documentation." >&2 + +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@doxygen-user-pdf: doxygen-user +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)cat doc/doxygen-user-html.cfg > doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)echo "ENABLED_SECTIONS = LATEX" >> doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)echo "GENERATE_HTML = NO" >> doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)cp $(DOC_SRC_DIR)/license.tex $(USER_DOC_DIR)/pdf/ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ -$(AM_V_at)cp $(DOC_SRC_DIR)/images/project_logo.pdf $(USER_DOC_DIR)/pdf/ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)echo "LATEX_CMD_NAME = \"pdflatex -file-line-error $(OPARI2_V_pdflatex)\"" >>doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)if $(AM_V_P); then echo "QUIET = NO"; \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ else echo "QUIET = YES"; \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ echo "MAKEINDEX_CMD_NAME = \"makeindex -q\""; \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ fi >>doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(OPARI2_V_DOXYGEN)$(DOXYGEN) doc/doxygen-user-pdf.cfg +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ $(AM_V_at)cd "$(USER_DOC_DIR)/pdf" && \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ make $(OPARI2_V_DEVNULL) && \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ mv refman.pdf ../ && \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ rm -f * && \ +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_TRUE@ mv ../refman.pdf @PACKAGE@.pdf + +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_FALSE@doxygen-user-pdf: doxygen-user +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_FALSE@ echo "WARNING: pdflatex not available. Cannot generate doxygen pdf documentation." >&2 +@GIT_CONTROLLED_TRUE@@HAVE_DOXYGEN_LATEX_FALSE@ if test -d "$(USER_DOC_DIR)/pdf"; then rm -rf "$(USER_DOC_DIR)/pdf"; fi + +@GIT_CONTROLLED_FALSE@doxygen-user-clean: + +@GIT_CONTROLLED_FALSE@doxygen-user-generate: + +@GIT_CONTROLLED_FALSE@doxygen-user-pdf: + +@GIT_CONTROLLED_FALSE@doxygen-user-install: +@GIT_CONTROLLED_FALSE@ $(AM_V_at)if test -f "$(DOC_SRC_DIR)/html.tar.gz"; then \ +@GIT_CONTROLLED_FALSE@ $(MKDIR_P) $(DESTDIR)$(docdir); \ +@GIT_CONTROLLED_FALSE@ $(INSTALL_DATA) $(DOC_SRC_DIR)/html.tar.gz $(DESTDIR)$(docdir)/html.tar.gz; \ +@GIT_CONTROLLED_FALSE@ cd $(DESTDIR)$(docdir); \ +@GIT_CONTROLLED_FALSE@ tar xzf html.tar.gz; \ +@GIT_CONTROLLED_FALSE@ rm -f html.tar.gz; \ +@GIT_CONTROLLED_FALSE@ fi +@GIT_CONTROLLED_FALSE@ $(AM_V_at)if test -d "$(DOC_SRC_DIR)"; then \ +@GIT_CONTROLLED_FALSE@ cd $(DOC_SRC_DIR); \ +@GIT_CONTROLLED_FALSE@ dirs="pdf tags"; \ +@GIT_CONTROLLED_FALSE@ cd -; \ +@GIT_CONTROLLED_FALSE@ for i in $$dirs; do \ +@GIT_CONTROLLED_FALSE@ if test -d "$(DOC_SRC_DIR)/$$i"; then \ +@GIT_CONTROLLED_FALSE@ $(MKDIR_P) $(DESTDIR)$(docdir)/$$i; \ +@GIT_CONTROLLED_FALSE@ cd $(DOC_SRC_DIR)/$$i; \ +@GIT_CONTROLLED_FALSE@ files=`find . -type f`; \ +@GIT_CONTROLLED_FALSE@ cd -; \ +@GIT_CONTROLLED_FALSE@ for j in $$files; do \ +@GIT_CONTROLLED_FALSE@ $(INSTALL_DATA) $(DOC_SRC_DIR)/$$i/$$j $(DESTDIR)$(docdir)/$$i/$$j; \ +@GIT_CONTROLLED_FALSE@ done; \ +@GIT_CONTROLLED_FALSE@ fi; \ +@GIT_CONTROLLED_FALSE@ done; \ +@GIT_CONTROLLED_FALSE@ fi -@SVN_CONTROLLED_FALSE@copy-revision-file-to-dist: +@GIT_CONTROLLED_FALSE@copy-revision-file-to-dist: ############################################################################### -.PHONY: doc/doxygen-user/main.dox remove-svn-files-from-dist +.PHONY: doc/doxygen-user/main.dox -@SVN_CONTROLLED_TRUE@doc/doxygen-user/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox -@SVN_CONTROLLED_TRUE@ $(MKDIR_P) doc/doxygen-user -@SVN_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ -@SVN_CONTROLLED_TRUE@ doc/doxygen-user/main_user_usage.dox \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ -@SVN_CONTROLLED_TRUE@ doc/doxygen-user/main_user_linking.dox \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ -@SVN_CONTROLLED_TRUE@ > doc/doxygen-user/main.dox - -@SVN_CONTROLLED_TRUE@doc/doxygen-dev/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox -@SVN_CONTROLLED_TRUE@ $(MKDIR_P) doc/doxygen-dev -@SVN_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ -@SVN_CONTROLLED_TRUE@ doc/doxygen-user/main_user_usage.dox \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ -@SVN_CONTROLLED_TRUE@ doc/doxygen-user/main_user_linking.dox \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev_parser.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev_new-paradigm.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ -@SVN_CONTROLLED_TRUE@ > doc/doxygen-dev/main.dox - -@SVN_CONTROLLED_TRUE@doc/doxygen-user/main_user_usage.dox: -@SVN_CONTROLLED_TRUE@ $(MKDIR_P) doc/doxygen-user -@SVN_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_usage.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_usage-end.dox.in \ -@SVN_CONTROLLED_TRUE@ > doc/doxygen-user/main_user_usage.dox - -@SVN_CONTROLLED_TRUE@doc/doxygen-user/main_user_linking.dox: -@SVN_CONTROLLED_TRUE@ $(MKDIR_P) doc/doxygen-user -@SVN_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_linking.dox.in \ -@SVN_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in \ -@SVN_CONTROLLED_TRUE@ > doc/doxygen-user/main_user_linking.dox -@SVN_CONTROLLED_TRUE@ echo "\endverbatim" >> doc/doxygen-user/main_user_linking.dox -@SVN_CONTROLLED_FALSE@doc/doxygen-user/main.dox: +@GIT_CONTROLLED_TRUE@doc/doxygen-user/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox +@GIT_CONTROLLED_TRUE@ $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ +@GIT_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ +@GIT_CONTROLLED_TRUE@ doc/doxygen-user/main_user_usage.dox \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ +@GIT_CONTROLLED_TRUE@ doc/doxygen-user/main_user_linking.dox \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ +@GIT_CONTROLLED_TRUE@ > doc/doxygen-user/main.dox + +@GIT_CONTROLLED_TRUE@doc/doxygen-dev/main.dox: doc/doxygen-user/main_user_usage.dox doc/doxygen-user/main_user_linking.dox +@GIT_CONTROLLED_TRUE@ $(AM_V_GEN)$(MKDIR_P) doc/doxygen-dev && \ +@GIT_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_introduction.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_summary.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_install.dox.in \ +@GIT_CONTROLLED_TRUE@ doc/doxygen-user/main_user_usage.dox \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_ctc-decoding.dox.in \ +@GIT_CONTROLLED_TRUE@ doc/doxygen-user/main_user_linking.dox \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_pomp-instrumentation.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_example.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_news.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev_parser.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-dev/main_dev_new-paradigm.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_finalization.dox.in \ +@GIT_CONTROLLED_TRUE@ > doc/doxygen-dev/main.dox + +@GIT_CONTROLLED_TRUE@doc/doxygen-user/main_user_usage.dox: +@GIT_CONTROLLED_TRUE@ $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ +@GIT_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_usage.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/opari2_usage.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/main_user_usage-end.dox.in \ +@GIT_CONTROLLED_TRUE@ > doc/doxygen-user/main_user_usage.dox + +@GIT_CONTROLLED_TRUE@doc/doxygen-user/main_user_linking.dox: +@GIT_CONTROLLED_TRUE@ $(AM_V_GEN)$(MKDIR_P) doc/doxygen-user && \ +@GIT_CONTROLLED_TRUE@ ( \ +@GIT_CONTROLLED_TRUE@ cat $(srcdir)/doc/doxygen-user/main_user_linking.dox.in \ +@GIT_CONTROLLED_TRUE@ $(srcdir)/doc/doxygen-user/opari2-config_usage.dox.in; \ +@GIT_CONTROLLED_TRUE@ echo "\endverbatim"; \ +@GIT_CONTROLLED_TRUE@ ) > doc/doxygen-user/main_user_linking.dox +@GIT_CONTROLLED_FALSE@doc/doxygen-user/main.dox: # touch doc/doxygen-user/main.dox -@SVN_CONTROLLED_FALSE@doc/doxygen-dev/main.dox: +@GIT_CONTROLLED_FALSE@doc/doxygen-dev/main.dox: # touch doc/doxygen-dev/main.dox doxygen-dev: doc/doxygen-dev/main.dox $(MKDIR_P) doxygen-dev-doc/opari2/tags $(DOXYGEN) doc/doxygen-dev.cfg -remove-svn-files-from-dist: - files=`find $(top_distdir) -type d | grep "\.svn"`; \ - for i in $$files; do rm -rf $$i; done - -dist-hook: remove-svn-files-from-dist prohibit-svn-files-in-dist doc/doxygen-user/main.dox doxygen-user-generate - rm -f $(top_distdir)/build-frontend/opari2_usage.h - rm -f $(top_distdir)/build-frontend/opari2-config_usage.h +dist-hook: doc/doxygen-user/main.dox doxygen-user-generate + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2_usage.h + $(AM_V_at)rm -f $(top_distdir)/build-frontend/opari2-config_usage.h clean-local: doxygen-user-clean rm -rf test/tmp -install-exec-local: - $(MKDIR_P) $(DESTDIR)$(libexecdir) - $(INSTALL_SCRIPT) $(builddir)/build-frontend/pomp2-parse-init-regions.awk $(DESTDIR)$(libexecdir)/ - -install-data-local: doxygen-user-install - uninstall-hook: doxygen-uninstall common-uninstall - rm -f $(DESTDIR)$(libexecdir)/pomp2-parse-init-regions.awk # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru opari2-2.0.5/OPEN_ISSUES opari2-2.0.6/OPEN_ISSUES --- opari2-2.0.5/OPEN_ISSUES 2019-07-26 09:16:10.853167357 +0000 +++ opari2-2.0.6/OPEN_ISSUES 2021-02-25 12:51:08.215909906 +0000 @@ -1,7 +1,7 @@ - OPARI2 2.0.5 OPEN ISSUES - ======================== - Effective: July 2019 + OPARI2 2.0.6 OPEN ISSUES + ======================== + Effective: Feb 2021 This file lists known limitations and unimplemented features of the OPARI2 component. @@ -11,25 +11,21 @@ * Platform support - OPARI2 has been tested on the following platforms: - + Cray XC systems - + K Computer - + various Linux/Intel (x86/x64/Power8/ARM AArch32/AArch64) clusters + + Cray XC systems with all available PrgEnvs + + various Linux/Intel (x86_64/Power9/ARM AArch64) clusters with + GNU, Intel, Nvidia, and IBM compilers. Note that some compilers + are based on Clang. The provided configure options (see INSTALL) may provide a good basis for building and testing the toolset on other systems. - The following platforms have not been tested recently: + IBM Blue Gene/Q - + IBM Blue Gene/P + Cray XT, XE, XK - + Sun Solaris/SPARC-based clusters However the supplied buildsystem might still work on these systems. - The following platforms have not been tested: - + NEC SX-9 - + IBM Blue Gene/L - + SiCortex systems - + other NEC SX systems + + NEC systems -------------------------------------------------------------------------------- @@ -115,6 +111,14 @@ chuncksize into a temporary variable prior to its usage in the schedule clause. + + + For combined constructs (like 'omp parallel '), + some clauses not yet handled by OPARI2 (such as 'simd') may be + incorrectly added to the 'omp parallel' clause during the + source-to-source translation. As a workaround, the combined + construct can be manually split into an 'omp parallel' region + and the remaining construct. + - Fortran: + The !$OMP END DO and !$OMP END PARALLEL DO directives are required @@ -183,6 +187,15 @@ the string. Otherwise, include statements might appear not at the correct place. + + Instrumented OpenMP directives inside 'associate' constructs + fail to compile with gfortran ('pomp2_lib_get_max_threads' is + not a function). Compilation works fine with other compilers. + + + OPARI2 does not handle 'interface ... end interface' + correctly. If the name 'interface' (case-insensitive) appears + in a variable name, OPARI2 might produce non-functional + code. As a workaround, rename this variable. + - C/C++: + Structured blocks describing the extent of an OpenMP pragma @@ -199,6 +212,9 @@ or _GNU_SOURCE, need to define these macros on the compiler command line rather than in header or source files. + + OPARI2 does not handle C++14 integer literal with single + quotes correctly. As a workaround, use C++98 integer literals. + It is planned to address these limitations in future releases. diff -Nru opari2-2.0.5/src/config-frontend.h.in opari2-2.0.6/src/config-frontend.h.in --- opari2-2.0.5/src/config-frontend.h.in 2019-07-26 09:16:24.581210078 +0000 +++ opari2-2.0.6/src/config-frontend.h.in 2021-02-25 12:51:25.331964386 +0000 @@ -36,9 +36,6 @@ /* Set if we are building for the ALTIX platform */ #undef HAVE_PLATFORM_ALTIX -/* Set if we are building for the ARM platform */ -#undef HAVE_PLATFORM_ARM - /* Set if we are building for the BG/L platform */ #undef HAVE_PLATFORM_BGL @@ -51,6 +48,9 @@ /* Set if we are building for the Cray platform */ #undef HAVE_PLATFORM_CRAY +/* Set if we are building for an unknown Cray */ +#undef HAVE_PLATFORM_CRAYUNKNOWN + /* Set if we are building for the Cray XC platform */ #undef HAVE_PLATFORM_CRAYXC @@ -141,13 +141,10 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Revision of common repository */ -#undef SCOREP_COMMON_REVISION - /* Revision of OPARI2 */ #undef SCOREP_COMPONENT_REVISION -/* Defined if we are working from svn. */ +/* Defined if we are working from git. */ #undef SCOREP_IN_DEVELOPEMENT /* Defined if we are working from a make dist generated tarball. */ diff -Nru opari2-2.0.5/src/opari/opari2_config.cc opari2-2.0.6/src/opari/opari2_config.cc --- opari2-2.0.5/src/opari/opari2_config.cc 2019-07-26 09:16:10.841167320 +0000 +++ opari2-2.0.6/src/opari/opari2_config.cc 2021-02-25 12:51:08.243909995 +0000 @@ -2,13 +2,25 @@ * This file is part of the Score-P software (http://www.score-p.org) * * Copyright (c) 2009-2011, - * RWTH Aachen University, Germany - * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - * Technische Universitaet Dresden, Germany - * University of Oregon, Eugene, USA - * Forschungszentrum Juelich GmbH, Germany - * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - * Technische Universitaet Muenchen, Germany + * RWTH Aachen University, Germany + * + * Copyright (c) 2009-2011, + * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany + * + * Copyright (c) 2009-2011, 2019, + * Technische Universitaet Dresden, Germany + * + * Copyright (c) 2009-2011, + * University of Oregon, Eugene, USA + * + * Copyright (c) 2009-2011, + * Forschungszentrum Juelich GmbH, Germany + * + * Copyright (c) 2009-2011, + * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany + * + * Copyright (c) 2009-2011, + * Technische Universitaet Muenchen, Germany * * See the COPYING file in the package base directory for details. * @@ -139,14 +151,16 @@ { action = ACTION_POMP2_API_VERSION; } - else if ( strcmp( argv[ i ], "--opari2-revision" ) == 0 ) + else if ( strcmp( argv[ i ], "--revision" ) == 0 ) { std::cout << SCOREP_COMPONENT_REVISION << std::endl; exit( EXIT_SUCCESS ); } - else if ( strcmp( argv[ i ], "--common-revision" ) == 0 ) + else if ( strcmp( argv[ i ], "--opari2-revision" ) == 0 || + strcmp( argv[ i ], "--common-revision" ) == 0 ) { - std::cout << SCOREP_COMMON_REVISION << std::endl; + std::cerr << "[OPARI2] warning: " << argv[ i ] << " is deprecated" << std::endl; + std::cout << SCOREP_COMPONENT_REVISION << std::endl; exit( EXIT_SUCCESS ); } else if ( strncmp( argv[ i ], "--config", 8 ) == 0 ) diff -Nru opari2-2.0.5/src/opari/opari2_parser_c.cc opari2-2.0.6/src/opari/opari2_parser_c.cc --- opari2-2.0.5/src/opari/opari2_parser_c.cc 2019-07-26 09:16:10.837167307 +0000 +++ opari2-2.0.6/src/opari/opari2_parser_c.cc 2021-02-25 12:51:08.243909995 +0000 @@ -13,7 +13,7 @@ * Copyright (c) 2009-2013, * University of Oregon, Eugene, USA * - * Copyright (c) 2009-2013, 2016, + * Copyright (c) 2009-2013, 2016, 2020, * Forschungszentrum Juelich GmbH, Germany * * Copyright (c) 2009-2013, @@ -502,6 +502,12 @@ m_pos++; while ( m_line[ m_pos ] != '\"' ) { + // handle C++11 multiline string, see https://en.cppreference.com/w/cpp/language/string_literal + if ( m_pos == m_line.size() ) + { + m_in_string = true; + break; + } if ( m_line[ m_pos ] == '\\' ) { m_os << '\\'; diff -Nru opari2-2.0.5/src/opari-lib-dummy/Makefile.inc.am opari2-2.0.6/src/opari-lib-dummy/Makefile.inc.am --- opari2-2.0.5/src/opari-lib-dummy/Makefile.inc.am 2019-07-26 09:16:10.797167183 +0000 +++ opari2-2.0.6/src/opari-lib-dummy/Makefile.inc.am 2021-02-25 12:51:08.239909983 +0000 @@ -7,7 +7,7 @@ # Copyright (c) 2009-2013, # Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -# Copyright (c) 2009-2013, +# Copyright (c) 2009-2013, 2020, # Technische Universitaet Dresden, Germany # Copyright (c) 2009-2013, @@ -28,7 +28,8 @@ if HAVE_OPENMP_SUPPORT -noinst_LTLIBRARIES += libpomp.la +examplelibdir = $(docdir)/example/lib +examplelib_LTLIBRARIES = libpomp.la libpomp_la_SOURCES = \ $(SRC_ROOT)src/opari-lib-dummy/pomp2_lib.c \ $(PUBLIC_INC_SRC)pomp2_lib.h \ @@ -49,6 +50,7 @@ # CFLAGS are sufficient here, CPPFLAGS would cause duplication libpomp_la_CFLAGS = $(AM_CFLAGS) $(OPENMP_CFLAGS) libpomp_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(PUBLIC_INC_DIR) +libpomp_la_LDFLAGS = -static -avoid-version if SCOREP_HAVE_F77 @@ -73,3 +75,14 @@ endif + +pkgdatadeveldir = $(pkgdatadir)/devel +pkgdatadevel_DATA = \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_token.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_parser.h \ + $(SRC_ROOT)src/opari-lib-dummy/opari2_ctc_parser.c \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_region_info.c \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.h \ + $(SRC_ROOT)src/opari-lib-dummy/pomp2_user_region_info.c diff -Nru opari2-2.0.5/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in opari2-2.0.6/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in --- opari2-2.0.5/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in 2019-07-26 09:16:10.797167183 +0000 +++ opari2-2.0.6/src/opari-lib-dummy/pomp2_parse_init_regions.awk.in 2021-02-25 12:51:08.243909995 +0000 @@ -14,7 +14,7 @@ ## Copyright (c) 2009-2011, ## University of Oregon, Eugene, USA ## -## Copyright (c) 2009-2011, 2013, 2014, 2016-2017, +## Copyright (c) 2009-2011, 2013, 2014, 2016-2017, 2020, ## Forschungszentrum Juelich GmbH, Germany ## ## Copyright (c) 2009-2011, @@ -135,8 +135,11 @@ sub(/^\./, "", regions[i]); } - # declare XXXXX_Init_reg_* functions extern - for (i in regions) + # declare XXXXX_Init_reg_* functions extern. + # loop reproducibly as make check (test/awk_script_test.sh) might + # fail as it expects an order. For normal operation, order doesn't + # matter. + for (i = 0 ; i < counter; i++) { print "extern void " regions[i] "();"; } diff -Nru opari2-2.0.5/THANKS opari2-2.0.6/THANKS --- opari2-2.0.5/THANKS 2019-07-26 09:16:10.853167357 +0000 +++ opari2-2.0.6/THANKS 2021-02-25 12:51:08.215909906 +0000 @@ -13,3 +13,4 @@ Sally Bridgwater Xavier Le Vaillant Samuel Thibault +Nikhil Jain diff -Nru opari2-2.0.5/vendor/common/build-config/common.am opari2-2.0.6/vendor/common/build-config/common.am --- opari2-2.0.5/vendor/common/build-config/common.am 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/common.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ -## -*- mode: makefile -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2012, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2012, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2012, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2012, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2012, 2014, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2012, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2012, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file vendor/common/build-config/common.am -## Intended to be included by the component's -## build-includes/common.am. Defines "common" entities that all -## components rely on. - - -## AM_CPPFLAGS: The contents of this variable are passed to every compilation -## that invokes the C preprocessor; it is a list of arguments to the -## preprocessor. For instance, -I and -D options should be listed here. -## -## Automake already provides some -I options automatically, in a separate -## variable that is also passed to every compilation that invokes the C -## preprocessor. In particular it generates -I., -I$(srcdir), and a -I -## pointing to the directory holding config.h (if you've used -## AC_CONFIG_HEADERS or AM_CONFIG_HEADER). You can disable the default -I -## options using the nostdinc option. -## -## AM_CPPFLAGS is ignored in preference to a per-executable (or per-library) -## _CPPFLAGS variable if it is defined. So add it if necessary. -## -## -I$(srcdir)/../src: path to config.h; is this really necessary? -AM_CPPFLAGS = -I$(srcdir)/../src - -## Convenience variable, use for referencing sources, e.g. -## foo_SOURCES = $(SRC_ROOT)src/foo/foo.c. For CPPFLAGS use SRC_ROOT_* -## See the note below -SRC_ROOT = ../ - -## Convenience variables, use for referencing include directories, -## e.g. foo_CPPFLAGS = $(AM_CPPFLAGS) -I$(INC_ROOT)src/bar -## Note: we need different convenience variable for SRC and INC -## because they are evaluated at different times. The SRC_ROOT -## variable is evaluated at autoreconf time where it is not -## recommended to use $(srcdir). On the other hand the INC_ROOT -## variable is evaluated during configure. -INC_ROOT = $(srcdir)/../ -PUBLIC_INC_DIR = $(INC_ROOT)include - -# The include path to the common utils headers. -INC_DIR_COMMON_UTILS = $(INC_ROOT)vendor/common/src/utils/include - -## Where to find the Jenkins' hash headers. -INC_DIR_COMMON_HASH = $(INC_ROOT)vendor/common/hash - -## Where to find the Jenkins' hash headers. -INC_DIR_COMMON_CUTEST = $(INC_ROOT)vendor/common/cutest - -## Not really needed but already in use. -LIB_ROOT = - -## Add entities using += to the following primaries/variables in -## local Makefile.inc.ams -bin_PROGRAMS = -noinst_PROGRAMS = -pkglibexec_PROGRAMS = -lib_LTLIBRARIES = -noinst_LTLIBRARIES = -BUILT_SOURCES = -CLEANFILES = -DISTCLEANFILES = -EXTRA_DIST = -check_PROGRAMS = -check_LTLIBRARIES = -PHONY_TARGETS = -INSTALL_DATA_LOCAL_TARGETS = -INSTALL_DATA_HOOK_TARGETS = -UNINSTALL_LOCAL_TARGETS = -dist_bin_SCRIPTS = -pkgdata_DATA = - -## TESTS are handlend differently because of cross-, mpi- and openmp -## environments, see the component specific common.am or Makefile.am -## resp. But we need to define TESTS or else am__tty_colors will not -## get defined which leads to an syntax error in our tests. -TESTS = -XFAIL_TESTS = -# TESTS_ENVIRONMENT = - -.PHONY: $(PHONY_TARGETS) - -## Automatically update the libtool script if it becomes out-of-date. -BUILT_SOURCES += libtool -libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status libtool - -## need to have an empty rule here in order to stop recursion. -beautify: - - -## just build all targets specified by check_PROGRAMS and -## check_LTLIBRARIES here, don't traverse into subdirectories -check-build: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) - -DISTCLEANFILES += $(builddir)/config.summary - -# this propagates changes to vendor/common/build-config/config-common.h -../src/config-common.h: $(srcdir)/../vendor/common/build-config/config-common.h - @$(am__cd) .. && $(MAKE) $(AM_MAKEFLAGS) src/config-common.h diff -Nru opari2-2.0.5/vendor/common/build-config/config-common.h opari2-2.0.6/vendor/common/build-config/config-common.h --- opari2-2.0.5/vendor/common/build-config/config-common.h 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/config-common.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/* - * This file is part of the Score-P software (http://www.score-p.org) - * - * Copyright (c) 2009-2012, - * RWTH Aachen University, Germany - * - * Copyright (c) 2009-2012, - * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - * - * Copyright (c) 2009-2012, 2014, - * Technische Universitaet Dresden, Germany - * - * Copyright (c) 2009-2012, - * University of Oregon, Eugene, USA - * - * Copyright (c) 2009-2012, - * Forschungszentrum Juelich GmbH, Germany - * - * Copyright (c) 2009-2012, - * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - * - * Copyright (c) 2009-2012, - * Technische Universitaet Muenchen, Germany - * - * This software may be modified and distributed under the terms of - * a BSD-style license. See the COPYING file in the package base - * directory for details. - * - */ - -#ifndef CONFIG_COMMON_H -#define CONFIG_COMMON_H - - -/** - * @file config-common.h - * - * @brief This file gets included by config.h (resp. config-frontend.h and - * config-backend.h) and contains supplementary macros to be used with the - * macros in config.h. - * - */ - - -/** - * Conditionally compile on macro values that are either 0 or 1. - * - * E.g. if you have the macro @c HAVE_DECL_MPI_ACCUMULATE that is either 0 or - * 1, you should use #if HAVE(DECL_MPI_ACCUMULATE) in your code - * to conditionally compile if @c HAVE_DECL_MPI_ACCUMULATE is defined to 1. - */ -#define HAVE( H ) ( defined( HAVE_ ## H ) && HAVE_ ## H ) - - -/** - * Use these macros in internal headers to mark symbols as extern "C" - * - * @{ - */ - -#ifdef __cplusplus -# define UTILS_BEGIN_C_DECLS extern "C" { -# define UTILS_END_C_DECLS } -#else -# define UTILS_BEGIN_C_DECLS -# define UTILS_END_C_DECLS -#endif - -/** - * @} - */ - - -/* Macros used by utilities under vendor/common */ - -#define UTILS_STRINGIFY_( x ) #x -#define UTILS_STRINGIFY( x ) UTILS_STRINGIFY_( x ) - -#define UTILS_JOIN_SYMS_( x, y ) x ## y -#define UTILS_JOIN_SYMS( x, y ) UTILS_JOIN_SYMS_( x, y ) - -#define UTILS_JOIN_3SYMS_( x, y, z ) x ## y ## z -#define UTILS_JOIN_3SYMS( x, y, z ) UTILS_JOIN_3SYMS_( x, y, z ) - -#define PACKAGE_MANGLE_name( name ) UTILS_JOIN_SYMS( AFS_PACKAGE_name, _ ## name ) -#define PACKAGE_MANGLE_NAME( name ) UTILS_JOIN_SYMS( AFS_PACKAGE_NAME, _ ## name ) - - -/** - * Macros to fool the linker, so that the named compilation unit will always be - * linked into the library/binary - * @ingroup fool_linker @{ - */ - -/** Use this macro in the top level scope of the compilation unit, which - * should always be linked into the library/binary. - * @param name A unique name of this compilation unit, must be a valid C symbol. - */ -#define UTILS_FOOL_LINKER_DECLARE( name ) \ - bool name ## _fool_linker = false - -/** Use this macro in a function from a compilation unit, which is guaranteed - * to be always linked into an library/binary, so that the named compilation - * unit is also always linked into the library/binary. - * - * @param name The unique name of the compilation unit, must be a valid C symbol. - */ -#define UTILS_FOOL_LINKER( name ) \ - extern bool name ## _fool_linker; \ - name ## _fool_linker = true - -/** - * @} - */ - - -#endif /* CONFIG_COMMON_H */ diff -Nru opari2-2.0.5/vendor/common/build-config/generate-config-backend-for-frontend.sh opari2-2.0.6/vendor/common/build-config/generate-config-backend-for-frontend.sh --- opari2-2.0.5/vendor/common/build-config/generate-config-backend-for-frontend.sh 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/generate-config-backend-for-frontend.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -#! /bin/sh - -# -# Extracts all config header templates from the backend config.h intended -# for the frontend -# - -echo "/* Generated from $1 by $0. */" -echo -LC_ALL=C sed -e '/./{H;$'\!'d;}' -e 'x;/#undef HAVE_BACKEND_/'\!'d' "$1" diff -Nru opari2-2.0.5/vendor/common/build-config/generate-library-dependencies-la-object.hpp opari2-2.0.6/vendor/common/build-config/generate-library-dependencies-la-object.hpp --- opari2-2.0.5/vendor/common/build-config/generate-library-dependencies-la-object.hpp 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/generate-library-dependencies-la-object.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -#ifndef COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP -#define COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP - -/* - * This file is part of the Score-P software (http://www.score-p.org) - * - * Copyright (c) 2009-2013, - * RWTH Aachen University, Germany - * - * Copyright (c) 2009-2013, - * Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany - * - * Copyright (c) 2009-2014, - * Technische Universitaet Dresden, Germany - * - * Copyright (c) 2009-2013, - * University of Oregon, Eugene, USA - * - * Copyright (c) 2009-2013, 2017, - * Forschungszentrum Juelich GmbH, Germany - * - * Copyright (c) 2009-2013, - * German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany - * - * Copyright (c) 2009-2013, - * Technische Universitaet Muenchen, Germany - * - * This software may be modified and distributed under the terms of - * a BSD-style license. See the COPYING file in the package base - * directory for details. - * - */ - - -/** - * @file - */ - -#include -#include - -/** - * Helper struct to represent the content of one .la file. Used in code - * generated by generate-library-dependencies.sh. To make usage easier - * everything is public. - */ -struct la_object -{ - /** - * Empty contructor. Needed to allow copies of STL containers containing this - * class - */ - la_object( void ) - { - } - - /** - * Copy constructor. - */ - la_object( const la_object& source ) - : - m_lib_name( source.m_lib_name ), - m_build_dir( source.m_build_dir ), - m_install_dir( source.m_install_dir ), - m_libs( source.m_libs ), - m_ldflags( source.m_ldflags ), - m_rpath( source.m_rpath ), - m_dependency_las( source.m_dependency_las ) - { - } - - - /** - * Regular constructor. - */ - la_object( const std::string& lib_name, - const std::string& build_dir, - const std::string& install_dir, - const std::deque& libs, - const std::deque& ldflags, - const std::deque& rpaths, - const std::deque& dependency_las ) - : - m_lib_name( lib_name ), - m_build_dir( build_dir ), - m_install_dir( install_dir ), - m_libs( libs ), - m_ldflags( ldflags ), - m_rpath( rpaths ), - m_dependency_las( dependency_las ) - { - } - - /** - * Destructor. - */ - virtual - ~la_object() - { - } - - /** - * Member. - */ - std::string m_lib_name; - std::string m_build_dir; - std::string m_install_dir; - std::deque m_libs; - std::deque m_ldflags; - std::deque m_rpath; - std::deque m_dependency_las; -}; - -#endif /* COMMON_GENERATE_LIBRARY_DEPENDENCIES_LA_OBJECT_HPP */ diff -Nru opari2-2.0.5/vendor/common/build-config/generate-library-dependencies.sh opari2-2.0.6/vendor/common/build-config/generate-library-dependencies.sh --- opari2-2.0.5/vendor/common/build-config/generate-library-dependencies.sh 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/generate-library-dependencies.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,213 +0,0 @@ -#!/bin/sh - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2013, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2013, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2014, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2013, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2013, 2017, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2013, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2013, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file generate_library_dependencies.sh -## -## usage: ./generate_library_dependencies.sh .la [.la] > -## -## see also build-config/generate-library-dependencies-la-object.hpp -## -## Parse given *.la files and recursively all *.la files listed -## in dependency_libs of the given *.la files. Generate a C++ -## representation of the library dependencies and write it -## to stdout. To be used with the -config tools. -## Specify a to distinguish functions generated by -## different script invocations. -## -## Generates a function -## void add_library_dependencies_( std::deque& libs, -## std::deque& ldflags, -## std::deque& rpaths, -## std::deque& dependency_las, -## std::map< std::string, la_object>* la_objects ) -## { -## _dependency_1( libs, ldflags, rpaths, dependency_las, la_objects ); -## _dependency_2( libs, ldflags, rpaths, dependency_las, la_objects ); -## ... -## _dependency_n( libs, ldflags, rpaths, dependency_las, la_objects ); -## } -## to be called by the beneficiary of this generator. -## -## The functions _dependency_ are also generated and work -## on the temporary libs, ldflags, rpaths, and dependency_las to -## fill the provided la_objects map, which will contain the -## entire dependency information indexed by the library -## name. Uses the struct la_object defined in -## generate-library-dependencies-la-object.hpp -## -## An example _dependency_ would look like: -## -## libs.clear(); -## ldflags.clear(); -## rpaths.clear(); -## dependency_las.clear(); -## libs.push_back( "-lbfd" ); -## libs.push_back( "-lpapi" ); -## libs.push_back( "-lm" ); -## ldflags.push_back( "-L/opt/packages/papi/4.1.2.1/lib" ); -## if ( la_objects.find( "libscorep_mpi" ) != la_objects.end() ) -## { -## la_objects[ "libscorep_mpi" ] = -## la_object( "libscorep_mpi", -## "/home/roessel/silc/build/trunk/gcc_openmpi_static_x86-32/build-backend", -## "/home/roessel/silc/build/trunk/gcc_openmpi_static_x86-32/install/lib", -## libs, -## ldflags, -## rpaths, -## dependency_las ); -## } - -set -e - -parse_la () -{ - IFS=${default_ifs} - la_file="$1" - - lib_name=`basename $la_file` - lib_name=${lib_name%.la} - - # change to .la directory - old_pwd=`pwd` - build_dir=`dirname $la_file` - cd "${build_dir}" - build_dir=`pwd` - - # extract information from .la"s libdir (=install_dir) - # later, use @EGREP@ - eval `GREP_OPTIONS= grep -E "^libdir=" "${la_file}"` - install_dir="${libdir}" - - # ignore convenience libraries - if test "x${libdir}" = "x"; then - return - fi - - # extract information from .la"s dependency_libs - eval `GREP_OPTIONS= grep -E "^dependency_libs=" "${la_file}"` - # use @AWK@ - eval `echo ${dependency_libs} | awk ' - { - for (i=1; i<= NF; i++) - { - if (index($i, "-L") == 1) {ldflags = ldflags $i ":" - sub(/L/, "R", $i ) - rpath = rpath $i ":"} - else if (index($i, "-R") == 1) {rpath = rpath $i ":"} - else if (index($i, "-l") == 1) {libs = libs $i ":"} - else {dependency_la = dependency_la $i ":"} - } - } - END { - gsub(/:$/, "", ldflags) - gsub(/:$/, "", rpath) - gsub(/:$/, "", libs) - gsub(/:$/, "", dependency_la) - print "ldflags=\"" ldflags "\"; " "rpath=\"" rpath "\"; " "libs=\"" libs "\"; " "dependency_la=\"" dependency_la "\"" - }'` - - # generate output - fct_counter=$(($fct_counter+1)) - fct_name="${tag}_dependency_${fct_counter}" - echo "static" - echo "void ${fct_name}( std::deque& libs, std::deque& ldflags, std::deque& rpaths, std::deque& dependency_las, map< std::string, la_object>* la_objects )" - echo "{" - echo " libs.clear();" - echo " ldflags.clear();" - echo " rpaths.clear();" - echo " dependency_las.clear();" - - IFS=${colon_ifs} - for i in ${libs}; do - printf ' libs.push_back( "%s" );\n' "${i}" - done - - for i in ${ldflags}; do - printf ' ldflags.push_back( "%s" );\n' "${i}" - done - - for i in ${rpath}; do - printf ' rpaths.push_back( "%s" );\n' "${i}" - done - - for i in ${dependency_la}; do - dependency_la_name=`basename ${i}` - dependency_la_name=${dependency_la_name%.la} - printf ' dependency_las.push_back( "%s" );\n' "${dependency_la_name}" - done - - printf ' if ( la_objects->find( "%s" ) == la_objects->end() )\n' "${lib_name}" - echo " {" - printf ' (*la_objects)[ "%s" ] =\n' "${lib_name}" - printf ' la_object( "%s",\n' "${lib_name}" - printf ' "%s",\n' "${build_dir}" - printf ' "%s",\n' "${install_dir}" - echo " libs," - echo " ldflags," - echo " rpaths," - echo " dependency_las );" - echo " }" - echo "}" - echo - - cd "${old_pwd}" - - # call parse_la recursively on all libs in $dependency_la - for i in ${dependency_la}; do - parse_la ${i} - done - - IFS="${default_ifs}" -} - -echo "#include " -echo - -tag=$1 -shift - -fct_counter=0 -default_ifs="${IFS}" -colon_ifs=":" -for i; do - parse_la ${i} -done - -echo "static" -echo "void add_library_dependencies_${tag}( std::deque& libs, std::deque& ldflags, std::deque& rpaths, std::deque& dependency_las, std::map< std::string, la_object>* la_objects )" -echo "{" -# do not use the single-printf trick, if ${fct_counter} == 0, than printf still -# prints the format-specifier once with 0 as the default value for not specified -# arguments -for i in $(seq ${fct_counter}); do - printf " ${tag}_dependency_%d( libs, ldflags, rpaths, dependency_las, la_objects );\n" $i -done -echo "}" diff -Nru opari2-2.0.5/vendor/common/build-config/generate-library-version.sh opari2-2.0.6/vendor/common/build-config/generate-library-version.sh --- opari2-2.0.5/vendor/common/build-config/generate-library-version.sh 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/generate-library-version.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -#! /bin/sh - -# this script expects an input that contains at least three lines specifying -# the library interface version, e.g. -# library.current=1 -# library.revision=2 -# library.age=4 - -format="${2-}" - -current=0 -revision=0 -age=0 - -errormsg= -atexit_error() -{ - if test -n "$errormsg" - then - printf "%s\n" "$errormsg" - fi -} -trap atexit_error EXIT - -errormsg="$(printf "Malformed VERSION file: %s" "$1")" -set -e -eval "$(sed -n -e 's/^library\.// p' "$1")" -errormsg= - -if test -z "$format" -then - printf "%d:%d:%d" "$current" "$revision" "$age" - if test -t 1 - then - printf "\n" - fi -else - eval "$format" -fi diff -Nru opari2-2.0.5/vendor/common/build-config/generate-package-version.sh opari2-2.0.6/vendor/common/build-config/generate-package-version.sh --- opari2-2.0.5/vendor/common/build-config/generate-package-version.sh 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/generate-package-version.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,62 +0,0 @@ -#! /bin/sh - -# this script expects an input that contains at least these lines specifying -# the package version, e.g. -# package.major=0 -# package.bugfix=0 -# package.suffix= -# The following line is optional: -# package.minor=9 -# Note that these variable definitions must not be preceeded by whitespace. -# If package.minor is omitted, the output will be -# major.bugfix-suffix -# Otherwise, if bugfix != 0, the script outputs -# major.minor.bugfix-suffix -# If bugfix == 0, teh output will be -# major.minor-suffix -# If suffix is not given, the trailing '-' will be omitted. - -format="${2-}" - -major=0 -# if minor is not set in $1, than its the major.bugfix-suffix version scheme -minor= -bugfix=0 -suffix= - -errormsg= -atexit_error() -{ - if test -n "$errormsg" - then - printf "%s\n" "$errormsg" - fi -} -trap atexit_error EXIT - -errormsg="$(printf "Malformed VERSION file: %s" "$1")" -set -e -eval "$(sed -n -e 's/^package\.// p' "$1")" -errormsg= - -if test -z "$format" -then - suffix="${suffix:+-}${suffix}" - if test -z "$minor" - then # major.bugfix scheme, use $bugfix, even if 0 - printf "%d.%d%s" "$major" "$bugfix" "$suffix" - else # major.minor.bugfix scheme, use $bugfix if different from 0 only - if test "$bugfix" -eq 0 - then - printf "%d.%d%s" "$major" "$minor" "$suffix" - else - printf "%d.%d.%d%s" "$major" "$minor" "$bugfix" "$suffix" - fi - fi - if test -t 1 - then - printf "\n" - fi -else - eval "$format" -fi diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_common_package.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_common_package.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_common_package.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_common_package.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2012, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2012, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2014, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2012, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2012, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2012, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2012, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file ac_common_package.m4 - -# AFS_PACKAGE_INIT -# ---------------- -# Common AC_DEFINE's and AC_SUBST's for the package based on its name. -# Call this only in the top-level configure.ac, sub-builds should call -# `AFS_PACKAGE_BUILD_INIT`. -# -# List of defined autoconf macros: -# `AFS_PACKAGE_name`:: The tarname of the package in lower case -# `AFS_PACKAGE_NAME`:: The tarname of the package in upper case -# `AFS_PACKAGE_TO_TOP`:: The relative path to the top-level configure -# including a trailing slash (empty for the -# top-level configure itself) -# List of provided automake substitutions: -# `AFS_PACKAGE_name`:: The value of AFS_PACKAGE_name -# `AFS_PACKAGE_NAME`:: The value of AFS_PACKAGE_NAME -# -AC_DEFUN_ONCE([AFS_PACKAGE_INIT], [ - -m4_case([$#], - [0], [], - [1], [m4_ifnblank($1, [m4_fatal([$0: too many arguments: $@])])], - [m4_fatal([$0: too many arguments: $@])])dnl - -m4_pushdef([_afs_package_tmp], m4_tolower(AC_PACKAGE_TARNAME))dnl -AC_SUBST([AFS_PACKAGE_name], _afs_package_tmp) -m4_define([AFS_PACKAGE_name], _afs_package_tmp)dnl -m4_popdef([_afs_package_tmp])dnl - -m4_pushdef([_afs_package_tmp], m4_toupper(AC_PACKAGE_TARNAME))dnl -AC_SUBST([AFS_PACKAGE_NAME], _afs_package_tmp) -m4_define([AFS_PACKAGE_NAME], _afs_package_tmp)dnl -m4_popdef([_afs_package_tmp])dnl - -dnl May be redefined by AFS_PACKAGE_BUILD_INIT -m4_define([AFS_PACKAGE_TO_TOP], [])dnl -]) - -# AFS_PACKAGE_BUILD_INIT(BUILD-NAME, [TO-TOP]) -# -------------------------------------------- -# Initializes an sub-build configure. It is sufficient to call -# `AFS_PACKAGE_BUILD_INIT`, `AFS_PACKAGE_INIT` will be called automatically. -# -# The relative path to the top-level configure to this configure -# can be specified with TO-TOP, defaulting to `../`. -# -# List of defined autoconf macros: -# `AFS_PACKAGE_BUILD`:: The normalized name of the build (e.g., 'backend', -# 'MPI backend') -# `AFS_PACKAGE_BUILD_name`:: The build name usable as a symbol in lower case -# (e.g., backend, mpi_backend) -# `AFS_PACKAGE_BUILD_NAME`:: The build name usable as a symbol in upper case -# (e.g., BACKEND, MPI_BACKEND) -# List of provided automake substitutions: -# 'AFS_PACKAGE_BUILD_name' The value of AFS_PACKAGE_BUILD_name -# 'AFS_PACKAGE_BUILD_NAME' The value of AFS_PACKAGE_BUILD_NAME -# `AFS_PACKAGE_TO_TOP`:: The value of AFS_PACKAGE_TO_TOP -# 'afs_srcdir' The relative path to the source directory (i.e., -# where the top-level configure resides) -# List of provided config header defines: -# `AFS_PACKAGE_BUILD`:: The value of AFS_PACKAGE_BUILD as a string -# constant -# `AFS_PACKAGE_BUILD_name`:: The value of AFS_PACKAGE_BUILD_name -# `AFS_PACKAGE_BUILD_NAME`:: The value of AFS_PACKAGE_BUILD_NAME -# `AFS_PACKAGE_SRCDIR`:: The relative path to the source directory as -# string constant including a trailing slash -# `AFS_PACKAGE_name`:: The value of AFS_PACKAGE_name -# `AFS_PACKAGE_NAME`:: The value of AFS_PACKAGE_NAME -# -AC_DEFUN_ONCE([AFS_PACKAGE_BUILD_INIT], [ -AC_REQUIRE([AFS_PACKAGE_INIT])dnl - -m4_case([$#], - [0], [m4_fatal([$0: missing arguments])], - [1], [m4_ifblank(m4_normalize($1), [m4_fatal([$0: empty BUILD-NAME argument])])], - [2], [m4_ifblank(m4_normalize($1), [m4_fatal([$0: empty BUILD-NAME argument])])], - [m4_fatal([$0: too many arguments: $@])])dnl - -m4_pushdef([_afs_package_tmp], m4_normalize($1))dnl -AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD], "_afs_package_tmp", - [Name of the sub-build.]) -m4_define([AFS_PACKAGE_BUILD], _afs_package_tmp)dnl -m4_popdef([_afs_package_tmp])dnl - -dnl Overwrites AFS_PACKAGE_TO_TOP defined in AFS_PACKAGE_INIT. -m4_pushdef([_afs_package_tmp], m4_default([$2], [../]))dnl -dnl undefine previously defined by AFS_PACKAGE_INIT -m4_undefine([AFS_PACKAGE_TO_TOP]) -AC_SUBST([AFS_PACKAGE_TO_TOP], _afs_package_tmp) -m4_define([AFS_PACKAGE_TO_TOP], _afs_package_tmp)dnl -m4_if(m4_substr(AFS_PACKAGE_TO_TOP, decr(len(AFS_PACKAGE_TO_TOP))), [/], - [], [m4_fatal([$0: no trailing slash in TO-TOP argument: ]AFS_PACKAGE_TO_TOP)]) -m4_popdef([_afs_package_tmp])dnl - -# when building inplace, $srcdir equals ., ignore $srcdir than -AS_CASE([$srcdir], - [.], [afs_srcdir="]AFS_PACKAGE_TO_TOP["], - [afs_srcdir="${srcdir}/]AFS_PACKAGE_TO_TOP["])dnl -AC_DEFINE_UNQUOTED([[AFS_PACKAGE_SRCDIR]], - ["${afs_srcdir}"], [Relative path to the top-level source directory.]) -AC_SUBST([afs_srcdir]) - -m4_pushdef([_afs_package_tmp], - m4_bpatsubst(m4_tolower(m4_normalize($1)), [[^a-z0-9]+], [_]))dnl -AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD_name], _afs_package_tmp, - [Symbol name of the sub-build in lower case.]) -AC_SUBST([AFS_PACKAGE_BUILD_name], _afs_package_tmp) -m4_define([AFS_PACKAGE_BUILD_name], _afs_package_tmp)dnl -m4_popdef([_afs_package_tmp])dnl - -m4_pushdef([_afs_package_tmp], - m4_toupper(AFS_PACKAGE_BUILD_name))dnl -AC_DEFINE_UNQUOTED([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp, - [Symbol name of the sub-build in upper case.]) -AC_SUBST([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp) -m4_define([AFS_PACKAGE_BUILD_NAME], _afs_package_tmp)dnl -m4_popdef([_afs_package_tmp])dnl - -AC_DEFINE_UNQUOTED([[AFS_PACKAGE_name]], AFS_PACKAGE_name, - [The package name usable as a symbol in lower case.]) - -AC_DEFINE_UNQUOTED([[AFS_PACKAGE_NAME]], AFS_PACKAGE_NAME, - [The package name usable as a symbol in upper case.]) -]) - -# AC_SCOREP_DEFINE_HAVE(VARIABLE, VALUE[, DESCRIPTION]) -# ------------------------------------------------------ -# Like AC_DEFINE, but prepends the HAVE_ prefix and also defines the -# HAVE_'PACKAGE_BUILD'_ variant, if in a sub configure by utilizing the -# AFS_PACKAGE_BUILD_NAME macro. -# -AC_DEFUN([AC_SCOREP_DEFINE_HAVE], [ -AC_DEFINE([HAVE_]$1, [$2], [$3]) -m4_ifdef([AFS_PACKAGE_BUILD], [ - AC_DEFINE([HAVE_]AFS_PACKAGE_BUILD_NAME[_]$1, [$2], [$3]) -]) -]) - -# AC_SCOREP_COND_HAVE(VARIABLE, CONDITION[, DESCRIPTION[, COND_TRUE[, COND_FALSE]]]) -# -------------------------------------------------- -# Convenience macro to define a AM_CONDITIONAL and always a -# AC_SCOREP_DEFINE_HAVE at once. VARIABLE will be prefixed with HAVE_ -# -AC_DEFUN([AC_SCOREP_COND_HAVE], [ -AM_CONDITIONAL(HAVE_[]$1, [$2]) -AM_COND_IF(HAVE_[]$1, - [AC_SCOREP_DEFINE_HAVE([$1], [1], [$3]) - $4], - [AC_SCOREP_DEFINE_HAVE([$1], [0], [$3]) - $5]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_recursive_eval.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_recursive_eval.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_recursive_eval.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_recursive_eval.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -dnl copied from http://ac-archive.sourceforge.net/adl/relpaths.m4 -dnl @category Misc -dnl @author Alexandre Duret-Lutz -dnl @version 2001-05-25 -dnl @license GPLWithACException - -dnl adl_RECURSIVE_EVAL(VALUE, RESULT) -dnl ================================= -dnl Interpolate the VALUE in loop until it doesn't change, -dnl and set the result to $RESULT. -dnl WARNING: It's easy to get an infinite loop with some unsane input. -AC_DEFUN([adl_RECURSIVE_EVAL], -[_lcl_receval="$1" -$2=`(test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix="${prefix}" - _lcl_receval_old='' - while test "[$]_lcl_receval_old" != "[$]_lcl_receval"; do - _lcl_receval_old="[$]_lcl_receval" - eval _lcl_receval="\"[$]_lcl_receval\"" - done - echo "[$]_lcl_receval")`]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_c99.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_c99.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_c99.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_c99.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,248 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2011, 2014, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - - -## file ac_scorep_c99.m4 -## This file contains a modified versions of the following -## autoconf's 2.69 macros: -## -## AC_PROG_CC_C99 (renamed to AC_SCOREP_PROG_CC_C99): -## In SCOREP we don't want to use the GNU option -std=gnu99 -## (but -std=c99 instead) as this prevents some warnings that -## may cause portability issues. -## -## Please find the autoconf licence below. -## -## - - -# This file is part of Autoconf. -*- Autoconf -*- -# Programming languages support. -# Copyright (C) 2001-2012 Free Software Foundation, Inc. - -# This file is part of Autoconf. This program is free -# software; you can redistribute it and/or modify it under the -# terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# Under Section 7 of GPL version 3, you are granted additional -# permissions described in the Autoconf Configure Script Exception, -# version 3.0, as published by the Free Software Foundation. -# -# You should have received a copy of the GNU General Public License -# and a copy of the Autoconf Configure Script Exception along with -# this program; see the files COPYINGv3 and COPYING.EXCEPTION -# respectively. If not, see . - -# Written by David MacKenzie, with help from -# Akim Demaille, Paul Eggert, -# Franc,ois Pinard, Karl Berry, Richard Pixley, Ian Lance Taylor, -# Roland McGrath, Noah Friedman, david d zuhn, and many others. - - -# AC_SCOREP_PROG_CC_C99 -# -------------- -AC_DEFUN([AC_SCOREP_PROG_CC_C99], -[ AC_REQUIRE([AC_PROG_CC])dnl - _AC_SCOREP_PROG_CC_C99([$1], [$2]) -]) - - -# _AC_SCOREP_PROG_CC_C99 ([ACTION-IF-AVAILABLE], [ACTION-IF-UNAVAILABLE]) -# ---------------------------------------------------------------- -# If the C compiler is not in ISO C99 mode by default, try to add an -# option to output variable CC to make it so. This macro tries -# various options that select ISO C99 on some system or another. It -# considers the compiler to be in ISO C99 mode if it handles _Bool, -# // comments, flexible array members, inline, long long int, mixed -# code and declarations, named initialization of structs, restrict, -# va_copy, varargs macros, variable declarations in for loops and -# variable length arrays. -AC_DEFUN([_AC_SCOREP_PROG_CC_C99], -[_AC_C_STD_TRY([c99], -[[#include -#include -#include -#include -#include - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} -]], -[[ - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); -]], -dnl Try -dnl GCC -std=gnu99 (unused restrictive modes: -std=c99 -std=iso9899:1999) -dnl AIX -qlanglvl=extc99 (unused restrictive mode: -qlanglvl=stdc99) -dnl HP cc -AC99 -dnl Intel ICC -std=c99, -c99 (deprecated) -dnl IRIX -c99 -dnl Solaris -D_STDC_C99= -dnl cc's -xc99 option uses linker magic to define the external -dnl symbol __xpg4 as if by "int __xpg4 = 1;", which enables C99 -dnl behavior for C library functions. This is not wanted here, -dnl because it means that a single module compiled with -xc99 -dnl alters C runtime behavior for the entire program, not for -dnl just the module. Instead, define the (private) symbol -dnl _STDC_C99, which suppresses a bogus failure in . -dnl The resulting compiler passes the test case here, and that's -dnl good enough. For more, please see the thread starting at: -dnl http://lists.gnu.org/archive/html/autoconf/2010-12/msg00059.html -dnl Tru64 -c99 -dnl NEC SX -Kc99 -dnl with extended modes being tried first. -[[-std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -Kc99]], [$1], [$2])[]dnl -])# _AC_SCOREP_PROG_CC_C99 diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_compiler_and_flags.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,313 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2011, 2014, 2019, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2014, 2017, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file ac_scorep_compiler_and_flags.m4 - - -AC_DEFUN([AC_SCOREP_CONVERT_FOR_BUILD_FLAGS], -[ -if test "x${ac_cv_env_[$1]_FOR_BUILD_set}" != "xset"; then - # don't use the default flags if nothing is specified for the frontend - unset [$1] -else - # use the FOR_BUILD flags - [$1]="$ac_cv_env_[$1]_FOR_BUILD_value" -fi -]) - -AC_DEFUN([AC_SCOREP_CONVERT_MPI_FLAGS], -[ -if test "x${ac_cv_env_MPI_[$1]_set}" != "xset"; then - # don't use the default flags if nothing is specified for MPI - unset [$1] -else - # use the MPI flags - [$1]="$ac_cv_env_MPI_[$1]_value" -fi -]) - -AC_DEFUN([AC_SCOREP_CHECK_COMPILER_VAR_SET], -[ -if test "x${ac_cv_env_[$1]_set}" != "xset"; then - AC_MSG_ERROR([argument $1 not provided in configure call.], [1]) -fi -]) - - -AC_DEFUN([AC_SCOREP_CONVERT_FOR_BUILD_COMPILER], -[ -if test "x${ac_cv_env_[$1]_FOR_BUILD_set}" != "xset"; then - # don't use the default compiler if nothing is specified for the frontend - unset [$1] -else - [$1]="$ac_cv_env_[$1]_FOR_BUILD_value" -fi -]) - -AC_DEFUN([AC_SCOREP_CONVERT_MPI_COMPILER], -[ -if test "x${ac_cv_env_MPI[$1]_set}" != "xset"; then - # don't use the default compiler if nothing is specified for MPI - unset [$1] -else - [$1]="$ac_cv_env_MPI[$1]_value" -fi -]) - - -dnl do not use together with AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE -AC_DEFUN([AC_SCOREP_WITH_COMPILER_SUITE], -[ -AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) - -ac_scorep_compilers_frontend="platform-frontend-${ac_scorep_platform}" -ac_scorep_compilers_backend="platform-backend-${ac_scorep_platform}" -# ac_scorep_compilers_mpi set in AC_SCOREP_WITH_MPI_COMPILER_SUITE - -m4_pattern_allow([AC_SCOREP_WITH_COMPILER_SUITE]) -m4_pattern_allow([AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE]) -AS_IF([test "x${ac_scorep_compiler_suite_called}" != "x"], - [AC_MSG_ERROR([cannot use [AC_SCOREP_WITH_COMPILER_SUITE] and [AC_SCOREP_WITH_NOCROSS_COMPILER_SUITE] in one configure.ac.])], - [ac_scorep_compiler_suite_called="yes"]) - -AC_ARG_WITH([nocross-compiler-suite], - [AS_HELP_STRING([--with-nocross-compiler-suite=(gcc|ibm|intel|pgi|studio|clang)], - [The compiler suite used to build this package in non cross-compiling environments. Needs to be in $PATH [gcc].])], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno"], - [ac_scorep_compilers_backend="compiler-nocross-gcc" # default - AS_CASE([$withval], - ["gcc"], [ac_scorep_compilers_backend="compiler-nocross-gcc"], - ["ibm"], [ac_scorep_compilers_backend="compiler-nocross-ibm"], - ["intel"], [ac_scorep_compilers_backend="compiler-nocross-intel"], - ["pgi"], [ac_scorep_compilers_backend="compiler-nocross-pgi"], - ["studio"], [ac_scorep_compilers_backend="compiler-nocross-studio"], - ["clang"], [ac_scorep_compilers_backend="compiler-nocross-clang"], - ["no"], [AC_MSG_ERROR([option --without-nocross-compiler-suite makes no sense.])], - [AC_MSG_ERROR([compiler suite "${withval}" not supported by --with-nocross-compiler-suite.])])], - [AC_MSG_WARN([option --with-nocross-compiler-suite ignored in cross-compiling mode. You may use --with-frontend-compiler-suite to customize the frontend compiler.])])]) -AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_backend}"], - [ac_scorep_compilers_backend="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_backend}"], - [ac_scorep_compilers_backend="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_backend}"]) - - -AC_ARG_WITH([frontend-compiler-suite], - [AS_HELP_STRING([--with-frontend-compiler-suite=(gcc|ibm|intel|pgi|studio|clang)], - [The compiler suite used to build the frontend parts of this package in cross-compiling environments. Needs to be in $PATH [gcc].])], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes"], - [ac_scorep_compilers_frontend="compiler-frontend-gcc" - AS_CASE([$withval], - ["gcc"], [ac_scorep_compilers_frontend="compiler-frontend-gcc"], - ["ibm"], [ac_scorep_compilers_frontend="compiler-frontend-ibm"], - ["intel"], [ac_scorep_compilers_frontend="compiler-frontend-intel"], - ["pgi"], [ac_scorep_compilers_frontend="compiler-frontend-pgi"], - ["studio"], [ac_scorep_compilers_frontend="compiler-frontend-studio"], - ["clang"], [ac_scorep_compilers_frontend="compiler-frontend-clang"], - ["no"], [AC_MSG_ERROR([option --without-frontend-compiler-suite makes no sense.])], - [AC_MSG_ERROR([compiler suite "${withval}" not supported by --with-frontend-compiler-suite.])])], - [AC_MSG_ERROR([Option --with-frontend-compiler-suite not supported in non cross-compiling mode. Please use --with-nocross-compiler-suite instead.])])]) -AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_frontend}"], - [ac_scorep_compilers_frontend="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_frontend}"], - [ac_scorep_compilers_frontend="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_frontend}"]) -])# AC_SCOREP_WITH_COMPILER_SUITE - - -AC_DEFUN([AC_SCOREP_WITH_MPI_COMPILER_SUITE], -[ -AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) - -scorep_mpi_user_disabled="no" -AC_ARG_WITH([mpi], - [AS_HELP_STRING([--with-mpi=(bullxmpi|hp|ibmpoe|intel|intel2|intel3|intelpoe|lam|mpibull2|mpich|mpich2|mpich3|openmpi|openmpi3|platform|scali|sgimpt|sgimptwrapper|spectrum|sun)], - [The MPI compiler suite to build this package in non cross-compiling mode. Usually autodetected. Needs to be in $PATH.])], - [AS_IF([test "x${withval}" = xno], - [scorep_mpi_user_disabled=yes - ac_scorep_compilers_mpi="compiler-mpi-without" - ], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], - [AS_CASE([$withval], - ["bullxmpi"], [ac_scorep_compilers_mpi="compiler-mpi-bullxmpi"], - ["hp"], [ac_scorep_compilers_mpi="compiler-mpi-hp"], - ["ibmpoe"], [ac_scorep_compilers_mpi="compiler-mpi-ibmpoe"], - ["intel"], [ac_scorep_compilers_mpi="compiler-mpi-intel"], - ["intel2"], [ac_scorep_compilers_mpi="compiler-mpi-intel2"], - ["intel3"], [ac_scorep_compilers_mpi="compiler-mpi-intel3"], - ["impi"], [AC_MSG_WARN([option 'impi' to --with-mpi deprecated, use 'intel2' instead.]) - ac_scorep_compilers_mpi="compiler-mpi-intel2"], - ["intelpoe"], [ac_scorep_compilers_mpi="compiler-mpi-intelpoe"], - ["lam"], [ac_scorep_compilers_mpi="compiler-mpi-lam"], - ["mpibull2"], [ac_scorep_compilers_mpi="compiler-mpi-mpibull2"], - ["mpich"], [ac_scorep_compilers_mpi="compiler-mpi-mpich"], - ["mpich2"], [ac_scorep_compilers_mpi="compiler-mpi-mpich2"], - ["mpich3"], [ac_scorep_compilers_mpi="compiler-mpi-mpich3"], - ["openmpi"], [ac_scorep_compilers_mpi="compiler-mpi-openmpi"], - ["openmpi3"], [ac_scorep_compilers_mpi="compiler-mpi-openmpi3"], - ["platform"], [ac_scorep_compilers_mpi="compiler-mpi-platform"], - ["scali"], [ac_scorep_compilers_mpi="compiler-mpi-scali"], - ["sgimpt"], [ac_scorep_compilers_mpi="compiler-mpi-sgimpt"], - ["sgimptwrapper"], [ac_scorep_compilers_mpi="compiler-mpi-sgimptwrapper"], - ["spectrum"], [ac_scorep_compilers_mpi="compiler-mpi-spectrum"], - ["sun"], [ac_scorep_compilers_mpi="compiler-mpi-sun"], - [AC_MSG_ERROR([MPI compiler suite "${withval}" not supported by --with-mpi.])]) - ]) - ]) - # omit check "if in PATH" for now. Will fail in build-mpi configure. - ], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], - [AFS_COMPILER_MPI - ac_scorep_compilers_mpi="compiler-mpi-${afs_compiler_mpi}"]) - ]) - -AS_IF([test "x${scorep_mpi_user_disabled}" = xno], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes" || test "x${ac_scorep_platform}" = "xaix"], - [ac_scorep_compilers_mpi="platform-mpi-${ac_scorep_platform}"])]) - -AS_IF([test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_mpi}"], - [ac_scorep_compilers_mpi="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_mpi}"], - [ac_scorep_compilers_mpi="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_mpi}"]) -# sanity checks missing -])# AC_SCOREP_WITH_MPI_COMPILER_SUITE - - -AC_DEFUN([AC_SCOREP_PRECIOUS_VARS_MPI], -[ -AC_ARG_VAR(MPICC,[MPI C compiler command]) -AC_ARG_VAR(MPICXX,[MPI C++ compiler command]) -AC_ARG_VAR(MPIF77,[MPI Fortran 77 compiler command]) -AC_ARG_VAR(MPIFC,[MPI Fortran compiler command]) -AC_ARG_VAR(MPI_CPPFLAGS, [MPI (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) -AC_ARG_VAR(MPI_CFLAGS, [MPI C compiler flags]) -AC_ARG_VAR(MPI_CXXFLAGS, [MPI C++ compiler flags]) -AC_ARG_VAR(MPI_FFLAGS, [MPI Fortran 77 compiler flags]) -AC_ARG_VAR(MPI_FCFLAGS, [MPI Fortran compiler flags]) -AC_ARG_VAR(MPI_LDFLAGS, [MPI linker flags, e.g. -L if you have libraries in a nonstandard directory ]) -AC_ARG_VAR(MPI_LIBS, [MPI libraries to pass to the linker, e.g. -l]) -]) - -AC_DEFUN([AC_SCOREP_PRECIOUS_VARS_FOR_BUILD], -[ -AC_ARG_VAR(CC_FOR_BUILD, [C compiler command for the frontend build]) -AC_ARG_VAR(CXX_FOR_BUILD, [C++ compiler command for the frontend build]) -AC_ARG_VAR(F77_FOR_BUILD, [Fortran 77 compiler command for the frontend build]) -AC_ARG_VAR(FC_FOR_BUILD, [Fortran compiler command for the frontend build]) -AC_ARG_VAR(CPPFLAGS_FOR_BUILD, [(Objective) C/C++ preprocessor flags for the frontend build, e.g. -I if you have headers in a nonstandard directory ]) -AC_ARG_VAR(CFLAGS_FOR_BUILD, [C compiler flags for the frontend build]) -AC_ARG_VAR(CXXFLAGS_FOR_BUILD, [C++ compiler flags for the frontend build]) -AC_ARG_VAR(FFLAGS_FOR_BUILD, [Fortran 77 compiler flags for the frontend build]) -AC_ARG_VAR(FCFLAGS_FOR_BUILD, [Fortran compiler flags for the frontend build]) -AC_ARG_VAR(LDFLAGS_FOR_BUILD, [linker flags for the frontend build, e.g. -L if you have libraries in a nonstandard directory ]) -AC_ARG_VAR(LIBS_FOR_BUILD, [libraries to pass to the linker for the frontend build, e.g. -l]) -]) - - -dnl -------------------------------------------------------------------- - - -AC_DEFUN([AFS_WITH_SHMEM_COMPILER_SUITE], -[ -AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) - -scorep_shmem_user_disabled="no" -AC_ARG_WITH([shmem], - [AS_HELP_STRING([--with-shmem=(openshmem|openmpi|openmpi3|sgimpt|sgimptwrapper|spectrum)], - [The SHMEM compiler suite to build this package in non cross-compiling mode. Usually autodetected. Needs to be in $PATH.])], - [AS_IF([test "x${withval}" = xno], - [scorep_shmem_user_disabled=yes - ac_scorep_compilers_shmem="compiler-shmem-without" - ], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], - [AS_CASE([$withval], - ["openshmem"], [ac_scorep_compilers_shmem="compiler-shmem-openshmem"], - ["openmpi"], [ac_scorep_compilers_shmem="compiler-shmem-openmpi"], - ["openmpi3"], [ac_scorep_compilers_shmem="compiler-shmem-openmpi3"], - ["sgimpt"], [ac_scorep_compilers_shmem="compiler-shmem-sgimpt"], - ["sgimptwrapper"], [ac_scorep_compilers_shmem="compiler-shmem-sgimptwrapper"], - ["spectrum"], [ac_scorep_compilers_shmem="compiler-shmem-spectrum"], - [AC_MSG_ERROR([SHMEM compiler suite "${withval}" not supported by --with-shmem.])]) - ]) - ]) - # omit check "if in PATH" for now. - ], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xno" && test "x${ac_scorep_platform}" != "xaix"], - [AFS_COMPILER_SHMEM - ac_scorep_compilers_shmem="compiler-shmem-${afs_compiler_shmem}"]) - ]) - -AS_IF([test "x${scorep_shmem_user_disabled}" = xno], - [AS_IF([test "x${ac_scorep_cross_compiling}" = "xyes"], - [AS_CASE([${ac_scorep_platform}], - [cray*], - [ac_scorep_compilers_shmem="platform-shmem-${ac_scorep_platform}"], - [ac_scorep_compilers_shmem=""])])]) - -AS_IF([test "x${ac_scorep_compilers_shmem}" != "x" && test -f "AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_shmem}"], - [ac_scorep_compilers_shmem="AFS_COMPILER_FILES_PACKAGE/${ac_scorep_compilers_shmem}"], - [ac_scorep_compilers_shmem="AFS_COMPILER_FILES_COMMON/${ac_scorep_compilers_shmem}"]) -# sanity checks missing -])# AFS_WITH_SHMEM_COMPILER_SUITE - - -AC_DEFUN([AFS_PRECIOUS_VARS_SHMEM], -[ -AC_ARG_VAR(SHMEMCC,[SHMEM C compiler command]) -AC_ARG_VAR(SHMEMCXX,[SHMEM C++ compiler command]) -AC_ARG_VAR(SHMEMF77,[SHMEM Fortran 77 compiler command]) -AC_ARG_VAR(SHMEMFC,[SHMEM Fortran compiler command]) -AC_ARG_VAR(SHMEM_CPPFLAGS, [SHMEM (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory ]) -AC_ARG_VAR(SHMEM_CFLAGS, [SHMEM C compiler flags]) -AC_ARG_VAR(SHMEM_CXXFLAGS, [SHMEM C++ compiler flags]) -AC_ARG_VAR(SHMEM_FFLAGS, [SHMEM Fortran 77 compiler flags]) -AC_ARG_VAR(SHMEM_FCFLAGS, [SHMEM Fortran compiler flags]) -AC_ARG_VAR(SHMEM_LDFLAGS, [SHMEM linker flags, e.g. -L if you have libraries in a nonstandard directory ]) -AC_ARG_VAR(SHMEM_LIBS, [SHMEM libraries to pass to the linker, e.g. -l]) -AC_ARG_VAR(SHMEM_LIB_NAME, [name of the SHMEM library]) -AC_ARG_VAR(SHMEM_NAME, [name of the implemented SHMEM specification]) -]) - -AC_DEFUN([AFS_CONVERT_SHMEM_COMPILER], -[ -if test "x${ac_cv_env_SHMEM[$1]_set}" != "xset"; then - # don't use the default compiler if nothing is specified for SHMEM - unset [$1] -else - [$1]="$ac_cv_env_SHMEM[$1]_value" -fi -]) - -AC_DEFUN([AFS_CONVERT_SHMEM_FLAGS], -[ -if test "x${ac_cv_env_SHMEM_[$1]_set}" != "xset"; then - # don't use the default flags if nothing is specified for SHMEM - unset [$1] -else - # use the SHMEM flags - [$1]="$ac_cv_env_SHMEM_[$1]_value" -fi -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_compiler_checks.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_compiler_checks.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_compiler_checks.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_compiler_checks.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2012, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2012, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2012, 2019, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2012, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2013, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2012, 2014 -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2012, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file build-config/m4/ac_scorep_compiler_checks.m4 - -dnl ------------------------------------------------------------------ - -# used for pomp_tpd in scorep and opari2 -AC_DEFUN([AC_SCOREP_ATTRIBUTE_ALIGNMENT],[ -AC_LANG_PUSH([C]) -AC_MSG_CHECKING([for alignment attribute]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], -[[int __attribute__((aligned (16))) tpd;]])], - [ac_scorep_has_alignment_attribute="yes"], - [ac_scorep_has_alignment_attribute="no"] -) - -if test "x${ac_scorep_has_alignment_attribute}" = "xyes"; then - AC_DEFINE([FORTRAN_ALIGNED],[__attribute__((aligned (16)))],[Makes C variable alignment consistent with Fortran]) -else - AC_DEFINE([FORTRAN_ALIGNED],[],[Alignment attribute not supported]) -fi - -AC_MSG_RESULT([$ac_scorep_has_alignment_attribute]) -AC_LANG_POP([C]) -]) - -dnl ------------------------------------------------------------------ - -AC_DEFUN([AC_SCOREP_COMPILER_CHECKS],[ -AC_LANG_PUSH([C]) -AX_COMPILER_VENDOR -AX_COMPILER_VERSION -AC_LANG_POP([C]) - -# Disable default OpenMP support for the Cray compilers -AS_IF([test "x${ax_cv_c_compiler_vendor}" = xcray], - [CC="${CC} -hnoomp -O2" - CXX="${CXX} -hnoomp -O2" - F77="${F77} -hnoomp -O2" - FC="${FC} -hnoomp -O2"])dnl - -AS_CASE([${ax_cv_c_compiler_vendor%/*}], - [intel], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_INTEL], [test 1 -eq 1], [false])], - [sun], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_SUN], [test 1 -eq 1], [false])], - [ibm], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_IBM], [test 1 -eq 1], [false])], - [portland], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_PGI], [test 1 -eq 1], [false])], - [gnu], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_GNU], [test 1 -eq 1], [false])], - [clang], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_CLANG], [test 1 -eq 1], [false])], - [cray], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_CRAY], [test 1 -eq 1], [false])], - [fujitsu], [AFS_AM_CONDITIONAL([SCOREP_COMPILER_FUJITSU], [test 1 -eq 1], [false])], - [unknown], [AC_MSG_WARN([Could not determine compiler vendor. AC_PACKAGE_NAME might not function properly.])], - [AC_MSG_WARN([Compiler vendor '${ax_cv_c_compiler_vendor}' unsupported. AC_PACKAGE_NAME might not function properly.])])dnl - -afs_compiler_intel=0 -afs_compiler_sun=0 -afs_compiler_ibm=0 -afs_compiler_portland=0 -afs_compiler_gnu=0 -afs_compiler_clang=0 -afs_compiler_cray=0 -afs_compiler_fujitsu=0 -AS_CASE([${ax_cv_c_compiler_vendor%/*}], - [intel], [afs_compiler_intel=1], - [sun], [afs_compiler_sun=1], - [ibm], [afs_compiler_ibm=1], - [portland], [afs_compiler_portland=1], - [gnu], [afs_compiler_gnu=1], - [clang], [afs_compiler_clang=1], - [cray], [afs_compiler_cray=1], - [fujitsu], [afs_compiler_fujitsu=1], - []) -AC_SUBST([SCOREP_COMPILER_INTEL], [${afs_compiler_intel}])dnl -AC_SUBST([SCOREP_COMPILER_SUN], [${afs_compiler_sun}])dnl -AC_SUBST([SCOREP_COMPILER_IBM], [${afs_compiler_ibm}])dnl -AC_SUBST([SCOREP_COMPILER_PGI], [${afs_compiler_portland}])dnl -AC_SUBST([SCOREP_COMPILER_GNU], [${afs_compiler_gnu}])dnl -AC_SUBST([SCOREP_COMPILER_CLANG], [${afs_compiler_clang}])dnl -AC_SUBST([SCOREP_COMPILER_CRAY], [${afs_compiler_cray}])dnl -AC_SUBST([SCOREP_COMPILER_FUJITSU], [${afs_compiler_fujitsu}])dnl - -dnl strip epoch (Borland only) -_scorep_compiler_version=${ax_cv_c_compiler_version##*:} -dnl extract major -afs_compiler_version_major=${_scorep_compiler_version%%.*} -dnl fallback to 0 -: ${afs_compiler_version_major:=0} -_scorep_compiler_version=${_scorep_compiler_version#*.} -dnl extract minor -afs_compiler_version_minor=${_scorep_compiler_version%%.*} -dnl fallback to 0 -: ${afs_compiler_version_minor:=0} -AS_UNSET([_scorep_compiler_version]) -AC_SUBST([SCOREP_COMPILER_VERSION_MAJOR], [${afs_compiler_version_major}])dnl -AC_SUBST([SCOREP_COMPILER_VERSION_MINOR], [${afs_compiler_version_minor}])dnl -])dnl diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_doxygen.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_doxygen.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_doxygen.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_doxygen.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## Technische Universitaet Dresden, Germany -## University of Oregon, Eugene, USA -## Forschungszentrum Juelich GmbH, Germany -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## Technische Universitaet Muenchen, Germany -## -## See the COPYING file in the package base directory for details. -## - - -# AC_SCOREP_DOXYGEN -#---------------- -# Check doxygen related stuff, sets some output variables and the -# AM_CONDITIONALs HAVE_DOXYGEN and HAVE_DOXYGEN_LATEX. -# -AC_DEFUN([AC_SCOREP_DOXYGEN], -[ -#if test -z "$have_svnversion"; then -# AC_CHECK_PROG([have_svnversion], [svnversion], [yes], [no],,) -#fi -AC_PATH_PROG([DOXYGEN], [doxygen]) -AM_CONDITIONAL(HAVE_DOXYGEN, test "x${DOXYGEN}" != "x") - -have_doxygen_latex="no" -AM_COND_IF([HAVE_DOXYGEN],[ - AC_CHECK_PROG([have_dot], [dot], [yes], [no],,) - AC_CHECK_PROG([have_pdflatex], [pdflatex], [yes], [no],,) - AC_CHECK_PROG([have_makeindex], [makeindex], [yes], [no],,) - if test "x${have_pdflatex}" = xyes && test "x${have_makeindex}" = xyes; then - have_doxygen_latex="yes" - fi -]) -AC_SUBST([have_doxygen_latex]) -AM_CONDITIONAL(HAVE_DOXYGEN_LATEX, test "x${have_doxygen_latex}" = xyes) - -# ac_scorep_doxygen_distdir may be passed in from upper level configure -# will end up in 'USER_DOC_DIR = $(top_distdir)$(ac_scorep_doxygen_distdir)/doc' -if test ! -n "$ac_scorep_doxygen_distdir"; then - ac_scorep_doxygen_distdir="" -fi -AC_SUBST([ac_scorep_doxygen_distdir]) - -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_fortran_checks.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_fortran_checks.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_fortran_checks.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_fortran_checks.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## Technische Universitaet Dresden, Germany -## University of Oregon, Eugene, USA -## Forschungszentrum Juelich GmbH, Germany -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## Technische Universitaet Muenchen, Germany -## -## See the COPYING file in the package base directory for details. -## - - -## file ac_scorep_fortran_checks.m4 - -AC_DEFUN([AC_SCOREP_FORTRAN_SUPPORT_ALLOCATABLE],[ -AC_LANG_PUSH(Fortran) -AC_MSG_CHECKING([whether double precision, allocatable arrays are supported]) -AC_COMPILE_IFELSE([ - PROGRAM test - TYPE mydata - double precision, allocatable :: afF(:,:) - END TYPE mydata - END PROGRAM test -], [scorep_support_allocatable="yes"], [scorep_support_allocatable="no"] -) #AC_COMPILE_IFELSE -AC_LANG_POP(Fortran) -AC_MSG_RESULT($scorep_support_allocatable) -AM_CONDITIONAL(FORTRAN_SUPPORT_ALLOCATABLE, test "x$scorep_support_allocatable" = "xyes") -]) #AC_DEFUN diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_svn_controlled.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2011, 2015, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -AC_DEFUN([AC_SCOREP_SVN_CONTROLLED], -[ -ac_scorep_svn_controlled="no" -svn info ${srcdir} > /dev/null 2>&1 -AS_IF([test $? -eq 0], - [ac_scorep_svn_controlled="yes" - AC_DEFINE([SCOREP_IN_DEVELOPEMENT], [], [Defined if we are working from svn.])], - [AC_DEFINE([SCOREP_IN_PRODUCTION], [], [Defined if we are working from a make dist generated tarball.])]) -AM_CONDITIONAL([SVN_CONTROLLED], [test "x${ac_scorep_svn_controlled}" = xyes]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_sys_detection.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,266 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2013, 2019, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2017, 2019, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file ac_scorep_sys_detection.m4 - -# The purpose of platform detection is to provide reasonable default -# compilers, MPI implementations, etc. The user always has the -# possibility to override the defaults by setting environment -# variables, see section "Some influential environment variables" in -# configure --help. On some systems there may be no reasonable -# defaults for the MPI implementation, so specify them using -# --with-mpi=... Also, on some systems there are different -# compiler-suites available which can be choosen via -# --with-compiler=(gcc|intel|sun|ibm|...) - - -# intended to be called by toplevel configure -AC_DEFUN_ONCE([AC_SCOREP_DETECT_PLATFORMS], [ -AC_REQUIRE([AC_CANONICAL_BUILD])dnl - -# Notes about platform detection on Cray systems: -# First, we check for x86-64 CPU type and an existing /opt/cray/pmi/default link. -# This test should succeed for all supported Cray systems (Cray XT, XE, XK, XC). -# In the second step we will classify the systems depending on their network. -# Therefore, we use the link /opt/cray/pmi/default. We determine the link target -# and select the network. For example, /opt/cray/pmi/default points to -# /opt/cray/pmi/4.0.1-1.0000.9421.73.3.gem. 'gem' signifies the Gemini network. -# As a result we can classify the following systems: -# ss (SeaStar) Cray XT -# gem (Gemini) Cray XE, XK -# ari (Aries) Cray XC -# To distinguish Cray XE and XK systems we determine whether the system uses GPU -# accelerators (Cray XK) or not (Cray XE). -# -# Newer software stacks do not encode the network name in their files, e.g., -# /opt/cray/pmi/5.0.11 -# Therefore, we need a fall-back solution. We will test for several directories -# including the network name. -# -# Even newer software stacks on Cray XC systems (Cori, Piz Daint) -# don't provide the /opt/cray/pmi/default link but instead -# /opt/cray/pe/pmi/default. They still provide the network via -# /opt/cray/ari/modulefiles. -# -AC_MSG_CHECKING([for platform]) -AC_ARG_ENABLE([platform-mic], - [AS_HELP_STRING([--enable-platform-mic], - [Force build for Intel Xeon Phi co-processors [no]. - This option is only needed for Xeon Phi - co-processors, like the Knights Corner (KNC). It - is not needed for self-hosted Xeon Phis, like the - Knights Landing (KNL); for these chips no special - treatment is required.])], - - [AS_CASE([${enableval}], - [yes], - [ac_scorep_platform=mic], - [no], - [], - [AC_MSG_ERROR([value '$enableval' unsupported for '--enable-platform-mic'])]) - ]) - -AS_IF([test "x${ac_scorep_platform}" = "x"], - [AS_CASE([${build_os}], - [linux*], - [AS_IF([test "x${build_cpu}" = "xia64" && test -f /etc/sgi-release], - [ac_scorep_platform="altix"], - [test "x${build_cpu}" = "xpowerpc64" && test -d /bgl/BlueLight], - [ac_scorep_platform="bgl"], - [test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys/drivers/ppcfloor/hwi], - [ac_scorep_platform="bgq"], - [test "x${build_cpu}" = "xpowerpc64" && test -d /bgsys], - [ac_scorep_platform="bgp"], - [(test "x${build_cpu}" = "xx86_64" || test "x${build_cpu}" = "xaarch64") && test -d /opt/cray], - [AS_IF([test -L /opt/cray/pmi/default], - [AS_IF([test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ss && echo TRUE`" = "xTRUE"], - [ac_scorep_platform="crayxt"], - [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q gem && echo TRUE`" = "xTRUE" && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x1"], - [ac_scorep_platform="crayxe"], - [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q gem && echo TRUE`" = "xTRUE" && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x0"], - [ac_scorep_platform="crayxk"], - [test "x`readlink -f /opt/cray/pmi/default | grep -o --regexp=[[a-z]]*$ | grep -q ari && echo TRUE`" = "xTRUE"], - [ac_scorep_platform="crayxc"], - [test -d /opt/cray/ari/modulefiles], - [ac_scorep_platform="crayxc"], - [test -d /opt/cray/gem/modulefiles && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x0"], - [ac_scorep_platform="crayxk"], - [test -d /opt/cray/gem/modulefiles && test "x`apstat -G | grep \"(none)\" | wc -l`" = "x1"], - [ac_scorep_platform="crayxe"])], - [test -L /opt/cray/pe/pmi/default], - [AS_IF([test -d /opt/cray/ari/modulefiles], - [ac_scorep_platform="crayxc"])]) - AS_IF([test "x${ac_scorep_platform}" = "x"], - [AC_MSG_ERROR([Unknown Cray platform.])])], - [test "x${build_cpu}" = "xarmv7l" || test "x${build_cpu}" = "xarmv7hl" || test "x${build_cpu}" = "xaarch64" ], - [ac_scorep_platform="arm"], - [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVtclang], - [ac_scorep_platform="k"], - [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVfxlang], - [ac_scorep_platform="fx10"], - [test "x${build_cpu}" = "xx86_64" && test -d /opt/FJSVmxlang], - [ac_scorep_platform="fx100"], - [ac_scorep_platform=linux])], - [sunos* | solaris*], - [ac_scorep_platform="solaris"], - [darwin*], - [ac_scorep_platform="mac"], - [aix*], - [ac_scorep_platform="aix"], - [superux*], - [ac_scorep_platform="necsx"], - [mingw*], - [ac_scorep_platform="mingw"], - [ac_scorep_platform="unknown"]) - - AS_IF([test "x${ac_scorep_platform}" = "xunknown"], - [AC_MSG_RESULT([$ac_scorep_platform, please contact if you encounter any problems.])], - [AC_MSG_RESULT([$ac_scorep_platform (auto detected)]) - AFS_SUMMARY([Platform], [$ac_scorep_platform (auto detected)])]) - ], - [AC_MSG_RESULT([$ac_scorep_platform (provided)]) - AFS_SUMMARY([Platform], [$ac_scorep_platform (provided)])]) -])# AC_SCOREP_DETECT_PLATFORMS - - -# intended to be called by toplevel configure -AC_DEFUN_ONCE([AFS_CROSSCOMPILING], -[ -AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS])dnl - -AS_IF([test "x${ac_scorep_cross_compiling}" = "x"], - [AS_CASE([${ac_scorep_platform}], - [altix], [ac_scorep_cross_compiling="no"], - [bgl], [ac_scorep_cross_compiling="yes"], - [bgp], [ac_scorep_cross_compiling="yes"], - [bgq], [ac_scorep_cross_compiling="yes"], - [crayxt], [ac_scorep_cross_compiling="yes"], - [crayxe], [ac_scorep_cross_compiling="yes"], - [crayxk], [ac_scorep_cross_compiling="yes"], - [crayxc], [ac_scorep_cross_compiling="yes"], - [arm], [ac_scorep_cross_compiling="no"], - [k], [ac_scorep_cross_compiling="yes"], - [fx10], [ac_scorep_cross_compiling="yes"], - [fx100], [ac_scorep_cross_compiling="yes"], - [linux], [ac_scorep_cross_compiling="no"], - [solaris], [ac_scorep_cross_compiling="no"], - [mac], [ac_scorep_cross_compiling="no"], - [mic], [ac_scorep_cross_compiling="yes"], - [mingw], [ac_scorep_cross_compiling="no"], - [aix], [ac_scorep_cross_compiling="no"], - [necsx], [ac_scorep_cross_compiling="yes"], - [unknown], [ac_scorep_cross_compiling="no"], - [AC_MSG_ERROR([provided platform '${ac_scorep_platform}' unknown.])]) - AFS_SUMMARY([Cross compiling], [$ac_scorep_cross_compiling (auto detected)]) - ], - [# honor ac_scorep_cross_compiling from the commandline - AS_IF([test ${ac_scorep_cross_compiling} != "yes" && \ - test ${ac_scorep_cross_compiling} != "no" ], - [AC_MSG_ERROR([invalid value '${ac_scorep_cross_compiling}' for provided 'ac_scorep_cross_compiling'])]) - AFS_SUMMARY([Cross compiling], [$ac_scorep_cross_compiling (provided)]) - ]) - -AC_MSG_CHECKING([for cross compilation]) -AC_MSG_RESULT([$ac_scorep_cross_compiling]) -])# AFS_CROSSCOMPILING - - -# This macro is called by the build-backend/frontend/mpi configures only. -AC_DEFUN([AC_SCOREP_PLATFORM_SETTINGS], -[ - AC_REQUIRE([AC_CANONICAL_BUILD]) - - AM_CONDITIONAL([PLATFORM_ALTIX], [test "x${ac_scorep_platform}" = "xaltix"]) - AM_CONDITIONAL([PLATFORM_AIX], [test "x${ac_scorep_platform}" = "xaix" && test "x${build_cpu}" = "xpowerpc"]) - AM_CONDITIONAL([PLATFORM_BGL], [test "x${ac_scorep_platform}" = "xbgl"]) - AM_CONDITIONAL([PLATFORM_BGP], [test "x${ac_scorep_platform}" = "xbgp"]) - AM_CONDITIONAL([PLATFORM_BGQ], [test "x${ac_scorep_platform}" = "xbgq"]) - AM_CONDITIONAL([PLATFORM_CRAYXT], [test "x${ac_scorep_platform}" = "xcrayxt"]) - AM_CONDITIONAL([PLATFORM_CRAYXE], [test "x${ac_scorep_platform}" = "xcrayxe"]) - AM_CONDITIONAL([PLATFORM_CRAYXK], [test "x${ac_scorep_platform}" = "xcrayxk"]) - AM_CONDITIONAL([PLATFORM_CRAYXC], [test "x${ac_scorep_platform}" = "xcrayxc"]) - AM_CONDITIONAL([PLATFORM_LINUX], [test "x${ac_scorep_platform}" = "xlinux"]) - AM_CONDITIONAL([PLATFORM_SOLARIS], [test "x${ac_scorep_platform}" = "xsolaris"]) - AM_CONDITIONAL([PLATFORM_MAC], [test "x${ac_scorep_platform}" = "xmac"]) - AM_CONDITIONAL([PLATFORM_MIC], [test "x${ac_scorep_platform}" = "xmic"]) - AM_CONDITIONAL([PLATFORM_NECSX], [test "x${ac_scorep_platform}" = "xnecsx"]) - AM_CONDITIONAL([PLATFORM_ARM], [test "x${ac_scorep_platform}" = "xarm"]) - AM_CONDITIONAL([PLATFORM_MINGW], [test "x${ac_scorep_platform}" = "xmingw"]) - AM_CONDITIONAL([PLATFORM_K], [test "x${ac_scorep_platform}" = "xk"]) - AM_CONDITIONAL([PLATFORM_FX10], [test "x${ac_scorep_platform}" = "xfx10"]) - AM_CONDITIONAL([PLATFORM_FX100], [test "x${ac_scorep_platform}" = "xfx100"]) - - AS_CASE([${ac_scorep_platform}], - [crayx*], [afs_platform_cray="yes"], - [afs_platform_cray="no"]) - AM_CONDITIONAL([PLATFORM_CRAY],[ test "x${afs_platform_cray}" = "xyes" ]) - - AM_COND_IF([PLATFORM_ALTIX], - [AC_DEFINE([HAVE_PLATFORM_ALTIX], [1], [Set if we are building for the ALTIX platform])]) - AM_COND_IF([PLATFORM_AIX], - [AC_DEFINE([HAVE_PLATFORM_AIX], [1], [Set if we are building for the AIX platform])]) - AM_COND_IF([PLATFORM_BGL], - [AC_DEFINE([HAVE_PLATFORM_BGL], [1], [Set if we are building for the BG/L platform])]) - AM_COND_IF([PLATFORM_BGP], - [AC_DEFINE([HAVE_PLATFORM_BGP], [1], [Set if we are building for the BG/P platform])]) - AM_COND_IF([PLATFORM_BGQ], - [AC_DEFINE([HAVE_PLATFORM_BGQ], [1], [Set if we are building for the BG/Q platform])]) - AM_COND_IF([PLATFORM_CRAY], - [AC_DEFINE([HAVE_PLATFORM_CRAY], [1], [Set if we are building for the Cray platform])]) - AM_COND_IF([PLATFORM_CRAYXT], - [AC_DEFINE([HAVE_PLATFORM_CRAYXT], [1], [Set if we are building for the Cray XT platform])]) - AM_COND_IF([PLATFORM_CRAYXE], - [AC_DEFINE([HAVE_PLATFORM_CRAYXE], [1], [Set if we are building for the Cray XE platform])]) - AM_COND_IF([PLATFORM_CRAYXK], - [AC_DEFINE([HAVE_PLATFORM_CRAYXK], [1], [Set if we are building for the Cray XK platform])]) - AM_COND_IF([PLATFORM_CRAYXC], - [AC_DEFINE([HAVE_PLATFORM_CRAYXC], [1], [Set if we are building for the Cray XC platform])]) - AM_COND_IF([PLATFORM_LINUX], - [AC_DEFINE([HAVE_PLATFORM_LINUX], [1], [Set if we are building for the Linux platform])]) - AM_COND_IF([PLATFORM_SOLARIS], - [AC_DEFINE([HAVE_PLATFORM_SOLARIS], [1], [Set if we are building for the Solaris platform])]) - AM_COND_IF([PLATFORM_MAC], - [AC_DEFINE([HAVE_PLATFORM_MAC], [1], [Set if we are building for the macOS platform])]) - AM_COND_IF([PLATFORM_MIC], - [AC_DEFINE([HAVE_PLATFORM_MIC], [1], [Set if we are building for the Intel MIC platform])]) - AM_COND_IF([PLATFORM_NECSX], - [AC_DEFINE([HAVE_PLATFORM_NECSX], [1], [Set if we are building for the NEC SX platform])]) - AM_COND_IF([PLATFORM_ARM], - [AC_DEFINE([HAVE_PLATFORM_ARM], [1], [Set if we are building for the ARM platform])]) - AM_COND_IF([PLATFORM_MINGW], - [AC_DEFINE([HAVE_PLATFORM_MINGW], [1], [Set if we are building for the MinGW platform])]) - AM_COND_IF([PLATFORM_K], - [AC_DEFINE([HAVE_PLATFORM_K], [1], [Set if we are building for the K platform])]) - AM_COND_IF([PLATFORM_FX10], - [AC_DEFINE([HAVE_PLATFORM_FX10], [1], [Set if we are building for the FX10 platform])]) - AM_COND_IF([PLATFORM_FX100], - [AC_DEFINE([HAVE_PLATFORM_FX100], [1], [Set if we are building for the FX100 platform])]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_toplevel_args.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_toplevel_args.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_toplevel_args.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_toplevel_args.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,54 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2011, 2016, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - - -# Save user provided arguments for use by sub-configures. -AC_DEFUN([AC_SCOREP_TOPLEVEL_ARGS], -[ -# Quote arguments with shell meta characters. -TOPLEVEL_CONFIGURE_ARGUMENTS= -set -- "$progname" "$[@]" -for ac_arg -do - AS_CASE(["$ac_arg"], - [*" "*|*" "*|*[[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\']]*], - [ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` - # if the argument is of the form -foo=baz, quote the baz part only - ac_arg=`echo "'$ac_arg'" | sed "s/^'\([[-a-zA-Z0-9]]*=\)/\\1'/"`]) - # Add the quoted argument to the list. - TOPLEVEL_CONFIGURE_ARGUMENTS="$TOPLEVEL_CONFIGURE_ARGUMENTS -$ac_arg" -done -# Remove the initial space we just introduced. -TOPLEVEL_CONFIGURE_ARGUMENTS=`echo "x$TOPLEVEL_CONFIGURE_ARGUMENTS" | sed -e 's/^x *//'` - -echo "$TOPLEVEL_CONFIGURE_ARGUMENTS" > ./user_provided_configure_args -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_uncrustify.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_uncrustify.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_uncrustify.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_uncrustify.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## Technische Universitaet Dresden, Germany -## University of Oregon, Eugene, USA -## Forschungszentrum Juelich GmbH, Germany -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## Technische Universitaet Muenchen, Germany -## -## See the COPYING file in the package base directory for details. -## - - -AC_DEFUN([AC_SCOREP_UNCRUSTIFY], -[ -AC_CHECK_PROG([ac_scorep_have_uncrustify], [uncrustify], [yes], [no],,) -AM_CONDITIONAL([HAVE_UNCRUSTIFY], [test "x${ac_scorep_have_uncrustify}" = "xyes"]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ac_scorep_version_and_revision.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,103 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2014, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2013, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - - -AC_DEFUN([AC_SCOREP_REVISION], -[ -AC_REQUIRE([AC_SCOREP_PACKAGE_AND_LIBRARY_VERSION]) - -# When in a working copy, write REVISION* files. The REVISION* files -# are updated during each configure call and also at make -# doxygen-user. - -# When working with a make-dist-generated tarball, the REVISION* files -# are provided. - -component_revision="invalid" -common_revision="invalid" -which svnversion 2>&1 >/dev/null -AS_IF([test $? -eq 0], - [component_revision=`svnversion -c $srcdir | cut -d ':' -f 2` - common_revision=`svnversion -c $srcdir/vendor/common | cut -d ':' -f 2` - # If we are in a working copy, update the REVISION* files. - AS_IF([test "x$component_revision" != "xexported" && \ - test "x$component_revision" != "xUnversioned directory"], - [echo $component_revision > $srcdir/build-config/REVISION]) - AS_IF([test "x$common_revision" != "xexported" && \ - test "x$component_revision" != "xUnversioned directory"], - [echo $common_revision > $srcdir/build-config/REVISION_COMMON])]) - -# Warn if the REVISION* files contain anything but plain numbers. -AS_IF([grep -E [[A-Z]] $srcdir/build-config/REVISION > /dev/null || \ - grep ":" $srcdir/build-config/REVISION > /dev/null || \ - grep -E [[A-Z]] $srcdir/build-config/REVISION_COMMON > /dev/null || \ - grep ":" $srcdir/build-config/REVISION_COMMON > /dev/null], - [component_revision=`cat $srcdir/build-config/REVISION` - common_revision=`cat $srcdir/build-config/REVISION_COMMON` - AC_MSG_WARN([distribution does not match a single, unmodified revision, but $component_revision (${PACKAGE_NAME}) and $common_revision (common).])]) -]) - - -AC_DEFUN([AC_SCOREP_PACKAGE_AND_LIBRARY_VERSION], -[ - AC_SUBST([PACKAGE_MAJOR], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$major"])) - AC_SUBST([PACKAGE_MINOR], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$minor"])) - AC_SUBST([PACKAGE_BUGFIX], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$bugfix"])) - AC_SUBST([PACKAGE_SUFFIX], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-package-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$suffix"])) - - AC_SUBST([LIBRARY_CURRENT], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$current"])) - AC_SUBST([LIBRARY_REVISION], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$revision"])) - AC_SUBST([LIBRARY_AGE], - m4_esyscmd(AFS_PACKAGE_TO_TOP[vendor/common/build-config/generate-library-version.sh ] AFS_PACKAGE_TO_TOP[build-config/VERSION "echo \$age"])) -]) - - - - -AC_DEFUN([AC_SCOREP_DEFINE_REVISIONS], -[ - for i in REVISION REVISION_COMMON; do - if test ! -e ${srcdir}/../build-config/${i}; then - AC_MSG_ERROR([File ${srcdir}/../build-config/${i} must exist.]) - fi - done - - component_revision=`cat ${srcdir}/../build-config/REVISION` - common_revision=`cat ${srcdir}/../build-config/REVISION_COMMON` - AC_DEFINE_UNQUOTED([SCOREP_COMPONENT_REVISION], ["${component_revision}"], [Revision of ]AC_PACKAGE_NAME) - AC_DEFINE_UNQUOTED([SCOREP_COMMON_REVISION], ["${common_revision}"], [Revision of common repository]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/afs_am_conditional.m4 opari2-2.0.6/vendor/common/build-config/m4/afs_am_conditional.m4 --- opari2-2.0.5/vendor/common/build-config/m4/afs_am_conditional.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/afs_am_conditional.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -dnl -*- mode: autoconf -*- - -dnl -dnl This file is part of the Score-P software (http://www.score-p.org) -dnl -dnl Copyright (c) 2013 -dnl Forschungszentrum Juelich GmbH, Germany -dnl -dnl This software may be modified and distributed under the terms of -dnl a BSD-style license. See the COPYING file in the package base -dnl directory for details. -dnl - -dnl file afs_am_conditional.m4 - - -# AFS_AM_CONDITIONAL(NAME, SHELL-CONDITION, BOOLEAN-VALUE) -# ------------------------------------- -# Define an automake conditional as in AM_CONDITIONAL, but let it -# default to BOOLEAN-VALUE (true|false) if this macro is not -# encountered during configure. This allows you to define automake -# conditionals conditionally. -AC_DEFUN([AFS_AM_CONDITIONAL], -[m4_case([$3], [true], [], - [false], [], - [m4_fatal([AFS_AM_CONDITIONAL requires the third parameter to be either 'true' or 'false'.])])dnl -m4_divert_text([DEFAULTS], -[m4_if([$3], [true], [dnl -$1_TRUE= -$1_FALSE='#'],[dnl -$1_TRUE='#' -$1_FALSE=]) -])dnl -AM_CONDITIONAL($1, [$2])dnl -])dnl diff -Nru opari2-2.0.5/vendor/common/build-config/m4/afs_compiler_backend.m4 opari2-2.0.6/vendor/common/build-config/m4/afs_compiler_backend.m4 --- opari2-2.0.5/vendor/common/build-config/m4/afs_compiler_backend.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/afs_compiler_backend.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,376 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2013 -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2014, 2019, -## Technische Universitaet Dresden, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file build-config/m4/afs_compiler_backend.m4 - - -dnl AFS_COMPILER_BACKEND($1 [,$2]) -dnl $1: comma separated list of required compilers (out of CC, CXX, F77, FC) -dnl $2: comma separated list of optional compilers (out of CC, CXX, F77, FC) -dnl Creates output argument string 'afs_backend_compiler_vars' to be passed to build-backend configure -AC_DEFUN([AFS_COMPILER_BACKEND], -[ -# parameter consistency checks -m4_ifblank([$1], [m4_fatal([Macro requires at least one argument])]) -m4_foreach([afs_tmp_var], - [$1], - [m4_case(afs_tmp_var, [CC], [], [CXX], [], [F77], [], [FC], [], - [m4_fatal([first parameter must be a list out of CC, CXX, F77, FC])]) -]) -m4_ifnblank([$2], - m4_foreach([afs_tmp_var], - [$2], - [m4_case(afs_tmp_var, [CC], [], [CXX], [], [F77], [], [FC], [], - [m4_fatal([second parameter must be a list out of CC, CXX, F77, FC or empty])]) -])) - -AC_REQUIRE([AC_SCOREP_TOPLEVEL_ARGS]) -AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) -AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) -AC_REQUIRE([AC_PROG_SED]) -AC_REQUIRE([AC_PROG_GREP]) - -# Create set of requested compilers, and a list of relevant variables -m4_set_add_all([afs_requested_compilers_set], $1, $2) -m4_set_foreach([afs_requested_compilers_set], - [afs_tmp_var], - [m4_set_add([afs_relevant_build_variables_set], afs_tmp_var) - m4_case(afs_tmp_var, - [CC], [m4_set_add([afs_relevant_build_variables_set], [CFLAGS])], - [CXX], [m4_set_add([afs_relevant_build_variables_set], [CXXFLAGS])], - [F77], [m4_set_add([afs_relevant_build_variables_set], [FFLAGS])], - [FC], [m4_set_add([afs_relevant_build_variables_set], [FCFLAGS])])]) -m4_set_add([afs_relevant_build_variables_set], [CPPFLAGS]) -m4_set_add([afs_relevant_build_variables_set], [LDFLAGS]) -m4_set_add([afs_relevant_build_variables_set], [LIBS]) - -afs_compiler_files="$srcdir/vendor/common/build-config/platforms/backend-" - -# clear all variables -m4_foreach([afs_tmp_var], - [afs_all_build_variables_list], - [AS_UNSET([afs_tmp_var]) - ]) - -# read relevant variables from platform file, provides at least CC, CXX, etc. -m4_set_foreach([afs_relevant_build_variables_set], - [afs_tmp_var], - [_AFS_READ_VAR_FROM_FILE([${afs_compiler_files}${ac_scorep_platform}], [platform]) - afs_tmp_var="${afs_[]afs_tmp_var[]_platform}" - ]) - -# handle --with-compiler-suite= configure option, overrides platform defaults -AC_ARG_WITH([compiler-suite], - [AS_HELP_STRING([--with-compiler-suite=(gcc|ibm|intel|pgi|studio|clang)], - [The compiler suite used to build this package. Applies currently only to non-cross-compile systems. Compilers need to be in $PATH [gcc].])], - [# action if given - AS_IF([test "x${ac_scorep_cross_compiling}" = "xno"], - [# non-cross-compile systems, read variables from vendor file - # user provided $withval valid? - afs_compiler_suite="${withval}" - AS_CASE([${withval}], - ["no"], [AC_MSG_ERROR([option --without-compiler-suite makes no sense.])], - ["gcc"], [], - ["gnu"], [afs_compiler_suite="gcc"], - ["ibm"], [], - ["xl"], [afs_compiler_suite="ibm"], - ["intel"], [], - ["pgi"], [], - ["studio"], [], - ["clang"], [], - [AC_MSG_ERROR([compiler suite "${withval}" not supported by --with-compiler-suite.])]) - - # read relevant variables from compiler vendor file, provides at least CC, CXX, etc. - # override current setting with vendor settings - AC_MSG_NOTICE([overriding platform compilers with '--with-compiler-suite=${afs_compiler_suite}']) - m4_set_foreach([afs_relevant_build_variables_set], - [afs_tmp_var], - [_AFS_READ_VAR_FROM_FILE([${afs_compiler_files}${afs_compiler_suite}], [vendor]) - AS_IF([test "${afs_[]afs_tmp_var[]_vendor}" != "${afs_[]afs_tmp_var[]_platform}"], - [AC_MSG_NOTICE([afs_tmp_var: overriding '${afs_[]afs_tmp_var[]_platform}' with '${afs_[]afs_tmp_var[]_vendor}']) - afs_tmp_var="${afs_[]afs_tmp_var[]_vendor}"]) - ]) - ], - [# cross-compile systems - AC_MSG_WARN([--with-compiler-suite currently not supported on cross-compile systems as backend compilers are chosen by system type. To specify frontend compilers, use --with-frontend-compiler-suite.])]) - ] dnl ,[ # action if not given ] -) - -# handle user-provided/configure cmd-line CC, CXX, etc. -# read relevant variables from file ./user_provided_configure_args -# override current setting with user settings, if provided -m4_set_foreach([afs_relevant_build_variables_set], - [afs_tmp_var], - [_AFS_READ_VAR_FROM_FILE([./user_provided_configure_args], [user]) - AS_IF([test -n "${afs_[]afs_tmp_var[]_user}"], - [AC_MSG_NOTICE([afs_tmp_var: overriding '${afs_tmp_var}' with user provided '${afs_[]afs_tmp_var[]_user}']) - afs_tmp_var="${afs_[]afs_tmp_var[]_user}"]) - ]) - -# remove all build variables and compiler options from file -# ./user_provided_configure_args to prevent duplicate processing -afs_filter_user_provided_configure_args_cmd="cat ./user_provided_configure_args | ${GREP} -v \"^--with-compiler-suite\"" -m4_foreach([afs_tmp_var], - [afs_all_build_variables_list], - [afs_filter_user_provided_configure_args_cmd="${afs_filter_user_provided_configure_args_cmd} | ${GREP} -v \"^[]afs_tmp_var[]=\"" - ]) -afs_filter_user_provided_configure_args_cmd="${afs_filter_user_provided_configure_args_cmd} > ./afs_user_provided_configure_args_tmp" -eval ${afs_filter_user_provided_configure_args_cmd} -mv ./afs_user_provided_configure_args_tmp ./user_provided_configure_args - -# get the compiler's basename, ignore options like -std=c99. -m4_set_foreach([afs_requested_compilers_set], - [afs_tmp_var], - [_LT_CC_BASENAME(["$[]afs_tmp_var"]) - afs_tmp_var[]_basename=`$ECHO "${cc_basename}" | $AWK '{print $[]1}' | $SED "s%'%%g" | $SED "s%\"%%g"` - ]) - -# check if required compilers in PATH -m4_foreach([afs_tmp_var], - [$1], - [afs_in_path=`which ${afs_tmp_var[]_basename} 2> /dev/null` - AS_IF([test -z "${afs_in_path}"], - [AC_MSG_ERROR([required compiler 'afs_tmp_var[]=${afs_tmp_var[]_basename}' not in PATH.])]) - ]) - -# check if optional compilers in PATH -m4_foreach([afs_tmp_var], - [$2], - [afs_in_path=`which ${afs_tmp_var[]_basename} 2> /dev/null` - AS_IF([test -z "${afs_in_path}"], - [AC_MSG_WARN([optional compiler 'afs_tmp_var[]=${afs_tmp_var[]_basename}' not in PATH.]) - AS_UNSET([afs_tmp_var]) - m4_case(afs_tmp_var, - [CC], [AS_UNSET([CFLAGS])], - [CXX], [AS_UNSET([CXXFLAGS])], - [F77], [AS_UNSET([FFLAGS])], - [FC], [AS_UNSET([FCFLAGS])]) - ]) - ]) - -# check if compilers are from same vendor (3) -# 1. set <>_vendor -m4_set_foreach([afs_requested_compilers_set], - [afs_tmp_var], - [AS_CASE([${afs_tmp_var[]_basename}], - [gcc* | g++* | gfortran*], [afs_tmp_var[]_vendor="gnu"], - [icc* | icpc* | ifort*], [afs_tmp_var[]_vendor="intel"], - [pgcc* | pgCC* | pgcpp* | pgf* ], [afs_tmp_var[]_vendor="pgi"], - [xlc* | xlC* | xlf*], [afs_tmp_var[]_vendor="ibm"], - [AS_CASE([`${afs_tmp_var[]_basename} -V 2>&1`], - [*Sun\ C* | *Sun\ F*], [afs_tmp_var[]_vendor="studio"], - [AC_MSG_ERROR([unsupported compiler 'afs_tmp_var[]=${afs_tmp_var[]_basename}'. Please contact or use --with-custom-compilers.])])]) - ]) -# 2. check if required compilers are from same vendor -AS_UNSET([afs_common_vendor]) -m4_foreach([afs_tmp_var], - [$1], - [AS_IF([test -z "${afs_common_vendor}"], - [afs_common_vendor=${afs_tmp_var[]_vendor}], - [AS_IF([test "x${afs_common_vendor}" != "x${afs_tmp_var[]_vendor}"], - [AC_MSG_ERROR([required compilers not from a single vendor ('${afs_common_vendor}' and '${afs_tmp_var[]_vendor}'). Please use --with-custom-compilers for experimental configurations.])])]) - ]) -# 3. check if optional compilers are from same vendor as required compilers -m4_foreach([afs_tmp_var], - [$2], - [AS_IF([test "x${afs_common_vendor}" != "x${afs_tmp_var[]_vendor}"], - [AC_MSG_WARN([optional compiler 'afs_tmp_var=${afs_tmp_var}' not from vendor '${afs_common_vendor}'. Ignoring optional compiler. You may use --with-custom-compilers for experimental configurations.]) - AS_UNSET([afs_tmp_var]) - m4_case(afs_tmp_var, - [CC], [AS_UNSET([CFLAGS])], - [CXX], [AS_UNSET([CXXFLAGS])], - [F77], [AS_UNSET([FFLAGS])], - [FC], [AS_UNSET([FCFLAGS])]) - ]) - ]) - -dnl # print all variables and values -dnl m4_foreach([afs_tmp_var], -dnl [afs_all_build_variables_list], [AS_IF([test -n "${afs_tmp_var}"], [echo afs_tmp_var[]: ${afs_tmp_var} -dnl ]) -dnl ]) - -# create output argument string 'afs_backend_compiler_vars' to be passed to build-backend configure -AS_UNSET([afs_backend_compiler_vars]) -m4_set_foreach([afs_relevant_build_variables_set], - [afs_tmp_var], - [AS_IF([test -n "${afs_tmp_var}"], - [AS_CASE(["${afs_tmp_var}"], - [*\ *], - [# contains spaces, already quoted? - ( $ECHO "${afs_tmp_var}" | $GREP ^\' | $GREP \'$ >/dev/null 2>&1 ) - afs_single_quoted=$? - ( $ECHO "${afs_tmp_var}" | $GREP ^\" | $GREP \"$ >/dev/null 2>&1 ) - afs_double_quoted=$? - AS_IF([test ${afs_single_quoted} -ne 0 && test ${afs_double_quoted} -ne 0 ], - [# needs quoting - afs_backend_compiler_vars="${afs_backend_compiler_vars} afs_tmp_var='${afs_tmp_var}'"], - [# already quoted - afs_backend_compiler_vars="${afs_backend_compiler_vars} afs_tmp_var=${afs_tmp_var}"])], - [*], - [# contains no spaces, no quoting needed - afs_backend_compiler_vars="${afs_backend_compiler_vars} afs_tmp_var=${afs_tmp_var}"]) - ]) - ]) - -dnl echo afs_backend_compiler_vars $afs_backend_compiler_vars - -m4_set_delete(afs_requested_compilers_set) -m4_set_delete(afs_relevant_build_variables_set) -])# AFS_COMPILER_BACKEND - - -m4_define([afs_all_build_variables_list], - [CC, CXX, F77, FC, CPPFLAGS, CFLAGS, CXXFLAGS, FFLAGS, FCFLAGS, LDFLAGS, LIBS]) - -dnl _AFS_READ_VAR_FROM_FILE($1, $2) -dnl $1: file to read variables from -dnl $2: variable name suffix -m4_define([_AFS_READ_VAR_FROM_FILE], - [afs_[]afs_tmp_var[]_[]$2[]="`${GREP} "^[]afs_tmp_var[]=" $1 | ${AWK} -F "=" '{print $[]2}'`"]) - - -dnl ---------------------------------------------------------------------------- - -# AFS_CUSTOM_COMPILERS -# -------------------- -# Provide --with-custom-compiler configure option; if given sets -# ac_scorep_compilers_backend -# ac_scorep_compilers_frontend -# ac_scorep_compilers_mpi -# to AFS_COMPILER_FILES_COMMON/platform-*-user-provided files. -# Provides afs_custom_compilers_given=(yes|no) to be used by other -# macros setting ac_scorep_compilers_*. -AC_DEFUN([AFS_CUSTOM_COMPILERS], -[ - AC_REQUIRE([AC_SCOREP_DETECT_PLATFORMS]) - - AC_ARG_WITH([custom-compilers], - [AS_HELP_STRING([--with-custom-compilers], - [Customize compiler settings by 1. copying the files /vendor/common/build-config/platforms/platform-*-user-provided to the directory where you run configure , 2. editing those files to your needs, and 3. running configure. Alternatively, edit the files under directly. Files in take precedence. You are entering unsupported terrain. Namaste, and good luck!]) - ], - [afs_custom_compilers_given="yes" - AS_CASE([${withval}], - ["yes"], [AS_IF([test -f ./platform-backend-user-provided && \ - test -f ./platform-frontend-user-provided && \ - test -f ./platform-mpi-user-provided && \ - test -f ./platform-shmem-user-provided], - [AC_MSG_NOTICE([Using compiler specification from ./platform-*-user-provided files.]) - ac_scorep_compilers_backend="./platform-backend-user-provided" - ac_scorep_compilers_frontend="./platform-frontend-user-provided" - ac_scorep_compilers_mpi="./platform-mpi-user-provided" - ac_scorep_compilers_shmem="./platform-shmem-user-provided"], - [AC_MSG_NOTICE([Using compiler specification from AFS_COMPILER_FILES_COMMON/platform-*-user-provided files.]) - ac_scorep_compilers_backend="AFS_COMPILER_FILES_COMMON/platform-backend-user-provided" - ac_scorep_compilers_frontend="AFS_COMPILER_FILES_COMMON/platform-frontend-user-provided" - ac_scorep_compilers_mpi="AFS_COMPILER_FILES_COMMON/platform-mpi-user-provided" - ac_scorep_compilers_shmem="AFS_COMPILER_FILES_COMMON/platform-shmem-user-provided"]) - ], - [AC_MSG_ERROR(['${withval}' not supported by --with-custom-compilers.])]) - ], - [afs_custom_compilers_given="no" - ]) -]) - -dnl ---------------------------------------------------------------------------- - -# AFS_COMPILER_FILES_(COMMON|PACKAGE) -# ----------------------------------- -# Use AFS_COMPILER_FILES_* as alias for $srcdir/[vendor/common/]build-config/platforms -# for setting paths to compiler files. -m4_define([AFS_COMPILER_FILES_COMMON], [$srcdir/vendor/common/build-config/platforms]) -m4_define([AFS_COMPILER_FILES_PACKAGE], [$srcdir/build-config/platforms]) - -dnl ---------------------------------------------------------------------------- - -# Following two macros copied from -# /share/aclocal/libtool.m4. I don't wont to call -# LT_INIT from the toplevel configure but want to use -# _LT_CC_BASENAME(CC) as in libtool. -# Should be moved into a separate file with license=GPL - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` -]) - - -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- -# Find how we can fake an echo command that does not interpret backslash. -# In particular, with Autoconf 2.60 or later we add some code to the start -# of the generated configure script which will find a shell with a builtin -# printf (which we can use as an echo command). -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO -ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - -AC_MSG_CHECKING([how to print strings]) -# Test print first, because it will be a builtin if present. -if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ - test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='print -r --' -elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then - ECHO='printf %s\n' -else - # Use this function as a fallback that always works. - func_fallback_echo () - { - eval 'cat <<_LTECHO_EOF -$[]1 -_LTECHO_EOF' - } - ECHO='func_fallback_echo' -fi - -# func_echo_all arg... -# Invoke $ECHO with all args, space-separated. -func_echo_all () -{ - $ECHO "$*" -} - -case "$ECHO" in - printf*) AC_MSG_RESULT([printf]) ;; - print*) AC_MSG_RESULT([print -r]) ;; - *) AC_MSG_RESULT([cat]) ;; -esac - -m4_ifdef([_AS_DETECT_SUGGESTED], -[_AS_DETECT_SUGGESTED([ - test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || ( - ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO - ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO - PATH=/empty FPATH=/empty; export PATH FPATH - test "X`printf %s $ECHO`" = "X$ECHO" \ - || test "X`print -r -- $ECHO`" = "X$ECHO" )])]) - -dnl Don't declare libtool variables, we are just interested in ECHO here. -dnl _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -dnl _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) -])# _LT_PROG_ECHO_BACKSLASH diff -Nru opari2-2.0.5/vendor/common/build-config/m4/afs_maintainer_mode.m4 opari2-2.0.6/vendor/common/build-config/m4/afs_maintainer_mode.m4 --- opari2-2.0.5/vendor/common/build-config/m4/afs_maintainer_mode.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/afs_maintainer_mode.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -dnl -*- mode: autoconf -*- - -dnl -dnl This file is part of the Score-P software (http://www.score-p.org) -dnl -dnl Copyright (c) 2018 -dnl Forschungszentrum Juelich GmbH, Germany -dnl -dnl This software may be modified and distributed under the terms of -dnl a BSD-style license. See the COPYING file in the package base -dnl directory for details. -dnl - -dnl file afs_maintainer_mode.m4 - -# AFS_MAINTAINER_MODE -# ------------------- -# Enable maintainer mode only when building from subversion sources. -# We want automatic regeneration of files when our build environemnt -# is available, i.e., when correct and patched versions of autotools -# are available. Otherwise we want to prevent automatic regeneration -# of files. -AC_DEFUN([AFS_MAINTAINER_MODE], -[AC_REQUIRE([AC_SCOREP_SVN_CONTROLLED]) -AS_IF([test "x${ac_scorep_svn_controlled}" = xyes], - [AM_MAINTAINER_MODE([enable])], - [AM_MAINTAINER_MODE([])])dnl -]) # AFS_MAINTAINER_MODE diff -Nru opari2-2.0.5/vendor/common/build-config/m4/afs_summary.m4 opari2-2.0.6/vendor/common/build-config/m4/afs_summary.m4 --- opari2-2.0.5/vendor/common/build-config/m4/afs_summary.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/afs_summary.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,204 +0,0 @@ -## -*- mode: autoconf -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2015, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2013, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file afs_summary.m4 - -# AFS_SUMMARY_INIT -# ---------------- -# Initializes the summary system and adds the package header (possibly -# including the sub-build name) to it. It removes config.summary files -# from previous configure runs recursively, therefore you need to call -# AFS_SUMMARY_INIT before any sub-configures. -# The sub-build name is used from the `AFS_PACKAGE_BUILD` variable -# set by the AFS_PACKAGE_INIT macro. -AC_DEFUN([AFS_SUMMARY_INIT], [ -rm -f AC_PACKAGE_TARNAME.summary -LC_ALL=C find . -name config.summary -exec rm -f '{}' \; -m4_define([_AFS_SUMMARY_INDENT], [m4_ifndef([AFS_PACKAGE_BUILD], [], [ ])])dnl -m4_define([_AFS_SUMMARY_FILE], [config.summary]) -cat >_AFS_SUMMARY_FILE <<_ACEOF -AS_HELP_STRING(_AFS_SUMMARY_INDENT[]AC_PACKAGE_NAME[ ]m4_ifndef([AFS_PACKAGE_BUILD], AC_PACKAGE_VERSION, [(]AFS_PACKAGE_BUILD[)])[:], [], 32, 128) -_ACEOF -]) - - -# AFS_SUMMARY_SECTION_BEGIN( [DESCR, [VALUE]] ) -# --------------------------------------------- -# Starts a new section, optionally with the given description. -# All summary lines after this call will be indented by 2 spaces. -# Close the section with 'AFS_SUMMARY_SECTION_END'. -AC_DEFUN([AFS_SUMMARY_SECTION_BEGIN], [ -AC_REQUIRE([AFS_SUMMARY_INIT])dnl - -m4_ifnblank($1, AFS_SUMMARY([$1], [$2])) -m4_pushdef([_AFS_SUMMARY_INDENT], _AFS_SUMMARY_INDENT[ ])dnl -]) - - -# AFS_SUMMARY_SECTION_END -# ----------------------- -# Close a previously opened section with 'AFS_SUMMARY_SECTION_BEGIN'. -AC_DEFUN([AFS_SUMMARY_SECTION_END], [ -AC_REQUIRE([AFS_SUMMARY_INIT])dnl - -m4_popdef([_AFS_SUMMARY_INDENT])dnl -]) - - -# AFS_SUMMARY_PUSH -# ---------------- -# Starts a new section (see 'AFS_SUMMARY_SECTION_BEGIN'), but without a -# section heading and it collects all subsequent summaries and sections in -# a hold space. -# All summary lines after this call will be indented by 2 spaces. -# Output the hold space with 'AFS_SUMMARY_POP'. -AC_DEFUN([AFS_SUMMARY_PUSH], [ -AC_REQUIRE([AFS_SUMMARY_INIT])dnl - -AFS_SUMMARY_SECTION_BEGIN -m4_pushdef([_AFS_SUMMARY_FILE], _AFS_SUMMARY_FILE[.x])dnl -: >_AFS_SUMMARY_FILE -]) - - -# AFS_SUMMARY_POP( DESCR, VALUE ) -# ------------------------------- -# Close a previously opened section with 'AFS_SUMMARY_PUSH'. Outputs the -# section header with DESCR and VALUE, and than outputs the summary from the -# hold space. -AC_DEFUN([AFS_SUMMARY_POP], [ -AC_REQUIRE([AFS_SUMMARY_INIT])dnl - -m4_define([_afs_summary_tmp], _AFS_SUMMARY_FILE)dnl -m4_popdef([_AFS_SUMMARY_FILE])dnl -AFS_SUMMARY_SECTION_END - -AFS_SUMMARY([$1], [$2]) -cat _afs_summary_tmp >>_AFS_SUMMARY_FILE -rm _afs_summary_tmp -]) - - -# AFS_SUMMARY( DESCR, VALUE ) -# --------------------------- -# Generates a summary line with the given description and value. -AC_DEFUN([AFS_SUMMARY], [ -AC_REQUIRE([AFS_SUMMARY_INIT])dnl - -cat >>_AFS_SUMMARY_FILE <<_ACEOF -AS_HELP_STRING(_AFS_SUMMARY_INDENT[ $1:], [$2], 32, 128) -_ACEOF -]) - - -# AFS_SUMMARY_VERBOSE( DESCR, VALUE ) -# ----------------------------------- -# Generates a summary line with the given description and value, but only -# if ./configure was called with --verbose -AC_DEFUN([AFS_SUMMARY_VERBOSE], [ - -AS_IF([test "x${verbose}" = "xyes"], [ - AFS_SUMMARY([$1], [$2]) -]) -]) - - -# internal -AC_DEFUN([_AFS_SUMMARY_SHOW], [ - -AS_ECHO([""]) -cat AC_PACKAGE_TARNAME.summary -]) - -# AFS_SUMMARY_COLLECT( [SHOW-COND] ) -# -------------------------------- -# Collectes the summary of all configures recursively into the file -# $PACKAGE.summary. If SHOW-COND is not given, or the expression -# evaluates to true the summary is also printed to stdout. -# Should be called after AC_OUTPUT. -AC_DEFUN([AFS_SUMMARY_COLLECT], [ - ( - AS_ECHO(["Configure command:"]) - prefix=" $as_myself " - printf "%-32s" "$prefix" - padding=" " - AS_IF([test ${#prefix} -gt 32], [ - sep="\\$as_nl$padding" - ], [ - sep="" - ]) - - eval "set x $ac_configure_args" - shift - AS_FOR([ARG], [arg], [], [ - AS_CASE([$arg], - [*\'*], [arg="`$as_echo "$arg" | sed "s/'/'\\\\\\\\''/g"`"]) - AS_ECHO_N(["$sep'$arg'"]) - sep=" \\$as_nl$padding" - ]) - AS_ECHO([""]) - - AS_IF([test x"${MODULESHOME:+set}" = x"set"], [ - AS_ECHO([""]) - AS_ECHO(["Loaded modules:"]) - sep="" - AS_IF([test x"${LOADEDMODULES:+set}" = x"set"], [ - prefix=" module load " - printf "%-32s" "$prefix" - IFS=': ' eval 'set x $LOADEDMODULES' - shift - AS_FOR([MODULE], [module], [], [ - AS_ECHO_N(["$sep$module"]) - sep=" \\$as_nl$padding" - ]) - AS_ECHO([""]) - ], [ - AS_ECHO([" No modules loaded"]) - ]) - ]) - - AS_ECHO([""]) - sep="Configuration summary:" - LC_ALL=C find . -name config.summary | - LC_ALL=C $AWK -F "config.summary" '{print $[]1}' | - LC_ALL=C sort | - LC_ALL=C $AWK '{print $[]0 "config.summary"}' | - while read summary - do - AS_ECHO(["$sep"]) - cat $summary - sep="" - done - ) >AC_PACKAGE_TARNAME.summary - m4_ifblank($1, - [_AFS_SUMMARY_SHOW], - [AS_IF([$1], [_AFS_SUMMARY_SHOW])]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ax_compiler_vendor.m4 opari2-2.0.6/vendor/common/build-config/m4/ax_compiler_vendor.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ax_compiler_vendor.m4 2019-07-26 09:16:11.549169523 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ax_compiler_vendor.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VENDOR -# -# DESCRIPTION -# -# Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun, -# hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft, -# watcom, etc. The vendor is returned in the cache variable -# $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++. -# Try also to determine the variant of a compiler (e.g. Portland ships pgcc -# and pgcc-llvm). If there is a variant detected, / is -# returned. Use ${ax_cv_c_compiler_vendor%/*} to test only for the . -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson -# Copyright (c) 2008 Matteo Frigo -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see . -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 15 - -AC_DEFUN([AX_COMPILER_VENDOR], -[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor, - dnl Please add if possible support to ax_compiler_version.m4 - [# note: don't check for gcc first since some other compilers define __GNUC__ - vendors="intel: __ICC,__ECC,__INTEL_COMPILER - ibm: __xlc__,__xlC__,__IBMC__,__IBMCPP__,__ibmxl__clang__,__ibmxl__ - pathscale: __PATHCC__,__PATHSCALE__ - clang: __clang__ - cray: _CRAYC - fujitsu: __FUJITSU - portland: __PGI - gnu: __GNUC__ - sun: __SUNPRO_C,__SUNPRO_CC - hp: __HP_cc,__HP_aCC - dec: __DECC,__DECCXX,__DECC_VER,__DECCXX_VER - borland: __BORLANDC__,__CODEGEARC__,__TURBOC__ - comeau: __COMO__ - kai: __KCC - lcc: __LCC__ - sgi: __sgi,sgi - microsoft: _MSC_VER - metrowerks: __MWERKS__ - watcom: __WATCOMC__ - tcc: __TINYC__ - unknown: UNKNOWN" - for ventest in $vendors; do - case $ventest in #( - *:) vendor=${ventest%:*}; continue ;; #( - *) vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;; - esac - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ - #if !($vencpp) - thisisanerror; - #endif - ])], [break]) - done - ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=$vendor - portland_variants="llvm: __PGLLVM__" - eval variants=\"\$${ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor}_variants : NONE\" - for vartest in $variants; do - case $vartest in #( - *:) variant=${vartest%:*}; continue ;; #( - *) varcpp="defined("`echo $vartest | sed 's/,/) && defined(/g'`")" ;; - esac - AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[ - #if !($varcpp) - thisisanerror; - #endif - ])], [break]) - done - AS_VAR_APPEND([ax_cv_]_AC_LANG_ABBREV[_compiler_vendor], [${variant:+/$variant}]) - ]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ax_compiler_version.m4 opari2-2.0.6/vendor/common/build-config/m4/ax_compiler_version.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ax_compiler_version.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ax_compiler_version.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,552 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_compiler_version.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_COMPILER_VERSION -# -# DESCRIPTION -# -# This macro retrieves the compiler version and returns it in the cache -# variable $ax_cv_c_compiler_version for C and $ax_cv_cxx_compiler_version -# for C++. -# -# Version is returned as epoch:major.minor.patchversion -# -# Epoch is used in order to have an increasing version number in case of -# marketing change. -# -# Epoch use: * borland compiler use chronologically 0turboc for turboc -# era, -# -# 1borlanc BORLANDC++ before 5, 2cppbuilder for cppbuilder era, -# 3borlancpp for return of BORLANDC++ (after version 5.5), -# 4cppbuilder for cppbuilder with year version, -# and 5xe for XE era. -# -# An empty string is returned otherwise. -# -# LICENSE -# -# Copyright (c) 2014 Bastien ROUCARIES -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 12 - -# for intel -AC_DEFUN([_AX_COMPILER_VERSION_INTEL], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__INTEL_COMPILER/100],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__INTEL_COMPILER%100)/10],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [(__INTEL_COMPILER%10)],, - AC_MSG_FAILURE([[[$0]] unknown intel compiler version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for IBM -AC_DEFUN([_AX_COMPILER_VERSION_IBM], - [ dnl - dnl check between z/OS C/C++ and XL C/C++ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([], - [ - #if defined(__COMPILER_VER__) - choke me; - #endif - ])], - [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([], - [ - #if defined(__ibmxl_version__) - choke me; - #endif - ])], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__xlC__/100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__xlC__%100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC_ver__/0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - [__xlC_ver__%0x100],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler build version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ], - [ - dnl its maybe __ibmxl_ptf_fix_level__ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__ibmxl_modification__],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__ibmxl_release__],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [__ibmxl_version__],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - ], - [ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__xlC__%1000],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__xlC__/10000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__xlC__/100000)%10],, - AC_MSG_FAILURE([[[$0]] unknown IBM compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -# for pathscale -AC_DEFUN([_AX_COMPILER_VERSION_PATHSCALE],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PATHCC__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PATHCC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pathscale minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PATHCC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pathscale patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for clang -AC_DEFUN([_AX_COMPILER_VERSION_CLANG],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __clang_major__,, - AC_MSG_FAILURE([[[$0]] unknown clang major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __clang_minor__,, - AC_MSG_FAILURE([[[$0]] unknown clang minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__clang_patchlevel__],,0) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for crayc -AC_DEFUN([_AX_COMPILER_VERSION_CRAY],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - _RELEASE,, - AC_MSG_FAILURE([[[$0]] unknown crayc release])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _RELEASE_MINOR,, - AC_MSG_FAILURE([[[$0]] unknown crayc minor])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for fujitsu -AC_DEFUN([_AX_COMPILER_VERSION_FUJITSU],[ - AC_COMPUTE_INT(ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - __FCC_VERSION,, - AC_MSG_WARN([[[$0]] unknown fujitsu release]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="") - ]) - -# for GNU -AC_DEFUN([_AX_COMPILER_VERSION_GNU],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __GNUC__,, - AC_MSG_FAILURE([[[$0]] unknown gcc major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __GNUC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown gcc minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__GNUC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown gcc patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# For sun -AC_DEFUN([_AX_COMPILER_VERSION_SUN],[ - m4_define([_AX_COMPILER_VERSION_SUN_NUMBER], - [ - #if defined(__SUNPRO_CC) - __SUNPRO_CC - #else - __SUNPRO_C - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59, - !!(_AX_COMPILER_VERSION_SUN_NUMBER < 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_until59" = X1], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x10) % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _AX_COMPILER_VERSION_SUN_NUMBER % 0x10,, - AC_MSG_FAILURE([[[$0]] unknown sun patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x100) % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown sun minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_SUN_NUMBER / 0x1000),, - AC_MSG_FAILURE([[[$0]] unknown sun major version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" -]) - -AC_DEFUN([_AX_COMPILER_VERSION_HP],[ - m4_define([_AX_COMPILER_VERSION_HP_NUMBER], - [ - #if defined(__HP_cc) - __HP_cc - #else - __HP_aCC - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121, - !!(_AX_COMPILER_VERSION_HP_NUMBER <= 1),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_untilA0121" = X1], - [dnl By default output last version with this behavior. - dnl it is so old - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="01.21.00" - ], - [dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_HP_NUMBER % 100),, - AC_MSG_FAILURE([[[$0]] unknown hp release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_HP_NUMBER / 100)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_HP_NUMBER / 10000)%100),, - AC_MSG_FAILURE([[[$0]] unknown hp major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) -]) - -AC_DEFUN([_AX_COMPILER_VERSION_DEC],[dnl - m4_define([_AX_COMPILER_VERSION_DEC_NUMBER], - [ - #if defined(__DECC_VER) - __DECC_VER - #else - __DECCXX_VER - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - (_AX_COMPILER_VERSION_DEC_NUMBER % 10000),, - AC_MSG_FAILURE([[[$0]] unknown dec release version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 100000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - ((_AX_COMPILER_VERSION_DEC_NUMBER / 10000000UL)%100),, - AC_MSG_FAILURE([[[$0]] unknown dec major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# borland -AC_DEFUN([_AX_COMPILER_VERSION_BORLAND],[dnl - m4_define([_AX_COMPILER_VERSION_TURBOC_NUMBER], - [ - #if defined(__TURBOC__) - __TURBOC__ - #else - choke me - #endif - ]) - m4_define([_AX_COMPILER_VERSION_BORLANDC_NUMBER], - [ - #if defined(__BORLANDC__) - __BORLANDC__ - #else - __CODEGEARC__ - #endif - ]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM(, - _AX_COMPILER_VERSION_TURBOC_NUMBER)], - [dnl TURBOC - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw, - _AX_COMPILER_VERSION_TURBOC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown turboc version])) - AS_IF( - [test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -lt 661 || test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw -gt 1023], - [dnl compute normal version - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _AX_COMPILER_VERSION_TURBOC_NUMBER % 0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc minor version])) - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_AX_COMPILER_VERSION_TURBOC_NUMBER/0x100)%0x100,, - AC_MSG_FAILURE([[[$0]] unknown turboc major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor"], - [dnl special version - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_turboc_raw], - [661],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.00"], - [662],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:1.01"], - [663],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="0turboc:2.00"], - [ - AC_MSG_WARN([[[$0]] unknown turboc version between 0x295 and 0x400 please report bug]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="" - ]) - ]) - ], - # borlandc - [ - AC_COMPUTE_INT( - _ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw, - _AX_COMPILER_VERSION_BORLANDC_NUMBER,, - AC_MSG_FAILURE([[[$0]] unknown borlandc version])) - AS_CASE([$_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw], - dnl BORLANDC++ before 5.5 - [512] ,[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:2.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1024],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.00"], - [1040],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:3.1"], - [1106],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:4.0"], - [1280],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.0"], - [1312],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="1borlanc:5.02"], - dnl C++ Builder era - [1328],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:3.0"], - [1344],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="2cppbuilder:4.0"], - dnl BORLANDC++ after 5.5 - [1360],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.5"], - [1361],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.51"], - [1378],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="3borlancpp:5.6.4"], - dnl C++ Builder with year number - [1392],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2006"], - [1424],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2007"], - [1555],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2009"], - [1569],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="4cppbuilder:2010"], - dnl XE version - [1584],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe"], - [1600],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:2"], - [1616],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:3"], - [1632],[ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="5xe:4"], - [ - AC_MSG_WARN([[[$0]] Unknown borlandc compiler version $_ax_[]_AC_LANG_ABBREV[]_compiler_version_borlandc_raw please report bug]) - ]) - ]) - ]) - -# COMO -AC_DEFUN([_AX_COMPILER_VERSION_COMEAU], - [ dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [__COMO_VERSION__%100],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__COMO_VERSION__/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown comeau compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# KAI -AC_DEFUN([_AX_COMPILER_VERSION_KAI],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__KCC_VERSION%100],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(__KCC_VERSION/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(__KCC_VERSION/1000)%10],, - AC_MSG_FAILURE([[[$0]] unknown kay compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -dnl LCC -dnl LCC does not output version... - -# SGI -AC_DEFUN([_AX_COMPILER_VERSION_SGI],[ - m4_define([_AX_COMPILER_VERSION_SGI_NUMBER], - [ - #if defined(_COMPILER_VERSION) - _COMPILER_VERSION - #else - _SGI_COMPILER_VERSION - #endif - ]) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [_AX_COMPILER_VERSION_SGI_NUMBER%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - [(_AX_COMPILER_VERSION_SGI_NUMBER/10)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - [(_AX_COMPILER_VERSION_SGI_NUMBER/100)%10],, - AC_MSG_FAILURE([[[$0]] unknown SGI compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# microsoft -AC_DEFUN([_AX_COMPILER_VERSION_MICROSOFT],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - _MSC_VER%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (_MSC_VER/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler major version])) - dnl could be overridden - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0 - _ax_[]_AC_LANG_ABBREV[]_compiler_version_build=0 - # special case for version 6 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X12"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - _ax_[]_AC_LANG_ABBREV[]_compiler_version_patch=0)]) - # for version 7 - AS_IF([test "X$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major" = "X13"], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%1000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - # for version > 8 - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 14], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - _MSC_FULL_VER%10000,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler patch version])) - ]) - AS_IF([test $_ax_[]_AC_LANG_ABBREV[]_compiler_version_major -ge 15], - [AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_build, - _MSC_BUILD,, - AC_MSG_FAILURE([[[$0]] unknown microsoft compiler build version])) - ]) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_build" - ]) - -# for metrowerks -AC_DEFUN([_AX_COMPILER_VERSION_METROWERKS],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - __MWERKS__%0x100,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler patch version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - (__MWERKS__/0x100)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__MWERKS__/0x1000)%0x10,, - AC_MSG_FAILURE([[[$0]] unknown metrowerks compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# for watcom -AC_DEFUN([_AX_COMPILER_VERSION_WATCOM],[dnl - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __WATCOMC__%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler minor version])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - (__WATCOMC__/100)%100,, - AC_MSG_FAILURE([[[$0]] unknown watcom compiler major version])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor" - ]) - -# for PGI -AC_DEFUN([_AX_COMPILER_VERSION_PORTLAND],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - __PGIC__,, - AC_MSG_FAILURE([[[$0]] unknown pgi major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - __PGIC_MINOR__,, - AC_MSG_FAILURE([[[$0]] unknown pgi minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [__PGIC_PATCHLEVEL__],, - AC_MSG_FAILURE([[[$0]] unknown pgi patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# tcc -AC_DEFUN([_AX_COMPILER_VERSION_TCC],[ - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=[`tcc -v | $SED 's/^[ ]*tcc[ ]\+version[ ]\+\([0-9.]\+\).*/\1/g'`] - ]) - -# for GNU -AC_DEFUN([_AX_COMPILER_VERSION_SDCC],[ - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_major, - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_MAJOR)) - __SDCC_VERSION_MAJOR - #else - SDCC/100 - #endif - ,, - AC_MSG_FAILURE([[[$0]] unknown sdcc major])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor, - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_MINOR)) - __SDCC_VERSION_MINOR - #else - (SDCC%100)/10 - #endif - ,, - AC_MSG_FAILURE([[[$0]] unknown sdcc minor])) - AC_COMPUTE_INT(_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch, - [ - /* avoid parse error with comments */ - #if(defined(__SDCC_VERSION_PATCH)) - __SDCC_VERSION_PATCH - #elsif(defined(_SDCC_VERSION_PATCHLEVEL)) - __SDCC_VERSION_PATCHLEVEL - #else - SDCC%10 - #endif - ],, - AC_MSG_FAILURE([[[$0]] unknown sdcc patch level])) - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version="$_ax_[]_AC_LANG_ABBREV[]_compiler_version_major.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_minor.$_ax_[]_AC_LANG_ABBREV[]_compiler_version_patch" - ]) - -# main entry point -AC_DEFUN([AX_COMPILER_VERSION],[dnl - AC_REQUIRE([AX_COMPILER_VENDOR]) - AC_REQUIRE([AC_PROG_SED]) - AC_CACHE_CHECK([for _AC_LANG compiler version], - ax_cv_[]_AC_LANG_ABBREV[]_compiler_version, - [ dnl - AS_CASE([${ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor%/*}], - [intel], [_AX_COMPILER_VERSION_INTEL], - [ibm], [_AX_COMPILER_VERSION_IBM], - [pathscale], [_AX_COMPILER_VERSION_PATHSCALE], - [clang], [_AX_COMPILER_VERSION_CLANG], - [cray], [_AX_COMPILER_VERSION_CRAY], - [fujitsu], [_AX_COMPILER_VERSION_FUJITSU], - [gnu], [_AX_COMPILER_VERSION_GNU], - [sun], [_AX_COMPILER_VERSION_SUN], - [hp], [_AX_COMPILER_VERSION_HP], - [dec], [_AX_COMPILER_VERSION_DEC], - [borland], [_AX_COMPILER_VERSION_BORLAND], - [comeau], [_AX_COMPILER_VERSION_COMEAU], - [kai], [_AX_COMPILER_VERSION_KAI], - [sgi], [_AX_COMPILER_VERSION_SGI], - [microsoft], [_AX_COMPILER_VERSION_MICROSOFT], - [metrowerks],[_AX_COMPILER_VERSION_METROWERKS], - [watcom], [_AX_COMPILER_VERSION_WATCOM], - [portland], [_AX_COMPILER_VERSION_PORTLAND], - [tcc], [_AX_COMPILER_VERSION_TCC], - [sdcc], [_AX_COMPILER_VERSION_SDCC], - [ax_cv_[]_AC_LANG_ABBREV[]_compiler_version=""]) - ]) -]) diff -Nru opari2-2.0.5/vendor/common/build-config/m4/ax_config_subdir.m4 opari2-2.0.6/vendor/common/build-config/m4/ax_config_subdir.m4 --- opari2-2.0.5/vendor/common/build-config/m4/ax_config_subdir.m4 2019-07-26 09:16:11.545169511 +0000 +++ opari2-2.0.6/vendor/common/build-config/m4/ax_config_subdir.m4 1970-01-01 00:00:00.000000000 +0000 @@ -1,287 +0,0 @@ -# -# SYNOPSIS -# -# AX_CONFIG_SUBDIR(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) -# AX_CONFIG_SUBDIR_IMMEDIATE(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) -# -# -# DESCRIPTION -# -# These macros allow to configure packages in subdirectories using -# custom arguments. They are intended as a replacement of -# AC_CUSTOM_SUBDIRS if custom arguments need to be provided to the -# sub-configures. They build on AC_CUSTOM_SUBDIRS code that was -# copy-pasted from autoconf's status.m4 and slightly modified. In -# contrast to AC_CUSTOM_SUBDIRS you call this macros with a single -# directory DIR-ARGUMENTS tuple at a time. Ensures that DIR is -# unique. As in AC_CUSTOM_SUBDIRS, ARGUMENTS are adjusted (relative -# name for the cache file, relative name for the source directory), -# the current value of $prefix is propagated, including if it was -# defaulted, and --disable-option-checking is prepended to silence -# warnings, since different subdirs can have different --enable and -# --with options. Use this macros inside a conditional to control -# the execution of the nested configure at runtime. A list of -# runtime directories ax_config_subdirs is provided via AC_SUBST. -# DIR should be a literal to allow for proper execution of -# 'configure --help=recursive'. By default, 'configure -# --help=recursive' will recurse into DIR. To prevent this, pass -# DISABLE_HELP_RECURSIVE as third parameter. -# -# AX_CONFIG_SUBDIR emits code that might invoke a nested configure -# at AC_CONFIG_COMMANDS_POST time in directory DIR (if existent) -# with arguments ARGUMENTS. -# -# AX_CONFIG_SUBDIR_IMMEDIATE emits code that might invoke a nested -# configure immediatly in directory DIR (if existent) with -# arguments ARGUMENTS. -# -# -# LICENSE -# -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. -# Copyright (c) 2016-2017, Christian Feld -# -# This file is based on parts of autoconf's (version 2.69) -# status.m4. This program is free software; you can redistribute it -# and/or modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation, either version 3 of -# the License, or (at your option) any later version. -# - - -# AX_CONFIG_SUBDIR(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) -# ----------------------------------------------------------- -# -AC_DEFUN([AX_CONFIG_SUBDIR], -dnl -_AX_CONFIG_SUBDIR_COMMON($1, $2, $3)dnl -dnl -dnl increment macro-invocation counter -[m4_pushdef([_AX_CONFIG_SUBDIR_COUNT], m4_incr(_AX_CONFIG_SUBDIR_COUNT))]dnl -dnl -dnl Add empty ax_config_subdir_dir/args_ variables to DEFAULTS section -[m4_divert_text([DEFAULTS], -[ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]= -ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]=])]dnl -dnl -dnl Assign runtime values to ax_config_subdir_dir/args_ variables. -[ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]="$1"] -[ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]="$2"] -dnl -dnl Append code to _AX_CONFIG_SUBDIRS_RUN to execute configure script -dnl in $1 if AX_CONFIG_SUBDIR was called at runtime. -[m4_append([_AX_CONFIG_SUBDIRS_RUN], -AS_IF([test "x${no_recursion}" != xyes && - test "x${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}" != x && - test -d "${srcdir}/${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}"], - [ax_fn_config_subdir "${ax_config_subdir_dir_[]_AX_CONFIG_SUBDIR_COUNT[]}" "${ax_config_subdir_args_[]_AX_CONFIG_SUBDIR_COUNT[]}"]) -)]dnl -dnl -dnl Provide list of runtime-subdirs to Makefile. -[AC_SUBST([ax_config_subdirs], ["${ax_config_subdirs} m4_normalize([$1])"])]dnl -)# AX_CONFIG_SUBDIR - - -# AX_CONFIG_SUBDIR_IMMEDIATE(DIR, ARGUMENTS [, DISABLE_HELP_RECURSIVE]) -# --------------------------------------------------------------------- -# -AC_DEFUN([AX_CONFIG_SUBDIR_IMMEDIATE], -dnl -_AX_CONFIG_SUBDIR_COMMON($1, $2, $3)dnl -dnl -AS_IF([test "x${no_recursion}" != xyes && test -d "${srcdir}/$1"], - [ax_fn_config_subdir "$1" "$2"]) -dnl -dnl Provide list of runtime-subdirs to Makefile. -[AC_SUBST([ax_config_subdirs], ["${ax_config_subdirs} m4_normalize([$1])"])]dnl -)# AX_CONFIG_SUBDIR_IMMEDIATE - - -# _AX_CONFIG_SUBDIR_COMMON -# ------------------------ -# Functionality common to AX_CONFIG_SUBDIR and AX_CONFIG_SUBDIR_IMMEDIATE. -# -m4_define([_AX_CONFIG_SUBDIR_COMMON], -[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])]dnl -[AC_REQUIRE([AC_DISABLE_OPTION_CHECKING])]dnl -[AC_REQUIRE([_AX_CONFIG_SUBDIR_INIT])]dnl -dnl -dnl Two argument required -[m4_ifblank([$1], [m4_fatal([Macro requires at least two arguments])])]dnl -[m4_ifblank([$2], [m4_fatal([Macro requires at least two arguments])])]dnl -dnl -[AS_LITERAL_IF([$1], [], - [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl -dnl -dnl Prevent multiple registration of DIR. -[_AX_CONFIG_SUBDIR_UNIQUE(_AC_CONFIG_COMPUTE_DEST($1))]dnl -dnl -dnl Append DIR to _AC_LIST_SUBDIRS which defines ac_subdirs_all. This -dnl list is used for recursive help output only. Note that with a -dnl separate AX list and using the HELP_END diversion it is not -dnl possible to generate our own recursive help output as configure -dnl exits after ac_subdirs_all is processed. I (CF) did not find a -dnl way to move my code before the generic processing. Prevent -dnl recursive help if $3 is given. -[m4_ifblank([$3], [m4_append([_AC_LIST_SUBDIRS], [$1], [ -])])]dnl -)# _AX_CONFIG_SUBDIR_COMMON - - -# _AX_CONFIG_SUBDIR_INIT -# ------------------------- -# -AC_DEFUN_ONCE([_AX_CONFIG_SUBDIR_INIT], -dnl initialize macro-invocation counter -[m4_pushdef([_AX_CONFIG_SUBDIR_COUNT], 0)]dnl -[m4_append([_AX_CONFIG_SUBDIRS_RUN], -# Execute subdir configures defined via AX_CONFIG_SUBDIR. -# -# Do not complain if ax_config_subdir_dir is missing, so a configure -# script can configure whichever parts of a large source tree are -# present. -)]dnl -dnl Run configures after config.status creation -AC_CONFIG_COMMANDS_POST([_AX_CONFIG_SUBDIRS_RUN])dnl -_AX_CONFIG_SUBDIR_DEFINE_FN -)# _AX_CONFIG_SUBDIR_INIT - - -# _AX_CONFIG_SUBDIR_UNIQUE(DIR) -# ----------------------------- -# See also _AC_CONFIG_UNIQUE in status.m4. Prevent multiple usage of -# DIR in AC_CONFIG_SUBDIRS or AX_CONFIG_SUBDIR. Note that if DIR was -# defined in AX_CONFIG_SUBDIR first, using DIR in AC_CONFIG_SUBDIRS -# will issue a wrong error message ('... is already registered with -# AC_CONFIG_SUBDIRS.'). -# -m4_define([_AX_CONFIG_SUBDIR_UNIQUE], -dnl Abort if DIR was already defined with AX_CONFIG_SUBDIR -[m4_ifdef([_AX_CONFIG_SUBDIR_SEEN_TAG($1)], - [m4_fatal([`$1' is already registered with AX_CONFIG_SUBDIR])])]dnl -dnl Abort if DIR was already defined with AC_CONFIG_SUBDIRS -[m4_ifdef([_AC_SEEN_TAG($1)], - [m4_fatal([`$1' is already registered with AC_CONFIG_]m4_defn( - [_AC_SEEN_TAG($1)]).)])]dnl -dnl Make DIR unique -[m4_define([_AC_SEEN_TAG($1)], [SUBDIRS])]dnl -[m4_define([_AX_CONFIG_SUBDIR_SEEN_TAG($1)])]dnl -)# _AX_CONFIG_SUBDIR_UNIQUE(DIR) - - -# _AX_CONFIG_SUBDIR_DEFINE_FN -# --------------------------- -# Define a shell function to call configures in subdirectories with -# custom arguments. -# -m4_define([_AX_CONFIG_SUBDIR_DEFINE_FN], -[AS_REQUIRE_SHELL_FN([ax_fn_config_subdir], - [AS_FUNCTION_DESCRIBE([ax_fn_config_subdir], [], - [trigger configure in ax_subdir with arguments ax_subdir_args. Adjusts -parameters by updating --cache-file, --srcdir, --prefix, and adding ---disable-option-checking as in AC_CONFIG_SUBIRS.])], -[dnl body to expand -ax_subdir="$[]1" -ax_subdir_args="$[]2" - -# BEGIN: slightly modified snippet from status.m4 -# Remove --cache-file, --srcdir, --prefix, and -# --disable-option-checking arguments so they do not pile up. -# Input: ax_subdir_args; output: ax_sub_configure_args -ax_sub_configure_args= -ac_prev= -eval "set x $ax_subdir_args" -shift -for ac_arg -do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - --disable-option-checking) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`AS_ECHO(["$ac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; - esac - AS_VAR_APPEND([ax_sub_configure_args], [" '$ac_arg'"]) ;; - esac -done - -# Always prepend --prefix to ensure using the same prefix -# in subdir configurations. -ac_arg="--prefix=$prefix" -case $ac_arg in -*\'*) ac_arg=`AS_ECHO(["$ac_arg"]) | sed "s/'/'\\\\\\\\''/g"` ;; -esac -ax_sub_configure_args="'$ac_arg' $ax_sub_configure_args" - -# Pass --silent -if test "$silent" = yes; then - ax_sub_configure_args="--silent $ax_sub_configure_args" -fi - -# Always prepend --disable-option-checking to silence warnings, since -# different subdirs can have different --enable and --with options. -ax_sub_configure_args="--disable-option-checking $ax_sub_configure_args" - -ax_popdir=`pwd` - -ac_msg="=== configuring in $ax_subdir (`pwd`/$ax_subdir)" -_AS_ECHO_LOG([$ac_msg]) -_AS_ECHO([$ac_msg]) -AS_MKDIR_P(["$ax_subdir"]) -_AC_SRCDIRS(["$ax_subdir"]) - -cd "$ax_subdir" - -# Check for guested configure; otherwise get Cygnus style configure. -if test -f "$ac_srcdir/configure.gnu"; then - ax_sub_configure=$ac_srcdir/configure.gnu -elif test -f "$ac_srcdir/configure"; then - ax_sub_configure=$ac_srcdir/configure -elif test -f "$ac_srcdir/configure.in"; then - # This should be Cygnus configure. - ax_sub_configure=$ac_aux_dir/configure -else - AC_MSG_WARN([no configuration information is in $ax_subdir]) - ax_sub_configure= -fi - -# The recursion is here. -if test -n "$ax_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [[\\/]]* | ?:[[\\/]]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - AC_MSG_NOTICE([running $SHELL $ax_sub_configure $ax_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir]) - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ax_sub_configure\" $ax_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - AC_MSG_ERROR([$ax_sub_configure failed for $ax_subdir]) -fi - -cd "$ax_popdir" -# END: slightly modified snippet from status.m4])]dnl -)# _AX_CONFIG_SUBDIR_DEFINE_FN diff -Nru opari2-2.0.5/vendor/common/build-config/Makefile.inc.am opari2-2.0.6/vendor/common/build-config/Makefile.inc.am --- opari2-2.0.5/vendor/common/build-config/Makefile.inc.am 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/Makefile.inc.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -## -*- mode: makefile -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2011, 2015, 2017, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file vendor/common/build-config/Makefile.inc.am - -EXTRA_DIST = -BUILT_SOURCES = -CLEANFILES = -DISTCLEANFILES = - -# Testing framework -EXTRA_DIST += $(srcdir)/vendor/common/build-config/generate-config-backend-for-frontend.sh \ - $(srcdir)/vendor/common/build-config/generate-library-dependencies.sh \ - $(srcdir)/vendor/common/build-config/generate-library-dependencies-la-object.hpp \ - $(srcdir)/vendor/common/build-config/generate-library-version.sh \ - $(srcdir)/vendor/common/build-config/generate-package-version.sh \ - $(srcdir)/vendor/common/cutest/CuTest.c \ - $(srcdir)/vendor/common/cutest/CuTest.h \ - $(srcdir)/vendor/common/cutest/license.txt \ - $(srcdir)/vendor/common/cutest/README.txt - -DISTCLEANFILES += $(builddir)/config.summary -DISTCLEANFILES += $(builddir)/@PACKAGE@.summary - -CONFIG_STATUS_DEPENDENCIES = $(srcdir)/build-config/VERSION -CONFIGURE_DEPENDENCIES = $(srcdir)/build-config/VERSION - -prohibit-svn-files-in-dist: - @find $(top_distdir) -type d | grep "\.svn"; \ - if [ $$? -eq 0 ]; then \ - echo "ERROR: subversion files found in distribution. This is usually caused by"; \ - echo "referencing directories in EXTRA_DIST. Please specify the files that need"; \ - echo "to go into the distribution explicitly."; \ - exit 1; \ - fi - - -common-uninstall: - rm -rf $(DESTDIR)$(datadir)/@PACKAGE@ - - -SCOREP_RECURSIVE_TARGETS= - - -############################################################################### -## code beautification targets -## -if SVN_CONTROLLED -if HAVE_UNCRUSTIFY - -beautify-sp: - @$(am__cd) $(srcdir) && ./vendor/common/beautifier/beautify -beautify: beautify-recursive -SCOREP_RECURSIVE_TARGETS += beautify-recursive - -beautify-clean: - -endif # HAVE_UNCRUSTIFY -endif # SVN_CONTROLLED - ## - ## -############################################################################### - - -############################################################################### -## bitten targets, intended to be used from bitten only -## - -bitten-copy-tarball-to-prefix: $(distdir).tar.gz - $(MKDIR_P) $(DESTDIR)$(prefix) - $(INSTALL_DATA) $(distdir).tar.gz $(DESTDIR)$(prefix)/$(PACKAGE)-latest.tar.gz - -bitten-print-environment: - env - ## - ## -############################################################################### - - -############################################################################### -## trigger build of check_* targets here and in subdirectories. -## - -check-build-sp: $(BUILT_SOURCES) all-am $(check_PROGRAMS) $(check_LTLIBRARIES) -check-build: check-build-recursive -SCOREP_RECURSIVE_TARGETS += check-build-recursive - - ## - ## -############################################################################### - -$(SCOREP_RECURSIVE_TARGETS): -## Using $failcom allows "-k" to keep its natural meaning when running a -## recursive rule. - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-sp"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-sp" || exit 1; \ - fi; test -z "$$fail" diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-clang opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-clang --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-clang 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-clang 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=clang -CXX_FOR_BUILD=clang++ -F77_FOR_BUILD=flang -FC_FOR_BUILD=flang - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-gcc opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-gcc --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-gcc 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-gcc 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=gcc -CXX_FOR_BUILD=g++ -F77_FOR_BUILD=gfortran -FC_FOR_BUILD=gfortran - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-ibm opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-ibm --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-ibm 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-ibm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=xlc_r -CXX_FOR_BUILD=xlC_r -F77_FOR_BUILD=xlf_r -FC_FOR_BUILD=xlf_r - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-intel opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-intel --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-intel 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-intel 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=icc -CXX_FOR_BUILD=icpc -F77_FOR_BUILD=ifort -FC_FOR_BUILD=ifort - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-pgi opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-pgi --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-pgi 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-pgi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -CC_FOR_BUILD=pgcc -CXX_FOR_BUILD=pgc++ -F77_FOR_BUILD=pgfortran -FC_FOR_BUILD=pgfortran - -#CPPFLAGS_FOR_BUILD= -# Provide flags as 16.1 is broken with the default '-O2 -g'. -CFLAGS_FOR_BUILD=-O2 -gopt -CXXFLAGS_FOR_BUILD=-O2 -gopt -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-studio opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-studio --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-frontend-studio 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-frontend-studio 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=cc -CXX_FOR_BUILD=CC -F77_FOR_BUILD=f77 -FC_FOR_BUILD=f95 - -#CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD=-xO3 -CXXFLAGS_FOR_BUILD=-xO3 -FFLAGS_FOR_BUILD=-xO3 -FCFLAGS_FOR_BUILD=-xO3 -LDFLAGS_FOR_BUILD=-xO3 -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-bullxmpi opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-bullxmpi --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-bullxmpi 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-bullxmpi 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -MPICC=mpicc -#MPI_CFLAGS -MPICXX=mpicxx -#MPI_CXXFLAGS= -MPIF77=mpif77 -#MPI_FFLAGS= -MPIFC=mpif90 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lmpi_f77 -# FMPIOBJ = -# MPIEXTRA = -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-hp opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-hp --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-hp 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-hp 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -MPICC=mpicc -mpicc {CC} -#MPI_CFLAGS -MPICXX=mpiCC -mpicxx {CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -mpif77 {F77} -#MPI_FFLAGS= -MPIFC=mpif90 -mpif90 {FC} -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lhpmpi -# PMPILIB = -lpmpi -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-ibmpoe opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-ibmpoe --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-ibmpoe 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-ibmpoe 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -MPICC=mpcc_r -#MPI_CFLAGS -MPICXX=mpCC_r -#MPI_CXXFLAGS= -MPIF77=mpfort -#MPI_FFLAGS= -MPIFC=mpfort -qsuffix=f=f90 -qfree=f90 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi_ibm -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -MPICC=mpiicc -#MPI_CFLAGS -MPICXX=mpiicpc -#MPI_CXXFLAGS= -MPIF77=mpiifort -#MPI_FFLAGS= -MPIFC=mpiifort -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= -MPILIB_LDFLAGS=-Wc,-nolinkage - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lmpiif -# FMPIOBJ = -# MPIEXTRA = - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel2 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel2 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel2 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel2 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -cxx={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -f77={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -fc={FC} -#MPI_FCFLAGS= -MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX -#MPI_LDFLAGS= -#MPI_LIBS= -MPILIB_LDFLAGS=-Wc,-nolinkage - -# # Scalasca1 settings -# MPILIB = -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel3 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel3 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intel3 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intel3 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# Intel MPI 5.x and higher (implements MPI-3) - -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -cxx={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -f77={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -fc={FC} -#MPI_FCFLAGS= -MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX -#MPI_LDFLAGS= -#MPI_LIBS= -MPILIB_LDFLAGS=-Wc,-nolinkage - -# # Scalasca1 settings -# MPILIB = -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intelpoe opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intelpoe --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-intelpoe 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-intelpoe 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpcc -#MPI_CFLAGS -MPICXX=mpCC -#MPI_CXXFLAGS= -MPIF77=mpfort -#MPI_FFLAGS= -MPIFC=mpfort -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-lam opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-lam --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-lam 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-lam 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -#MPI_CFLAGS -MPICXX=mpiCC -#MPI_CXXFLAGS= -MPIF77=mpif77 -#MPI_FFLAGS= -MPIFC=mpif77 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -llam -# PMPILIB = -# FMPILIB = -llamf77mpi -# FMPIOBJ = -# MPIEXTRA = diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpibull2 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpibull2 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpibull2 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpibull2 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -cxx={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif90 -f77={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -f90={FC} -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lmpibinding_f77 -# FMPIOBJ = -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -CC={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -f77={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -f90={FC} -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpich -# PMPILIB = -lpmpich -# FMPILIB = -lfmpich -# FMPIOBJ = -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich2 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich2 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich2 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich2 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -cxx={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -f77={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -f90={FC} -#MPI_FCFLAGS= -MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpich -# PMPILIB = -# FMPILIB = -lfmpich -# FMPIOBJ = -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich3 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich3 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-mpich3 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-mpich3 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -cc={CC} -#MPI_CFLAGS -MPICXX=mpicxx -cxx={CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -fc={F77} -#MPI_FFLAGS= -MPIFC=mpif90 -fc={FC} -#MPI_FCFLAGS= -MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpich -# PMPILIB = -# FMPILIB = -lfmpich -# FMPIOBJ = -# MPIEXTRA = -DMPICH_IGNORE_CXX_SEEK -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-openmpi opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-openmpi --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-openmpi 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-openmpi 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -#MPI_CFLAGS -MPICXX=mpicxx -#MPI_CXXFLAGS= -MPIF77=mpif77 -#MPI_FFLAGS= -MPIFC=mpif90 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lmpi_f77 -# FMPIOBJ = -# MPIEXTRA = -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-openmpi3 opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-openmpi3 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-openmpi3 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-openmpi3 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -#MPI_CFLAGS -MPICXX=mpicxx -#MPI_CXXFLAGS= -MPIF77=mpif77 -#MPI_FFLAGS= -MPIFC=mpif90 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lmpi_f77 -# FMPIOBJ = -# MPIEXTRA = -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-platform opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-platform --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-platform 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-platform 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpicc -mpicc {CC} -#MPI_CFLAGS -MPICXX=mpiCC -mpicxx {CXX} -#MPI_CXXFLAGS= -MPIF77=mpif90 -mpif77 {F77} -#MPI_FFLAGS= -MPIFC=mpif90 -mpif90 {FC} -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lpcmpi -# PMPILIB = -lpmpi -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DHAS_MPI2_1SIDED -DNO_MPI_MISC diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-scali opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-scali --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-scali 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-scali 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -MPICC=mpicc -ccl {CC} -#MPI_CFLAGS -MPICXX=mpic++ -ccl {CXX} -#MPI_CXXFLAGS= -MPIF77=mpif77 -ccl {F77} -#MPI_FFLAGS= -MPIFC=mpif90 -ccl {FC} -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lfmpi -# FMPIOBJ = -# MPIEXTRA = -DHAS_MPI2_1SIDED - diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sgimpt opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sgimpt --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sgimpt 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sgimpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC={CC} -#MPI_CFLAGS -MPICXX={CXX} -#MPI_CXXFLAGS= -MPIF77={F77} -#MPI_FFLAGS= -MPIFC={FC} -#MPI_FCFLAGS= -MPI_CPPFLAGS=-DMPI_NO_CPPBIND -#MPI_LDFLAGS= -MPI_LIBS=-lmpi - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DSGI_MPT -DMPI_NO_CPPBIND -DHAS_MPI2_1SIDED diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -MPICC=mpicc -MPICXX=mpicxx -MPIF77=mpif77 -MPIFC=mpif90 diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-spectrum opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-spectrum --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-spectrum 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-spectrum 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpixlc -#MPI_CFLAGS -MPICXX=mpixlC -#MPI_CXXFLAGS= -MPIF77=mpixlf -#MPI_FFLAGS= -MPIFC=mpixlf -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi_ibm -# PMPILIB = -# FMPILIB = -lmpi_ibm_usempi -lmpi_ibm_mpifh -# FMPIOBJ = -# MPIEXTRA = diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sun opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sun --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-sun 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-sun 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -MPICC=mpcc -#MPI_CFLAGS -MPICXX=mpCC -#MPI_CXXFLAGS= -MPIF77=mpf77 -#MPI_FFLAGS= -MPIFC=mpf95 -#MPI_FCFLAGS= -#MPI_CPPFLAGS= -#MPI_LDFLAGS= -#MPI_LIBS= - -# # Scalasca1 settings -# MPILIB = -lmpi -# PMPILIB = -# FMPILIB = -lepk.ad.fmpi -# FMPIOBJ = libepk.ad.fmpi.a -# MPIEXTRA = -DHAS_MPI2_1SIDED -DNEED_F2C_CONV diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-without opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-without --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-mpi-without 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-mpi-without 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -# Don't provide MPICC and friends if the user specified --without-mpi. diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-clang opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-clang --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-clang 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-clang 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=clang -CXX=clang++ -F77=flang -FC=flang - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-gcc opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-gcc --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-gcc 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-gcc 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=gcc -CXX=g++ -F77=gfortran -FC=gfortran - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-ibm opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-ibm --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-ibm 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-ibm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=xlc_r -CXX=xlC_r -F77=xlf_r -FC=xlf_r - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-intel opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-intel --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-intel 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-intel 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=icc -CXX=icpc -F77=ifort -FC=ifort - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-pgi opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-pgi --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-pgi 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-pgi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -CC=pgcc -CXX=pgc++ -F77=pgfortran -FC=pgfortran - -#CPPFLAGS= -# Provide flags as 16.1 is broken with the default '-O2 -g'. -CFLAGS_FOR_BUILD=-O2 -gopt -CXXFLAGS_FOR_BUILD=-O2 -gopt -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-studio opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-studio --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-nocross-studio 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-nocross-studio 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=f77 -FC=f95 - -#CPPFLAGS= -CFLAGS=-xO3 -CXXFLAGS=-xO3 -FFLAGS=-xO3 -FCFLAGS=-xO3 -LDFLAGS=-xO3 -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openmpi opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openmpi --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openmpi 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openmpi 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -SHMEMCC=oshcc -#SHMEM_CFLAGS -SHMEMCXX=oshcc -#SHMEM_CXXFLAGS= -SHMEMF77=oshfort -#SHMEM_FFLAGS= -SHMEMFC=oshfort -#SHMEM_FCFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_LDFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=oshmem -SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openmpi3 opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openmpi3 --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openmpi3 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openmpi3 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -SHMEMCC=oshcc -#SHMEM_CFLAGS -SHMEMCXX=oshcxx -#SHMEM_CXXFLAGS= -SHMEMF77=oshfort -#SHMEM_FFLAGS= -SHMEMFC=oshfort -#SHMEM_FCFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_LDFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=oshmem -SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openshmem opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openshmem --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-openshmem 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-openshmem 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -SHMEMCC=oshcc -#SHMEM_CFLAGS -SHMEMCXX=oshcxx -#SHMEM_CXXFLAGS= -SHMEMF77=oshfort -#SHMEM_FFLAGS= -SHMEMFC=oshfort -#SHMEM_FCFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_LDFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=openshmem -SHMEM_NAME=OpenSHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-sgimpt opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-sgimpt --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-sgimpt 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-sgimpt 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -SHMEMCC={CC} -#SHMEM_CFLAGS -SHMEMCXX={CXX} -#SHMEM_CXXFLAGS= -SHMEMF77={F77} -#SHMEM_FFLAGS= -SHMEMFC={FC} -#SHMEM_FCFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_LDFLAGS= -SHMEM_LIBS=-lsma -lmpi -SHMEM_LIB_NAME=sma -SHMEM_NAME=SGI SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -SHMEMCC=oshcc -SHMEMCXX=oshCC -SHMEMF77=oshfort -SHMEMFC=oshfort -SHMEM_LIB_NAME=sma -SHMEM_NAME=SGI SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-spectrum opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-spectrum --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-spectrum 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-spectrum 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -SHMEMCC=oshcc -#SHMEM_CFLAGS -SHMEMCXX=oshc++ -#SHMEM_CXXFLAGS= -SHMEMF77=oshfort -#SHMEM_FFLAGS= -SHMEMFC=oshfort -#SHMEM_FCFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_LDFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=oshmem -SHMEM_NAME=IBM Spectrum MPI OpenSHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-without opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-without --- opari2-2.0.5/vendor/common/build-config/platforms/compiler-shmem-without 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/compiler-shmem-without 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -# Don't provide SHMEMCC and friends if the user specified --with-shmem=no. diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-aix opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-aix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-aix 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-aix 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=xlc_r -CXX=xlC_r -F77=xlf_r -FC=xlf95_r - -#CPPFLAGS= -#CFLAGS= -CXXFLAGS=-qrtti -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-altix opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-altix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-altix 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-altix 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=icc -CXX=icpc -F77=ifort -FC=ifort - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-arm opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-arm --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-arm 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-arm 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=gcc -CXX=g++ -F77=gfortran -FC=gfortran - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgl opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgl --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgl 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgl 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=blrts_xlc -CXX=blrts_xlC -F77=blrts_xlf -FC=blrts_xlf - -#CPPFLAGS= -#CFLAGS= -CXXFLAGS=-O3 -qarch=440 -qtune=440 -FFLAGS=-qsuppress=cmpmsg -FCFLAGS=-qfree=f90 -qsuffix=f=f90 -LDFLAGS=-L/bgl/BlueLight/ppcfloor/bglsys/lib -LIBS=-lmsglayer.rts -lrts.rts -ldevices.rts diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgp opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgp --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgp 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgp 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=bgxlc_r -CXX=bgxlC_r -F77=bgxlf_r -FC=bgxlf_r - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -FFLAGS=-qsuppress=cmpmsg -FCFLAGS=-qfree=f90 -qsuppress=cmpmsg -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgq opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgq --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-bgq 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-bgq 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=bgxlc_r -CXX=bgxlC_r -F77=bgxlf_r -FC=bgxlf_r - -#CPPFLAGS= -CFLAGS=-O3 -qstrict -CXXFLAGS=-O3 -qstrict -qminimaltoc -FFLAGS=-O3 -qstrict -qsuppress=cmpmsg -FCFLAGS=-O3 -qstrict -qfree=f90 -qsuppress=cmpmsg -LDFLAGS=-O3 -qstrict -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxc opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxc --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxc 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxc 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=ftn -FC=ftn - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxe opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxe --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxe 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxe 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=ftn -FC=ftn - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxk opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxk --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxk 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxk 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=ftn -FC=ftn - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxt opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxt --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-crayxt 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-crayxt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=ftn -FC=ftn - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-fx10 opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-fx10 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-fx10 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-fx10 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=fccpx -CXX=FCCpx -F77=frtpx -FC=frtpx - -#CPPFLAGS= -CFLAGS=-Xg -noansi -Ntl_notrt -mt -CXXFLAGS=-Xg -Ntl_notrt -mt -FFLAGS=-Ntl_notrt -mt -FCFLAGS=-Ntl_notrt -mt -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-fx100 opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-fx100 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-fx100 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-fx100 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=fccpx -CXX=FCCpx -F77=frtpx -FC=frtpx - -#CPPFLAGS= -CFLAGS=-Xg -noansi -Ntl_notrt -mt -CXXFLAGS=-Xg -Ntl_notrt -mt -FFLAGS=-Ntl_notrt -mt -FCFLAGS=-Ntl_notrt -mt -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-k opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-k --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-k 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-k 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=fccpx -CXX=FCCpx -F77=frtpx -FC=frtpx - -#CPPFLAGS= -CFLAGS=-Xg -noansi -Ntl_notrt -mt -CXXFLAGS=-Xg -Ntl_notrt -mt -FFLAGS=-Ntl_notrt -mt -FCFLAGS=-Ntl_notrt -mt -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-linux opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-linux --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-linux 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-linux 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=gcc -CXX=g++ -F77=gfortran -FC=gfortran - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mac opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mac --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mac 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mac 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=clang -CXX=clang++ -F77=flang -FC=flang - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mic opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mic --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mic 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mic 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=icc -mmic -CXX=icpc -mmic -F77=ifort -mmic -FC=ifort -mmic - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mingw opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mingw --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-mingw 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-mingw 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=gcc -CXX=g++ -F77=gfortran -FC=gfortran - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-necsx opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-necsx --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-necsx 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-necsx 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -# It is necessary to set this because "sxmpic++ -E" always tries to -# link and fails -#CPP="sxcc -E" - -CC=sxcc -CXX=sxc++ -F77=sxf90 -FC=sxf90 - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-solaris opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-solaris --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-solaris 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-solaris 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC=cc -CXX=CC -F77=f77 -FC=f95 - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-user-provided opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-user-provided --- opari2-2.0.5/vendor/common/build-config/platforms/platform-backend-user-provided 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-backend-user-provided 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC= -CXX= -F77= -FC= - -#CPPFLAGS= -#CFLAGS= -#CXXFLAGS= -#FFLAGS= -#FCFLAGS= -#LDFLAGS= -#LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-aix opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-aix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-aix 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-aix 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD=-qrtti -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-altix opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-altix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-altix 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-altix 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-arm opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-arm --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-arm 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-arm 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgl opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgl --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgl 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgl 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=xlc_r -CXX_FOR_BUILD=xlC_r -F77_FOR_BUILD=xlf_r -FC_FOR_BUILD=xlf_r - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD=-O2 -CXXFLAGS_FOR_BUILD=-O2 -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD=-O2 -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgp opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgp --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgp 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgp 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=xlc_r -q64 -CXX_FOR_BUILD=xlC_r -q64 -F77_FOR_BUILD=xlf_r -q64 -FC_FOR_BUILD=xlf_r -q64 - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD=-O2 -CXXFLAGS_FOR_BUILD=-O2 -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD=-O2 -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgq opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgq --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-bgq 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-bgq 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=xlc_r -q64 -CXX_FOR_BUILD=xlC_r -q64 -F77_FOR_BUILD=xlf_r -q64 -FC_FOR_BUILD=xlf_r -q64 - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD=-O2 -qsuppress=1500-030 -CXXFLAGS_FOR_BUILD=-O2 -qsuppress=1500-030 -FFLAGS_FOR_BUILD=-O2 -FCFLAGS_FOR_BUILD=-O2 -LDFLAGS_FOR_BUILD=-O2 -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxc opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxc --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxc 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxc 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=/usr/bin/gcc -CXX_FOR_BUILD=/usr/bin/g++ -F77_FOR_BUILD=/usr/bin/gfortran -FC_FOR_BUILD=/usr/bin/gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxe opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxe --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxe 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxe 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=/usr/bin/gcc -CXX_FOR_BUILD=/usr/bin/g++ -F77_FOR_BUILD=/usr/bin/gfortran -FC_FOR_BUILD=/usr/bin/gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxk opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxk --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxk 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxk 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=/usr/bin/gcc -CXX_FOR_BUILD=/usr/bin/g++ -F77_FOR_BUILD=/usr/bin/gfortran -FC_FOR_BUILD=/usr/bin/gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxt opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxt --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-crayxt 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-crayxt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=/usr/bin/gcc -CXX_FOR_BUILD=/usr/bin/g++ -F77_FOR_BUILD=/usr/bin/gfortran -FC_FOR_BUILD=/usr/bin/gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-fx10 opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-fx10 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-fx10 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-fx10 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=gcc -CXX_FOR_BUILD=g++ -F77_FOR_BUILD=gfortran -FC_FOR_BUILD=gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-fx100 opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-fx100 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-fx100 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-fx100 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=gcc -CXX_FOR_BUILD=g++ -F77_FOR_BUILD=gfortran -FC_FOR_BUILD=gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-k opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-k --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-k 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-k 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=gcc -CXX_FOR_BUILD=g++ -F77_FOR_BUILD=gfortran -FC_FOR_BUILD=gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-linux opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-linux --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-linux 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-linux 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mac opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mac --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mac 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mac 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mic opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mic --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mic 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mic 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=icc -CXX_FOR_BUILD=icpc -F77_FOR_BUILD=ifort -FC_FOR_BUILD=ifort - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mingw opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mingw --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-mingw 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-mingw 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-necsx opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-necsx --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-necsx 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-necsx 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD=gcc -CXX_FOR_BUILD=g++ -F77_FOR_BUILD=gfortran -FC_FOR_BUILD=gfortran - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-solaris opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-solaris --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-solaris 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-solaris 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# not a cross compile platform, frontend ignored - -#CC_FOR_BUILD= -#CXX_FOR_BUILD= -#F77_FOR_BUILD= -#FC_FOR_BUILD= - -#CPPFLAGS_FOR_BUILD= -#CFLAGS_FOR_BUILD= -#CXXFLAGS_FOR_BUILD= -#FFLAGS_FOR_BUILD= -#FCFLAGS_FOR_BUILD= -#LDFLAGS_FOR_BUILD= -#LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-user-provided opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-user-provided --- opari2-2.0.5/vendor/common/build-config/platforms/platform-frontend-user-provided 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-frontend-user-provided 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -CC_FOR_BUILD= -CXX_FOR_BUILD= -F77_FOR_BUILD= -FC_FOR_BUILD= - -CPPFLAGS_FOR_BUILD= -CFLAGS_FOR_BUILD= -CXXFLAGS_FOR_BUILD= -FFLAGS_FOR_BUILD= -FCFLAGS_FOR_BUILD= -LDFLAGS_FOR_BUILD= -LIBS_FOR_BUILD= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-aix opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-aix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-aix 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-aix 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpcc_r -MPICXX=mpCC_r -MPIF77=mpxlf_r -MPIFC=mpxlf90_r - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-altix opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-altix --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-altix 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-altix 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=icc -MPICXX=icpc -MPIF77=ifort -MPIFC=ifort - -#MPI_LDFLAGS= -MPI_LIBS=-lmpi -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-arm opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-arm --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-arm 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-arm 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# can't decide what would be a useful default. use --with-mpi - -#MPICC= -#MPICXX= -#MPIF77= -#MPIFC= - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgl opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgl --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgl 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgl 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=blrts_xlc -MPICXX=blrts_xlC -MPIF77=blrts_xlf -MPIFC=blrts_xlf - -MPI_LDFLAGS=-L/bgl/BlueLight/ppcfloor/bglsys/lib -MPI_LIBS=-lmpich.rts -MPI_CPPFLAGS=-I/bgl/BlueLight/ppcfloor/bglsys/include -#MPI_CFLAGS= -MPI_CXXFLAGS=-O3 -qarch=440 -qtune=440 -MPI_FFLAGS=-qsuppress=cmpmsg -MPI_FCFLAGS=-qfree=f90 -qsuffix=f=f90 -qsuppress=cmpmsg diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgp opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgp --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgp 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgp 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpixlc_r -MPICXX=mpixlcxx_r -MPIF77=mpixlf77_r -MPIFC=mpixlf95_r - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgq opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgq --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-bgq 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-bgq 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpixlc_r -MPICXX=mpixlcxx_r -MPIF77=mpixlf77_r -MPIFC=mpixlf95_r - -#MPI_CPPFLAGS= -MPI_CFLAGS=-O3 -qstrict -MPI_CXXFLAGS=-O3 -qstrict -qminimaltoc -MPI_FFLAGS=-O3 -qstrict -qsuppress=cmpmsg -MPI_FCFLAGS=-O3 -qstrict -qfree=f90 -qsuppress=cmpmsg -MPI_LDFLAGS=-O3 -qstrict -#MPI_LIBS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxc opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxc --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxc 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxc 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=cc -MPICXX=CC -MPIF77=ftn -MPIFC=ftn - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxe opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxe --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxe 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxe 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=cc -MPICXX=CC -MPIF77=ftn -MPIFC=ftn - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxk opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxk --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxk 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxk 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=cc -MPICXX=CC -MPIF77=ftn -MPIFC=ftn - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxt opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxt --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-crayxt 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-crayxt 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=cc -MPICXX=CC -MPIF77=ftn -MPIFC=ftn - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-fx10 opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-fx10 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-fx10 2019-07-26 09:16:11.637169797 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-fx10 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpifccpx -MPICXX=mpiFCCpx -MPIF77=mpifrtpx -MPIFC=mpifrtpx - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt -MPI_CXXFLAGS=-Xg -Ntl_notrt -mt -MPI_FFLAGS=-Ntl_notrt -mt -MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-fx100 opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-fx100 --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-fx100 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-fx100 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpifccpx -MPICXX=mpiFCCpx -MPIF77=mpifrtpx -MPIFC=mpifrtpx - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt -MPI_CXXFLAGS=-Xg -Ntl_notrt -mt -MPI_FFLAGS=-Ntl_notrt -mt -MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-k opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-k --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-k 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-k 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpifccpx -MPICXX=mpiFCCpx -MPIF77=mpifrtpx -MPIFC=mpifrtpx - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -MPI_CFLAGS=-Xg -noansi -Ntl_notrt -mt -MPI_CXXFLAGS=-Xg -Ntl_notrt -mt -MPI_FFLAGS=-Ntl_notrt -mt -MPI_FCFLAGS=-Ntl_notrt -mt diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-linux opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-linux --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-linux 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-linux 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# can't decide what would be a useful default. use --with-mpi - -#MPICC= -#MPICXX= -#MPIF77= -#MPIFC= - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-mac opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-mac --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-mac 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-mac 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# can't decide what would be a useful default. use --with-mpi - -#MPICC= -#MPICXX= -#MPIF77= -#MPIFC= - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-mic opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-mic --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-mic 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-mic 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -MPICC=mpiicc -mmic -MPICXX=mpiicpc -mmic -MPIF77=mpiifort -mmic -MPIFC=mpiifort -mmic -MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX -MPILIB_LDFLAGS=-Wc,-nolinkage - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-necsx opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-necsx --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-necsx 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-necsx 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=sxmpicc -MPICXX=sxmpic++ -MPIF77=sxmpif90 -MPIFC=sxmpif90 - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-solaris opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-solaris --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-solaris 2019-07-26 09:16:11.633169784 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-solaris 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC=mpcc -MPICXX=mpCC -MPIF77=mpf77 -MPIFC=mpf95 - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-user-provided opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-user-provided --- opari2-2.0.5/vendor/common/build-config/platforms/platform-mpi-user-provided 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-mpi-user-provided 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -MPICC= -MPICXX= -MPIF77= -MPIFC= - -#MPI_LDFLAGS= -#MPI_LIBS= -#MPI_CPPFLAGS= -#MPI_CFLAGS= -#MPI_CXXFLAGS= -#MPI_FFLAGS= -#MPI_FCFLAGS= diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxc opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxc --- opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxc 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxc 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -SHMEMCC=cc -SHMEMCXX=CC -SHMEMF77=ftn -SHMEMFC=ftn - -#SHMEM_LDFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_CFLAGS= -#SHMEM_CXXFLAGS= -#SHMEM_FFLAGS= -#SHMEM_FCFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=sma -SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxe opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxe --- opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxe 2019-07-26 09:16:11.641169809 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxe 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -SHMEMCC=cc -SHMEMCXX=CC -SHMEMF77=ftn -SHMEMFC=ftn - -#SHMEM_LDFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_CFLAGS= -#SHMEM_CXXFLAGS= -#SHMEM_FFLAGS= -#SHMEM_FCFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=sma -SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxk opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxk --- opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxk 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxk 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -SHMEMCC=cc -SHMEMCXX=CC -SHMEMF77=ftn -SHMEMFC=ftn - -#SHMEM_LDFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_CFLAGS= -#SHMEM_CXXFLAGS= -#SHMEM_FFLAGS= -#SHMEM_FCFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=sma -SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxt opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxt --- opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-crayxt 2019-07-26 09:16:11.645169822 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-crayxt 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -SHMEMCC=cc -SHMEMCXX=CC -SHMEMF77=ftn -SHMEMFC=ftn - -#SHMEM_LDFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_CFLAGS= -#SHMEM_CXXFLAGS= -#SHMEM_FFLAGS= -#SHMEM_FCFLAGS= -#SHMEM_LIBS= -SHMEM_LIB_NAME=sma -SHMEM_NAME=Cray SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-user-provided opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-user-provided --- opari2-2.0.5/vendor/common/build-config/platforms/platform-shmem-user-provided 2019-07-26 09:16:11.649169834 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms/platform-shmem-user-provided 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -SHMEMCC= -SHMEMCXX= -SHMEMF77= -SHMEMFC= - -#SHMEM_LDFLAGS= -#SHMEM_CPPFLAGS= -#SHMEM_CFLAGS= -#SHMEM_CXXFLAGS= -#SHMEM_FFLAGS= -#SHMEM_FCFLAGS= -# All libraries needed to link SHMEM applications. -# For example, add '-lsma -lmpi' to SHMEM_LIBS to use SGI SHMEM. -#SHMEM_LIBS= -# Name of the SHMEM library, e.g. 'sma' for SGI SHMEM. -# This name is used by the Score-P instrumenter to detect whether a -# SHMEM application is built. -#SHMEM_LIB_NAME= -SHMEM_NAME=SHMEM diff -Nru opari2-2.0.5/vendor/common/build-config/platforms.am opari2-2.0.6/vendor/common/build-config/platforms.am --- opari2-2.0.5/vendor/common/build-config/platforms.am 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/platforms.am 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -## -*- mode: makefile -*- - -## -## This file is part of the Score-P software (http://www.score-p.org) -## -## Copyright (c) 2009-2011, -## RWTH Aachen University, Germany -## -## Copyright (c) 2009-2011, -## Gesellschaft fuer numerische Simulation mbH Braunschweig, Germany -## -## Copyright (c) 2009-2014, 2019, -## Technische Universitaet Dresden, Germany -## -## Copyright (c) 2009-2011, -## University of Oregon, Eugene, USA -## -## Copyright (c) 2009-2014, 2017, -## Forschungszentrum Juelich GmbH, Germany -## -## Copyright (c) 2009-2011, -## German Research School for Simulation Sciences GmbH, Juelich/Aachen, Germany -## -## Copyright (c) 2009-2011, -## Technische Universitaet Muenchen, Germany -## -## This software may be modified and distributed under the terms of -## a BSD-style license. See the COPYING file in the package base -## directory for details. -## - -## file vendor/common/build-config/platforms.inc.am - -# Create platform entries for EXTRA_DIST using e.g.: -# cd vendor/common/build-config/platforms -# for i in *; do echo " \$(srcdir)/vendor/common/build-config/platforms/$i \\"; done - -EXTRA_DIST += $(srcdir)/vendor/common/build-config/process_arguments.awk \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-gcc \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-ibm \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-pgi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-studio \ - $(srcdir)/vendor/common/build-config/platforms/compiler-frontend-clang \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-bullxmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-hp \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-ibmpoe \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intel3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-intelpoe \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-lam \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpibull2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich2 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-mpich3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-openmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-openmpi3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-platform \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-scali \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sgimpt \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sgimptwrapper \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-spectrum \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-sun \ - $(srcdir)/vendor/common/build-config/platforms/compiler-mpi-without \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openmpi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openmpi3 \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-openshmem \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-sgimpt \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-sgimptwrapper \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-spectrum \ - $(srcdir)/vendor/common/build-config/platforms/compiler-shmem-without \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-gcc \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-ibm \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-intel \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-pgi \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-studio \ - $(srcdir)/vendor/common/build-config/platforms/compiler-nocross-clang \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-mingw \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-backend-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-mingw \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-frontend-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-altix \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-arm \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgl \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgp \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-bgq \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-aix \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-linux \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-mac \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-mic \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-necsx \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-solaris \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxk \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxe \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxt \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-crayxc \ - $(srcdir)/vendor/common/build-config/platforms/platform-shmem-user-provided \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-k \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-fx10 \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-fx100 \ - $(srcdir)/vendor/common/build-config/platforms/platform-mpi-user-provided - -CLEANFILES += $(builddir)/user_provided_configure_args \ - $(builddir)/mpi_compiler_suite \ - $(builddir)/mpi_compiler_suite_to_source diff -Nru opari2-2.0.5/vendor/common/build-config/process_arguments.awk opari2-2.0.6/vendor/common/build-config/process_arguments.awk --- opari2-2.0.5/vendor/common/build-config/process_arguments.awk 2019-07-26 09:16:11.629169772 +0000 +++ opari2-2.0.6/vendor/common/build-config/process_arguments.awk 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -# We assume that the order of the passed files is -# - frontend compilers -# - backend compilers -# - mpi compilers -# - user-provided arguments -# -# With this order we guarantee that user-provided binary arguments takes -# precedence. They just overwrite already existing binary arguments. -# -# iterate over the fields. if a field is of the form "key=value", store it in -# a map. subsequent insertions of the same key override the old -# value, e.g. the last insertion wins. -# -# fields not in "key=value" form are treated as unary arguments and are taken -# into account for the user-provided toplevel arguments only. - -{ - if (FILENAME == "user_provided_configure_args") { - gsub("'", "") - if ($0 == "") { - next - } - n = index($0, "=") - if (n != 0) { # line with at least one "=". Use first "=" as key-value separator - args_binary[substr($0, 1, n-1)] = substr($0, n+1) - } - else { - args_unary = "'" $0 "' " args_unary - } - } -# else if (FILENAME == "args_exported") { -# # HUH, it seems that exported values doesn't make it into configure -# # if I do a export CC=icc; ./configure then CC always equals gcc. -# # i.e. we can omit "args_exported" -# # don't put every exported symbol into the map but override only those -# # that were inserted by the platform defaults. -# n = split($0, split_array, "=") -# if (n == 2) { -# key = split_array[1] -# if (key in args_binary) { -# args_binary[key]=split_array[2] -# } -# } -# } - else { # FILENAME == "${ac_scorep_platform}" - if (index($0, "#") == 0) { # ! commented line - n = index($0, "=") - if (n != 0) { # line with at least one "=". Use first "=" as key-value separator - args_binary[substr($0, 1, n-1)] = substr($0, n+1) - } - } - } -} - - -function evaluate_placeholder(compiler) -{ - # e.g. transform MPICC="mpiicc -cc=${CC}" to MPICC="mpiicc -cc=gcc", - # assuming that CC=gcc - mpi_compiler = "MPI" compiler - pattern = "{" compiler "}" - if (mpi_compiler in args_binary) { - if (match(args_binary[mpi_compiler], pattern) != 0) { - sub(pattern, args_binary[compiler], args_binary[mpi_compiler]) - } - } - - # e.g. transform SHMEMCC={CC} to SHMEMCC="icc", - # assuming that CC=icc - shmem_compiler = "SHMEM" compiler - pattern = "{" compiler "}" - if (shmem_compiler in args_binary) { - if (match(args_binary[shmem_compiler], pattern) != 0) { - sub(pattern, args_binary[compiler], args_binary[shmem_compiler]) - } - } -} - - -END{ - evaluate_placeholder("CC") - evaluate_placeholder("CXX") - evaluate_placeholder("F77") - evaluate_placeholder("FC") - - # Concatenate the map's content into a "key=value" pair sequence, add the - # unary arguments and print it to stdout. - for (key in args_binary) { - result = "'" key "=" args_binary[key] "' " result - } - - print result args_unary -} - diff -Nru opari2-2.0.5/vendor/common/cutest/CuTest.c opari2-2.0.6/vendor/common/cutest/CuTest.c --- opari2-2.0.5/vendor/common/cutest/CuTest.c 2019-07-26 09:16:11.657169859 +0000 +++ opari2-2.0.6/vendor/common/cutest/CuTest.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,660 +0,0 @@ -#include - -#include -#include -#include -#include -#include -#include -#include - -#if defined( CUTEST_USE_COLOR ) && CUTEST_USE_COLOR -#include -#endif - -#include "CuTest.h" - -/*-------------------------------------------------------------------------* -* CuStr -*-------------------------------------------------------------------------*/ - -char* -CuStrAlloc( int size ) -{ - char* newStr = ( char* )malloc( sizeof( char ) * ( size ) ); - return newStr; -} - -char* -CuStrCopy( const char* old ) -{ - int len = strlen( old ); - char* newStr = CuStrAlloc( len + 1 ); - strcpy( newStr, old ); - return newStr; -} - -/*-------------------------------------------------------------------------* -* CuString -*-------------------------------------------------------------------------*/ - -void -CuStringInit( CuString* str ) -{ - str->length = 0; - str->size = STRING_MAX; - str->buffer = ( char* )malloc( sizeof( char ) * str->size ); - str->buffer[ 0 ] = '\0'; -} - -CuString* -CuStringNew( void ) -{ - CuString* str = ( CuString* )malloc( sizeof( CuString ) ); - CuStringInit( str ); - return str; -} - -void -CuStringClear( CuString* str ) -{ - if ( str ) - { - free( str->buffer ); - str->buffer = NULL; - } -} - -void -CuStringFree( CuString* str ) -{ - CuStringClear( str ); - free( str ); -} - -void -CuStringReset( CuString* str ) -{ - str->length = 0; - str->buffer[ 0 ] = '\0'; -} - -void -CuStringResize( CuString* str, - int newSize ) -{ - str->buffer = ( char* )realloc( str->buffer, sizeof( char ) * newSize ); - str->size = newSize; -} - -void -CuStringAppend( CuString* str, - const char* text ) -{ - int length; - - if ( text == NULL ) - { - text = "NULL"; - } - - length = strlen( text ); - if ( str->length + length + 1 >= str->size ) - { - CuStringResize( str, str->length + length + 1 + STRING_INC ); - } - str->length += length; - strcat( str->buffer, text ); -} - -void -CuStringAppendChar( CuString* str, - char ch ) -{ - char text[ 2 ]; - text[ 0 ] = ch; - text[ 1 ] = '\0'; - CuStringAppend( str, text ); -} - -void -CuStringAppendFormat( CuString* str, - const char* format, - ... ) -{ - va_list argp; - va_start( argp, format ); - CuStringAppendVFormat( str, format, argp ); - va_end( argp ); -} - -void -CuStringAppendVFormat( CuString* str, - const char* format, - va_list argp ) -{ - char buf[ HUGE_STRING_LEN ]; - vsprintf( buf, format, argp ); - CuStringAppend( str, buf ); -} - -void -CuStringInsert( CuString* str, - const char* text, - int pos ) -{ - int length = strlen( text ); - if ( pos > str->length ) - { - pos = str->length; - } - if ( str->length + length + 1 >= str->size ) - { - CuStringResize( str, str->length + length + 1 + STRING_INC ); - } - memmove( str->buffer + pos + length, str->buffer + pos, ( str->length - pos ) + 1 ); - str->length += length; - memcpy( str->buffer + pos, text, length ); -} - -/*-------------------------------------------------------------------------* -* CuTest -*-------------------------------------------------------------------------*/ -static void -CuTestAllreduceInternal( int* success ) -{ - return; -} - -void -CuTestInit( CuTest* t, - const char* name, - TestFunction function ) -{ - t->name = CuStrCopy( name ); - t->failed = 0; - t->ran = 0; - t->message = NULL; - t->function = function; - t->userArg = NULL; - t->testAllreduce = CuTestAllreduceInternal; - t->jumpBuf = NULL; - t->next = NULL; -} - -CuTest* -CuTestNew( const char* name, - TestFunction function ) -{ - CuTest* tc = CU_ALLOC( CuTest ); - CuTestInit( tc, name, function ); - return tc; -} - -void -CuTestClear( CuTest* t ) -{ - if ( t ) - { - free( ( char* )t->name ); - t->name = NULL; - } -} - -void -CuTestFree( CuTest* t ) -{ - CuTestClear( t ); - free( t ); -} - -void -CuTestRun( CuTest* tc ) -{ - jmp_buf buf; - tc->jumpBuf = &buf; - if ( setjmp( buf ) == 0 ) - { - tc->ran = 1; - ( tc->function )( tc ); - } - tc->jumpBuf = 0; -} - -static void -CuFailInternal( CuTest* tc, - const char* file, - int line, - CuString* string ) -{ - char buf[ HUGE_STRING_LEN ]; - - sprintf( buf, "%s:%d: ", file, line ); - CuStringInsert( string, buf, 0 ); - - tc->failed = 1; - tc->message = string->buffer; - if ( tc->jumpBuf != 0 ) - { - longjmp( *( tc->jumpBuf ), 1 ); - } -} - -void -CuFail_Line( CuTest* tc, - const char* file, - int line, - const char* message2, - const char* message ) -{ - CuString string; - - CuStringInit( &string ); - if ( message2 != NULL ) - { - CuStringAppend( &string, message2 ); - CuStringAppend( &string, ": " ); - } - CuStringAppend( &string, message ); - CuFailInternal( tc, file, line, &string ); - CuStringClear( &string ); -} - -void -CuAssert_Line( CuTest* tc, - const char* file, - int line, - const char* message, - int success ) -{ - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - CuFail_Line( tc, file, line, NULL, message ); -} - -void -CuAssertStrEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - const char* expected, - const char* actual ) -{ - CuString string; - int success = 0; - - if ( ( expected == NULL && actual == NULL ) || - ( expected != NULL && actual != NULL && - strcmp( expected, actual ) == 0 ) ) - { - success = 1; - } - - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - CuStringInit( &string ); - if ( message != NULL ) - { - CuStringAppend( &string, message ); - CuStringAppend( &string, ": " ); - } - CuStringAppend( &string, "expected <" ); - CuStringAppend( &string, expected ); - CuStringAppend( &string, "> but was <" ); - CuStringAppend( &string, actual ); - CuStringAppend( &string, ">" ); - CuFailInternal( tc, file, line, &string ); - CuStringClear( &string ); -} - -void -CuAssertIntEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - int expected, - int actual ) -{ - char buf[ STRING_MAX ]; - int success = 0; - - if ( expected == actual ) - { - success = 1; - } - - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - sprintf( buf, "expected <%d> but was <%d>", expected, actual ); - CuFail_Line( tc, file, line, message, buf ); -} - - -void -CuAssertIntNotEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - int notExpected, - int actual ) -{ - char buf[ STRING_MAX ]; - int success = 0; - - if ( notExpected != actual ) - { - success = 1; - } - - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - sprintf( buf, "Not expected <%d> but was <%d>", notExpected, actual ); - CuFail_Line( tc, file, line, message, buf ); -} - -void -CuAssertDblEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - double expected, - double actual, - double delta ) -{ - char buf[ STRING_MAX ]; - int success = 0; - - if ( fabs( expected - actual ) <= delta ) - { - success = 1; - } - - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - sprintf( buf, "expected <%lf> but was <%lf>", expected, actual ); - CuFail_Line( tc, file, line, message, buf ); -} - -void -CuAssertPtrEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - void* expected, - void* actual ) -{ - char buf[ STRING_MAX ]; - int success = 0; - - if ( expected == actual ) - { - success = 1; - } - - tc->failedLocally = !success; - - tc->testAllreduce( &success ); - if ( success ) - { - return; - } - - sprintf( buf, "expected pointer <%p> but was <%p>", expected, actual ); - CuFail_Line( tc, file, line, message, buf ); -} - - -/*-------------------------------------------------------------------------* -* CuSuite -*-------------------------------------------------------------------------*/ - -static char* color_red = ""; -static char* color_grn = ""; -static char* color_yel = ""; -static char* color_std = ""; - -void -CuUseColors( void ) -{ - if ( 0 != strcmp( getenv( "AM_COLOR_TESTS" ) ? getenv( "AM_COLOR_TESTS" ) : "", "no" ) - && 0 != strcmp( getenv( "TERM" ) ? getenv( "TERM" ) : "", "dumb" ) - && ( ( getenv( "AM_COLOR_TESTS" ) - && 0 == strcmp( getenv( "AM_COLOR_TESTS" ), "always" ) ) -#if defined( CUTEST_USE_COLOR ) && CUTEST_USE_COLOR - || isatty( STDOUT_FILENO ) -#endif - || 0 == system( "test -t 1" ) ) ) - { - color_red = "\033[31m"; - color_grn = "\033[32m"; - color_yel = "\033[33m"; - color_std = "\033[m"; - } -} - -void -CuSuiteInit( const char* name, - CuSuite* testSuite, - int currentRank, - TestAllreduce testAllreduce ) -{ - testSuite->name = CuStrCopy( name ); - testSuite->count = 0; - testSuite->failCount = 0; - testSuite->head = NULL; - testSuite->tail = &testSuite->head; - testSuite->currentRank = currentRank; - testSuite->masterRank = currentRank; - - if ( testAllreduce ) - { - testSuite->testAllreduce = testAllreduce; - /* determine the lowest rank and use this as the master rank */ - testSuite->testAllreduce( &testSuite->masterRank ); - } - else - { - testSuite->testAllreduce = CuTestAllreduceInternal; - } -} - -CuSuite* -CuSuiteNew( const char* name ) -{ - CuSuite* testSuite = CU_ALLOC( CuSuite ); - CuSuiteInit( name, testSuite, 0, NULL ); - return testSuite; -} - -CuSuite* -CuSuiteNewParallel( const char* name, - int currentRank, - TestAllreduce testAllreduce ) -{ - CuSuite* testSuite = CU_ALLOC( CuSuite ); - CuSuiteInit( name, testSuite, currentRank, testAllreduce ); - return testSuite; -} - -void -CuSuiteClear( CuSuite* testSuite ) -{ - if ( testSuite ) - { - CuTest* test = testSuite->head; - while ( test ) - { - CuTest* next = test->next; - CuTestFree( test ); - test = next; - } - - free( ( char* )testSuite->name ); - testSuite->name = NULL; - } -} - -void -CuSuiteFree( CuSuite* testSuite ) -{ - CuSuiteClear( testSuite ); - free( testSuite ); -} - -void -CuSuiteAdd( CuSuite* testSuite, - CuTest* testCase ) -{ - testCase->testAllreduce = testSuite->testAllreduce; - - *testSuite->tail = testCase; - testSuite->tail = &testCase->next; - testSuite->count++; -} - -void -CuSuiteAddSuite( CuSuite* testSuite, - CuSuite* testSuite2 ) -{ - if ( testSuite2->count ) - { - CuSuiteAdd( testSuite, testSuite2->head ); - /* need to adjust count in testSuite */ - testSuite->count += testSuite2->count - 1; - } - CuSuiteClear( testSuite2 ); -} - -void -CuSuiteRun( CuSuite* testSuite ) -{ - int i = 1; - CuTest* testCase = testSuite->head; - - if ( testSuite->masterRank == testSuite->currentRank ) - { - printf( "%s%s:%s\n", color_yel, testSuite->name, color_std ); - } - - while ( testCase ) - { - CuTestRun( testCase ); - - if ( testCase->failed ) - { - testSuite->failCount++; - - int isSerialTest = testSuite->testAllreduce == CuTestAllreduceInternal; - if ( isSerialTest ) - { - printf( " %sFAIL%s %d: %s: %s%s%s\n", color_red, color_std, - i, testCase->name, - color_red, testCase->message, color_std ); - } - else - { - if ( testCase->failedLocally ) - { - printf( " %sFAIL on Rank %d%s %d: %s: %s%s%s\n", - color_red, testSuite->currentRank, color_std, - i, testCase->name, - color_red, testCase->message, color_std ); - } - - int fakeBarrier = 0; - testSuite->testAllreduce( &fakeBarrier ); - } - break; - } - else - { - if ( testSuite->masterRank == testSuite->currentRank ) - { - printf( " %sok%s %d: %s\n", color_grn, color_std, - i, testCase->name ); - } - } - - testCase = testCase->next; - i++; - } -} - -void -CuSuiteSummary( CuSuite* testSuite, - CuString* details ) -{ - int runCount = 0; - const char* testWord; - - if ( testSuite->masterRank != testSuite->currentRank ) - { - return; - } - - if ( testSuite->failCount == 0 ) - { - testWord = testSuite->count == 1 ? "test" : "tests"; - CuStringAppendFormat( details, "%sOK%s (%d %s)\n", - color_grn, color_std, - testSuite->count, testWord ); - } - else - { - for ( CuTest* testCase = testSuite->head; - testCase; - testCase = testCase->next ) - { - if ( !testCase->ran ) - { - continue; - } - runCount++; - } - testWord = testSuite->failCount == 1 ? "test" : "tests"; - CuStringAppendFormat( details, "%sFAIL%s (%d %s)", - color_red, color_std, - testSuite->failCount, testWord ); - if ( runCount - testSuite->failCount ) - { - testWord = ( runCount - testSuite->failCount ) == 1 ? "test" : "tests"; - CuStringAppendFormat( details, " OK (%d %s)", runCount - testSuite->failCount, testWord ); - } - if ( testSuite->count - runCount ) - { - testWord = ( testSuite->count - runCount ) == 1 ? "test" : "tests"; - CuStringAppendFormat( details, " LEFT (%d %s)", testSuite->count - runCount, testWord ); - } - CuStringAppendFormat( details, "\n" ); - } -} diff -Nru opari2-2.0.5/vendor/common/cutest/CuTest.h opari2-2.0.6/vendor/common/cutest/CuTest.h --- opari2-2.0.5/vendor/common/cutest/CuTest.h 2019-07-26 09:16:11.657169859 +0000 +++ opari2-2.0.6/vendor/common/cutest/CuTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,224 +0,0 @@ -#ifndef CU_TEST_H -#define CU_TEST_H - -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -/* CuString */ - -char* -CuStrAlloc( int size ); -char* -CuStrCopy( const char* old ); - -#define CU_ALLOC( TYPE ) ( ( TYPE* )calloc( 1, sizeof( TYPE ) ) ) - -#define HUGE_STRING_LEN 8192 -#define STRING_MAX 256 -#define STRING_INC 256 - -typedef struct -{ - int length; - int size; - char* buffer; -} CuString; - -void -CuStringInit( CuString* str ); -CuString* -CuStringNew( void ); -void -CuStringClear( CuString* str ); -void -CuStringFree( CuString* str ); -void -CuStringReset( CuString* str ); -void -CuStringAppend( CuString* str, - const char* text ); -void -CuStringAppendChar( CuString* str, - char ch ); -void -CuStringAppendFormat( CuString* str, - const char* format, - ... ); -void -CuStringAppendVFormat( CuString* str, - const char* format, - va_list argp ); -void -CuStringInsert( CuString* str, - const char* text, - int pos ); -void -CuStringResize( CuString* str, - int newSize ); - -/* CuTest */ - -typedef struct CuTest CuTest; - -typedef void ( * TestFunction )( CuTest* ); -typedef void ( * TestAllreduce )( int* ); - -struct CuTest -{ - const char* name; - TestFunction function; - void* userArg; - TestAllreduce testAllreduce; - int failed; - int failedLocally; - int ran; - const char* message; - jmp_buf* jumpBuf; - struct CuTest* next; -}; - -void -CuTestInit( CuTest* t, - const char* name, - TestFunction function ); -CuTest* -CuTestNew( const char* name, - TestFunction function ); -void -CuTestClear( CuTest* t ); -void -CuTestFree( CuTest* t ); -void -CuTestRun( CuTest* tc ); - -/* Internal versions of assert functions -- use the public versions */ -void -CuFail_Line( CuTest* tc, - const char* file, - int line, - const char* message2, - const char* message ); -void -CuAssert_Line( CuTest* tc, - const char* file, - int line, - const char* message, - int success ); -void -CuAssertStrEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - const char* expected, - const char* actual ); -void -CuAssertIntEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - int expected, - int actual ); - -void -CuAssertIntNotEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - int notExpected, - int actual ); -void -CuAssertDblEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - double expected, - double actual, - double delta ); -void -CuAssertPtrEquals_LineMsg( CuTest* tc, - const char* file, - int line, - const char* message, - void* expected, - void* actual ); - -/* public assert functions */ - -#define __CuStringify( x ) #x -#define _CuStringify( x ) __CuStringify( x ) -#define CuFail( tc, ms ) CuFail_Line( ( tc ), __FILE__, __LINE__, NULL, ( ms ) ) -#define CuAssert( tc, ms, cond ) CuAssert_Line( ( tc ), __FILE__, __LINE__, ms ": " _CuStringify( cond ), ( cond ) ) -#define CuAssertTrue( tc, cond ) CuAssert_Line( ( tc ), __FILE__, __LINE__, "assert failed", ( cond ) ) - -#define CuAssertStrEquals( tc, ex, ac ) CuAssertStrEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) -#define CuAssertStrEqualsMsg( tc, ms, ex, ac ) CuAssertStrEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) -#define CuAssertIntNotEquals( tc, nex, ac ) CuAssertIntNotEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( nex ), ( ac ) ) -#define CuAssertIntNotEqualsMsg( tc, ms, nex, ac ) CuAssertIntNotEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( nex ), ( ac ) ) -#define CuAssertIntEquals( tc, ex, ac ) CuAssertIntEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) -#define CuAssertIntEqualsMsg( tc, ms, ex, ac ) CuAssertIntEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) -#define CuAssertDblEquals( tc, ex, ac, dl ) CuAssertDblEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ), ( dl ) ) -#define CuAssertDblEqualsMsg( tc, ms, ex, ac, dl ) CuAssertDblEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ), ( dl ) ) -#define CuAssertPtrEquals( tc, ex, ac ) CuAssertPtrEquals_LineMsg( ( tc ), __FILE__, __LINE__, NULL, ( ex ), ( ac ) ) -#define CuAssertPtrEqualsMsg( tc, ms, ex, ac ) CuAssertPtrEquals_LineMsg( ( tc ), __FILE__, __LINE__, ( ms ), ( ex ), ( ac ) ) - -#define CuAssertPtrNotNull( tc, p ) CuAssert_Line( ( tc ), __FILE__, __LINE__, "null pointer unexpected", ( p != NULL ) ) -#define CuAssertPtrNotNullMsg( tc, msg, p ) CuAssert_Line( ( tc ), __FILE__, __LINE__, ( msg ), ( p != NULL ) ) - -/* CuSuite */ - -#define SUITE_ADD_TEST( SUITE, TEST ) CuSuiteAdd( SUITE, CuTestNew( _CuStringify( TEST ), TEST ) ) -#define SUITE_ADD_TEST_NAME( SUITE, TEST, NAME ) CuSuiteAdd( SUITE, CuTestNew( NAME, TEST ) ) - -typedef struct -{ - const char* name; - int count; - CuTest* head; - CuTest** tail; - int failCount; - - int currentRank; - int masterRank; - TestAllreduce testAllreduce; -} CuSuite; - - -void -CuUseColors( void ); - -void -CuSuiteInit( const char* name, - CuSuite* testSuite, - int currentRank, - TestAllreduce testAllreduce ); -CuSuite* -CuSuiteNew( const char* name ); -CuSuite* -CuSuiteNewParallel( const char* name, - int currentRank, - TestAllreduce testAllreduce ); -void -CuSuiteClear( CuSuite* testSuite ); -void -CuSuiteFree( CuSuite* testSuite ); -void -CuSuiteAdd( CuSuite* testSuite, - CuTest* testCase ); -void -CuSuiteAddSuite( CuSuite* testSuite, - CuSuite* testSuite2 ); -void -CuSuiteRun( CuSuite* testSuite ); -void -CuSuiteSummary( CuSuite* testSuite, - CuString* summary ); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* CU_TEST_H */ diff -Nru opari2-2.0.5/vendor/common/cutest/license.txt opari2-2.0.6/vendor/common/cutest/license.txt --- opari2-2.0.5/vendor/common/cutest/license.txt 2019-07-26 09:16:11.657169859 +0000 +++ opari2-2.0.6/vendor/common/cutest/license.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -NOTE - -The license is based on the zlib/libpng license. For more details see -http://www.opensource.org/licenses/zlib-license.html. The intent of the -license is to: - -- keep the license as simple as possible -- encourage the use of CuTest in both free and commercial applications - and libraries -- keep the source code together -- give credit to the CuTest contributors for their work - -If you ship CuTest in source form with your source distribution, the -following license document must be included with it in unaltered form. -If you find CuTest useful we would like to hear about it. - -LICENSE - -Copyright (c) 2003 Asim Jalis - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software in -a product, an acknowledgment in the product documentation would be -appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and must not -be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. diff -Nru opari2-2.0.5/vendor/common/cutest/README.txt opari2-2.0.6/vendor/common/cutest/README.txt --- opari2-2.0.5/vendor/common/cutest/README.txt 2019-07-26 09:16:11.657169859 +0000 +++ opari2-2.0.6/vendor/common/cutest/README.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -HOW TO USE - -You can use CuTest to create unit tests to drive your development -in the style of Extreme Programming. You can also add unit tests to -existing code to ensure that it works as you suspect. - -Your unit tests are an investment. They let you to change your -code and add new features confidently without worrying about -accidentally breaking earlier features. - - -LICENSING - -For details on licensing see license.txt. - - -GETTING STARTED - -To add unit testing to your C code the only files you need are -CuTest.c and CuTest.h. - -CuTestTest.c and AllTests.c have been included to provide an -example of how to write unit tests and then how to aggregate them -into suites and into a single AllTests.c file. Suites allow you -to put group tests into logical sets. AllTests.c combines all the -suites and runs them. - -You should not have to look inside CuTest.c. Looking in -CuTestTest.c and AllTests.c (for example usage) should be -sufficient. - -After downloading the sources, run your compiler to create an -executable called AllTests.exe. For example, if you are using -Windows with the cl.exe compiler you would type: - - cl.exe AllTests.c CuTest.c CuTestTest.c - AllTests.exe - -This will run all the unit tests associated with CuTest and print -the output on the console. You can replace cl.exe with gcc or -your favorite compiler in the command above. - - -DETAILED EXAMPLE - -Here is a more detailed example. We will work through a simple -test first exercise. The goal is to create a library of string -utilities. First, lets write a function that converts a -null-terminated string to all upper case. - -Ensure that CuTest.c and CuTest.h are accessible from your C -project. Next, create a file called StrUtil.c with these -contents: - - #include "CuTest.h" - - char* StrToUpper(char* str) { - return str; - } - - void TestStrToUpper(CuTest *tc) { - char* input = strdup("hello world"); - char* actual = StrToUpper(input); - char* expected = "HELLO WORLD"; - CuAssertStrEquals(tc, expected, actual); - } - - CuSuite* StrUtilGetSuite() { - CuSuite* suite = CuSuiteNew(); - SUITE_ADD_TEST(suite, TestStrToUpper); - return suite; - } - -Create another file called AllTests.c with these contents: - - #include "CuTest.h" - - CuSuite* StrUtilGetSuite(); - - void RunAllTests(void) { - CuString *output = CuStringNew(); - CuSuite* suite = CuSuiteNew(); - - CuSuiteAddSuite(suite, StrUtilGetSuite()); - - CuSuiteRun(suite); - CuSuiteSummary(suite, output); - CuSuiteDetails(suite, output); - printf("%s\n", output->buffer); - } - - int main(void) { - RunAllTests(); - } - -Then type this on the command line: - - gcc AllTests.c CuTest.c StrUtil.c - -to compile. You can replace gcc with your favorite compiler. -CuTest should be portable enough to handle all Windows and Unix -compilers. Then to run the tests type: - - a.out - -This will print an error because we haven't implemented the -StrToUpper function correctly. We are just returning the string -without changing it to upper case. - - char* StrToUpper(char* str) { - return str; - } - -Rewrite this as follows: - - char* StrToUpper(char* str) { - char* p; - for (p = str ; *p ; ++p) *p = toupper(*p); - return str; - } - -Recompile and run the tests again. The test should pass this -time. - - -WHAT TO DO NEXT - -At this point you might want to write more tests for the -StrToUpper function. Here are some ideas: - -TestStrToUpper_EmptyString : pass in "" -TestStrToUpper_UpperCase : pass in "HELLO WORLD" -TestStrToUpper_MixedCase : pass in "HELLO world" -TestStrToUpper_Numbers : pass in "1234 hello" - -As you write each one of these tests add it to StrUtilGetSuite -function. If you don't the tests won't be run. Later as you write -other functions and write tests for them be sure to include those -in StrUtilGetSuite also. The StrUtilGetSuite function should -include all the tests in StrUtil.c - -Over time you will create another file called FunkyStuff.c -containing other functions unrelated to StrUtil. Follow the same -pattern. Create a FunkyStuffGetSuite function in FunkyStuff.c. -And add FunkyStuffGetSuite to AllTests.c. - -The framework is designed in the way it is so that it is easy to -organize a lot of tests. - -THE BIG PICTURE - -Each individual test corresponds to a CuTest. These are grouped -to form a CuSuite. CuSuites can hold CuTests or other CuSuites. -AllTests.c collects all the CuSuites in the program into a single -CuSuite which it then runs as a single CuSuite. - -The project is open source so feel free to take a peek under the -hood at the CuTest.c file to see how it works. CuTestTest.c -contains tests for CuTest.c. So CuTest tests itself. - -Since AllTests.c has a main() you will need to exclude this when -you are building your product. Here is a nicer way to do this if -you want to avoid messing with multiple builds. Remove the main() -in AllTests.c. Note that it just calls RunAllTests(). Instead -we'll call this directly from the main program. - -Now in the main() of the actual program check to see if the -command line option "--test" was passed. If it was then I call -RunAllTests() from AllTests.c. Otherwise run the real program. - -Shipping the tests with the code can be useful. If you customers -complain about a problem you can ask them to run the unit tests -and send you the output. This can help you to quickly isolate the -piece of your system that is malfunctioning in the customer's -environment. - -CuTest offers a rich set of CuAssert functions. Here is a list: - -void CuAssert(CuTest* tc, char* message, int condition); -void CuAssertTrue(CuTest* tc, int condition); -void CuAssertStrEquals(CuTest* tc, char* expected, char* actual); -void CuAssertIntEquals(CuTest* tc, int expected, int actual); -void CuAssertPtrEquals(CuTest* tc, void* expected, void* actual); -void CuAssertPtrNotNull(CuTest* tc, void* pointer); - -The project is open source and so you can add other more powerful -asserts to make your tests easier to write and more concise. -Please feel free to send me changes you make so that I can -incorporate them into future releases. - -If you see any errors in this document please contact me at -asimjalis@peakprogramming.com. - - -AUTOMATING TEST SUITE GENERATION - -make-tests.sh will grep through all the .c files in the current -directory and generate the code to run all the tests contained in -them. Using this script you don't have to worry about writing -AllTests.c or dealing with any of the other suite code. - - -CREDITS - -These people have contributed useful code changes to the CuTest project. -Thanks! - -- [02.23.2003] Dave Glowacki -- [04.17.2009] Tobias Lippert -- [11.13.2009] Eli Bendersky -- [12.14.2009] Andrew Brown