SQUASHME address review comments

See #10224 (review)

Signed-off-by: Jeff Squyres <[email protected]>

Author: jsquyres

contrib/dist/linux/buildrpm.sh

@@ -73,7 +73,7 @@
 specfile="openmpi.spec"
 prefix=${prefix:-"/opt/openmpi"}
 rpmbuild_options=${rpmbuild_options:-"--define 'mflags -j4' --define '_source_filedigest_algorithm md5'  --define '_binary_filedigest_algorithm md5'"}
-configure_options=${configure_options:-"--with-libevent=external --with-hwloc=external --with-pmix=external --with-prrte=external"}
+configure_options=${configure_options:-""}
 unpack_spec=0
 
 # Helpful when debugging

contrib/dist/linux/openmpi.spec

@@ -53,6 +53,19 @@
 # type: bool (0/1)
 %{!?install_in_opt: %define install_in_opt 0}
 
+# This specfile expects to find all required 3rd party packages
+# (Libevent, Hwloc, PMIx, PRRTE) externally, and will not use the
+# internal/embedded copies of these packages.  This behavior is
+# strongly recomended for packagers.  However, if you want to override
+# this behavior, change the definition below to 0.
+#
+# NOTE: This option will cause "--with-libevent=external
+# --with-hwloc=external --with-pmix=external --with-prrte=external" to
+# be added to the arguments to configure. If you wish to use different
+# CLI options, set this value to 0 and set configure_options to the
+# CLI options you want.
+%{!?all_external_3rd_party: %define all_external_3rd_party 1}
+
 # Define this if you want this RPM to install environment setup
 # shell scripts.
 # type: bool (0/1)
@@ -141,14 +154,16 @@
 # type: bool (0/1)
 %{!?allow_fortify_source: %define allow_fortify_source 1}
 
-# Select md5 packing algorithm, that src.rpm created on one distro can be read on another.
+# Select md5 packing algorithm, that src.rpm created on one distro can
+# be read on another.
 %global _binary_filedigest_algorithm 1
 %global _source_filedigest_algorithm 1
 
 # Define this to 1 if you want to keep libtool achive files
 # Default is 0 (remove *.la files)
 # type: bool (0/1)
 %{!?install_libtool_archive: %define install_libtool_archive 0}
+
 #############################################################################
 #
 # Configuration Logic
@@ -181,6 +196,12 @@
 %{!?modulefile_path: %define modulefile_path /opt/%{name}/%{version}/share/openmpi/modulefiles}
 %endif
 
+%if %{all_external_3rd_party}
+%define _configure_3rd_party --with-libevent=external --with-hwloc=external --with-pmix=external --with-prrte=external
+%else
+%define _configure_3rd_party %{nil}
+%endif
+
 # Now that we have processed install_in_opt, we can see if
 # modulefile_path was not set.  If it was not, then set it to a
 # default value.
@@ -207,14 +228,8 @@
 %define __check_files %{nil}
 %endif
 
-# Set this to any options you want to pass in to configure.  By
-# default, we pass in flags to tell configure to expect to find all
-# the 3rd party packages elsewhere on the system (vs. using the
-# bundled versions).  This behavior is strongly recomended
-# (vs. including other, 3rd party packages in this Open MPI RPM).
-# Meaning: if you set a value to configure_options, you are strongly
-# advised to *also* include all the options listed below.
-%{!?configure_options: %define configure_options --with-libevent=external --with-hwloc=external --with-pmix=external --with-prrte=external}
+# Set this to any options you want to pass in to configure.
+%{!?configure_options: %define configure_options %{nil}}
 
 %if !%{use_default_rpm_opt_flags}
 %define optflags ""
@@ -247,6 +262,12 @@ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-root
 %if %{disable_auto_requires}
 AutoReq: no
 %endif
+%if %{all_external_3rd_party}
+# If we require all external 3rd party packages, then assume the use
+# of the OS Libevent and Hwloc packages.
+BuildRequires: libevent-devel hwloc-devel
+Requires: libevent hwloc
+%endif
 %if %{install_modulefile}
 Requires: %{modules_rpm_name}
 %endif
@@ -286,6 +307,12 @@ Provides: openmpi-runtime = %{version}
 %if %{disable_auto_requires}
 AutoReq: no
 %endif
+%if %{all_external_3rd_party}
+# If we require all external 3rd party packages, then assume the use
+# of the OS Libevent and Hwloc packages.
+BuildRequires: libevent-devel hwloc-devel
+Requires: libevent hwloc
+%endif
 %if %{install_modulefile}
 Requires: %{modules_rpm_name}
 %endif
@@ -467,7 +494,7 @@ CXXFLAGS="%{?cxxflags:%{cxxflags}}%{!?cxxflags:$RPM_OPT_FLAGS}"
 FCFLAGS="%{?fcflags:%{fcflags}}%{!?fcflags:$RPM_OPT_FLAGS}"
 export CFLAGS CXXFLAGS FCFLAGS
 
-%configure %{configure_options}
+%configure %{configure_options} %{_configure_3rd_party}
 %{__make} %{?mflags}