Merge pull request #8409 from jjhursey/build-conf-3rd

Extract 3rd party configure options for OMPI configure

Author: jjhursey

.gitignore

@@ -114,6 +114,9 @@ config/mca_no_configure_components.m4
 config/mca_m4_config_include.m4
 config/ext_no_configure_components.m4
 config/ext_m4_config_include.m4
+config/auto-extracted-pmix-configure-args.m4
+config/auto-extracted-prrte-configure-args.m4
+config/auto-generated-ompi-exclude.ini
 
 contrib/build-mca-comps-outside-of-tree/btl_tcp2_config.h
 contrib/build-mca-comps-outside-of-tree/btl_tcp2_config.h.in

3rd-party/exclude-config.ini

@@ -0,0 +1,68 @@
+#
+# Copyright (c) 2021      IBM Corporation.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+# List of m4 files and configure options to exclude when extracting configure
+# options from 3rd party packages.
+#
+# Exclude a whole file (prefix with 'FILE:'):
+#   FILE: ltoptions.m4
+#   FILE: 3rd-party/prrte/config/prte_check_slurm.m4
+# Accepts a relative path to the top level directory, or a single filename.
+# Relative path is useful for excluding an .m4 file from a specific package.
+#
+# Exclude an option from all 3rd party packages (prefix with 'OPTION:'):
+#   OPTION: pkgconfigdir
+#
+# Exclude an option from a specific 3rd party package
+# (prefix with 'OPTION(pkg):' where 'pkg' is the package name as it is
+# passed to extract-3rd-party-configure.pl in autogen.pl (case insensitive).
+#   OPTION(PMIx): max-
+#   OPTION(PRRTE): hwloc
+#
+
+#------------------------------------
+# Generally excluded files
+# Example: FILE: ltoptions.m4
+FILE: ltoptions.m4
+FILE: ltsugar.m4
+FILE: ltversion.m4
+FILE: lt~obsolete.m4
+FILE: libtool.m4
+FILE: autogen_found_items.m4
+FILE: config/auto-extracted-pmix-configure-args.m4
+FILE: config/auto-extracted-prrte-configure-args.m4
+
+#------------------------------------
+# Generally excluded options
+# Example: OPTION: pkgconfigdir
+OPTION: pkgconfigdir
+OPTION: noarch-pkgconfigdir
+OPTION: libevent
+OPTION: libevent-header
+OPTION: libevent-libdir
+OPTION: libevent-header
+
+
+#------------------------------------
+# OpenPMIx
+OPTION(PMIx): max-
+
+#------------------------------------
+# PRRTE
+# Example: FILE: 3rd-party/prrte/config/prte_check_slurm.m4
+
+# Excluded options
+# Example: OPTION(PRRTE): zlib-libdir
+OPTION(PRRTE): hwloc
+OPTION(PRRTE): hwloc-libdir
+OPTION(PRRTE): hwloc-header
+OPTION(PRRTE): max-
+OPTION(PRRTE): pmix
+OPTION(PRRTE): pmix-libdir
+OPTION(PRRTE): pmix-header
+OPTION(PRRTE): pmix-devel-support

autogen.pl

@@ -7,7 +7,7 @@
 # Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2015-2020 Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
-# Copyright (c) 2015-2020 IBM Corporation.  All rights reserved.
+# Copyright (c) 2015-2021 IBM Corporation.  All rights reserved.
 # Copyright (c) 2020      Amazon.com, Inc. or its affiliates.
 #                         All Rights reserved.
 #
@@ -1562,6 +1562,11 @@ sub replace_config_sub_guess {
 
 dnl 3rd-party package information\n";
 
+# Extract the OMPI options to exclude them when processing PMIx and PRRTE
+if ( ! ("pmix" ~~ @disabled_3rdparty_packages && "prrte" ~~ @disabled_3rdparty_packages) ) {
+    safe_system("./config/extract-3rd-party-configure.pl -p . -n \"OMPI\" -l > config/auto-generated-ompi-exclude.ini");
+}
+
 # these are fairly one-off, so we did not try to do anything
 # generic. Sorry :).
 
@@ -1605,6 +1610,12 @@ sub replace_config_sub_guess {
     }
     push(@subdirs, "3rd-party/openpmix/");
     $m4 .= "m4_define([package_pmix], [1])\n";
+
+    # Grab the unique configure options from each of the 3rd party packages
+    safe_system("./config/extract-3rd-party-configure.pl -p \"3rd-party/openpmix/\" -n \"PMIx\" -e config/auto-generated-ompi-exclude.ini > config/auto-extracted-pmix-configure-args.m4");
+    # Add the additional configure options from PMIx
+    safe_system("./config/extract-3rd-party-configure.pl -p \"3rd-party/openpmix/\" -n \"PMIx\" -l >> config/auto-generated-ompi-exclude.ini");
+
     verbose "--- PMIx enabled\n";
 }
 
@@ -1618,6 +1629,10 @@ sub replace_config_sub_guess {
     }
     push(@subdirs, "3rd-party/prrte/");
     $m4 .= "m4_define([package_prrte], [1])\n";
+
+    # Grab the unique configure options from each of the 3rd party packages
+    safe_system("./config/extract-3rd-party-configure.pl -p \"3rd-party/prrte/\" -n \"PRRTE\" -e config/auto-generated-ompi-exclude.ini > config/auto-extracted-prrte-configure-args.m4");
+
     verbose "--- PRRTE enabled\n";
 }