Skip to content

Commit

Permalink
Few small changes to make_dist_tarball
Browse files Browse the repository at this point in the history
Allow passing of configure args on the cmd line. If --verok is
given, then don't output all the warnings about incorrect tool
versions as it confuses people.

Signed-off-by: Ralph Castain <rhc@pmix.org>
  • Loading branch information
rhc54 committed Mar 2, 2022
1 parent 117519b commit 83b7adb
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions contrib/dist/make_dist_tarball
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# All rights reserved.
# Copyright (c) 2008-2020 Cisco Systems, Inc. All rights reserved
# Copyright (c) 2016-2020 Intel, Inc. All rights reserved.
# Copyright (c) 2021 Nanook Consulting. All rights reserved.
# Copyright (c) 2021-2022 Nanook Consulting. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
Expand Down Expand Up @@ -73,6 +73,7 @@ while test "$1" != ""; do
--no-greek) nogreek=1 ;;
--highok) highok=1 ;;
--autogen-args) autogen_args=$2; shift ;;
--config-args=*) config_args="${i#*=}"; shift ;;
--distdir) distdir=$2; shift ;;
--dirtyok) dirty_ok=1 ;;
--verok) gnu_version_ignore=1;;
Expand All @@ -86,6 +87,7 @@ Valid arguments:
--no-greek Do not build the greek tarball
--highok Ok if Autotools versions are too high
--autogen-args Arguments to pass to autogen
--config-args Arguments to pass to configure
--distdir Move the tarball(s) to this directory when done
--dirtyok Ok if the source tree is dirty
--verok Ignore result of autotools version checking
Expand Down Expand Up @@ -267,7 +269,7 @@ make_tarball() {
#
echo "*** Running configure..."
rm -f success
(./configure 2>&1 && touch success) | tee config.out
(./configure $config_args 2>&1 && touch success) | tee config.out
if test ! -f success; then
echo "Configure failed. Aborting"
exit 1
Expand Down Expand Up @@ -314,13 +316,15 @@ start=`date`
echo "*** Start time: $start"

echo "*** Checking tools versions..."
check_gnu_version m4 $M4_TARGET_VERSION
check_gnu_version automake $AM_TARGET_VERSION
check_gnu_version autoconf $AC_TARGET_VERSION
check_gnu_version libtool $LT_TARGET_VERSION
# Windows needs a recent version of flex; old versions don't generate
# Windows-friendly *_lex.c files.
check_gnu_version flex $FLEX_TARGET_VERSION
if test "$gnu_version_ignore" = "0"; then
check_gnu_version m4 $M4_TARGET_VERSION
check_gnu_version automake $AM_TARGET_VERSION
check_gnu_version autoconf $AC_TARGET_VERSION
check_gnu_version libtool $LT_TARGET_VERSION
# Windows needs a recent version of flex; old versions don't generate
# Windows-friendly *_lex.c files.
check_gnu_version flex $FLEX_TARGET_VERSION
fi

#
# Verify that we're in a top PRTE dir
Expand Down

0 comments on commit 83b7adb

Please sign in to comment.