From 687a5603a122af332bb939bba13aec78beb206cd Mon Sep 17 00:00:00 2001
From: Michael Heinz <michael.william.heinz@intel.com>
Date: Wed, 1 May 2019 15:20:41 -0400
Subject: [PATCH] buildrpm.sh no longer respects the value of rpmtopdir

In OMPI 2.1.2, buildrpm.sh could work with a value of rpmtopdir that was
set in the environment. In newer versions this is no longer true,
causing such values to be ignored. This patch adds a new argument to
buildrpm.sh, -R, which allows the user to specify where to build the
RPMs.

Signed-off-by: Michael Heinz <michael.william.heinz@intel.com>
---
 contrib/dist/linux/README      |  3 +++
 contrib/dist/linux/buildrpm.sh | 25 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/contrib/dist/linux/README b/contrib/dist/linux/README
index 045b3734b7..f9a3aa8841 100644
--- a/contrib/dist/linux/README
+++ b/contrib/dist/linux/README
@@ -86,6 +86,9 @@ Please, do NOT set the same settings with parameters and config vars.
    file from the tarball specified on the command line. By default,
    the script will look for the specfile in the current directory.
 
+-R directory
+   Specifies the top level RPM build direcotry.
+
 -h
    Prints script usage information.
 
diff --git a/contrib/dist/linux/buildrpm.sh b/contrib/dist/linux/buildrpm.sh
index b4f2f18f74..d19df828bc 100755
--- a/contrib/dist/linux/buildrpm.sh
+++ b/contrib/dist/linux/buildrpm.sh
@@ -58,6 +58,9 @@
 #    file from the tarball specified on the command line. By default,
 #    the script will look for the specfile in the current directory.
 #
+# -R directory
+#    Specifies the top level RPM build direcotry.
+#
 # -h
 #    Prints script usage information.
 #
@@ -107,7 +110,7 @@ orig_param="$@"
 #
 # usage information
 #
-usage="Usage: $0 [-b][-o][-m][-d][-u][-s][-h] [-n name][-f lf_location][-t tm_location] tarball
+usage="Usage: $0 [-b][-o][-m][-d][-u][-s][-h] [-n name][-f lf_location][-t tm_location][-R directory] tarball
 
   -b
              build all-in-one binary RPM only (required for all other flags to work)
@@ -146,6 +149,9 @@ usage="Usage: $0 [-b][-o][-m][-d][-u][-s][-h] [-n name][-f lf_location][-t tm_lo
   -r parameter
              add custom RPM build parameter
 
+  -R directory
+             Specifies the top level RPM build direcotry.
+
   -h         print this message and exit
 
   tarball    path to Open MPI source tarball
@@ -155,8 +161,9 @@ usage="Usage: $0 [-b][-o][-m][-d][-u][-s][-h] [-n name][-f lf_location][-t tm_lo
 # parse args
 #
 libfabric_path=""
+rpmtopdir=
 
-while getopts bn:omif:t:dc:r:sh flag; do
+while getopts bn:omif:t:dc:r:sR:h flag; do
     case "$flag" in
       b) build_srpm="no"
          build_single="yes"
@@ -180,6 +187,8 @@ while getopts bn:omif:t:dc:r:sh flag; do
          ;;
       r) configure_options="$rpmbuild_options $OPTARG"
          ;;
+      R) rpmtopdir="$OPTARG"
+         ;;
       s) unpack_spec="1"
          ;;
       h) echo "$usage" 1>&2
@@ -267,10 +276,16 @@ fi
 # Find where the top RPM-building directory is
 #
 
-file=~/.rpmmacros
-if test -r $file; then
-    rpmtopdir=${rpmtopdir:-"`grep %_topdir $file | awk '{ print $2 }'`"}
+# if the user did not specify an $rpmtopdir, check for an .rpmmacros file.
+if test "$rpmtopdir" == ""; then
+    file=~/.rpmmacros
+    if test -r $file; then
+        rpmtopdir=${rpmtopdir:-"`grep %_topdir $file | awk '{ print $2 }'`"}
+    fi
 fi
+
+# If needed, initialize the $rpmtopdir directory. If no $rpmtopdir was
+# specified, try various system-level defaults.
 if test "$rpmtopdir" != ""; then
 	rpmbuild_options="$rpmbuild_options --define '_topdir $rpmtopdir'"
     if test ! -d "$rpmtopdir"; then