r22365 wasn't quite right -- Libtool 2.2.6b ''does'' report the "b" in
the --version output (ugh!). So fix it so that if there are letters in the release number, don't use -lt and -gt to compare; just print "we found the wrong version" (don't try to determine if it's higher or lower). This commit fixes ompi's make_dist_tarball -- I'll let Ralph adapt for the ORTE tarball script. This commit was SVN r22366. The following SVN revision numbers were found above: r22365 --> open-mpi/ompi@b4a77591d2
Этот коммит содержится в:
родитель
b4a77591d2
Коммит
6105c71561
35
contrib/dist/make_dist_tarball
поставляемый
35
contrib/dist/make_dist_tarball
поставляемый
@ -10,7 +10,7 @@
|
|||||||
# University of Stuttgart. All rights reserved.
|
# University of Stuttgart. All rights reserved.
|
||||||
# Copyright (c) 2004-2005 The Regents of the University of California.
|
# Copyright (c) 2004-2005 The Regents of the University of California.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
# Copyright (c) 2008-2009 Cisco Systems, Inc. All rights reserved.
|
# Copyright (c) 2008-2010 Cisco Systems, Inc. All rights reserved.
|
||||||
# $COPYRIGHT$
|
# $COPYRIGHT$
|
||||||
#
|
#
|
||||||
# Additional copyrights may follow
|
# Additional copyrights may follow
|
||||||
@ -78,6 +78,16 @@ check_gnu_version() {
|
|||||||
target_release=0
|
target_release=0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Gah -- Libtool released version 2.2.6b, the "b" of which totally
|
||||||
|
# screws up the -lt and -gt comparisons, below. So strip out any
|
||||||
|
# trailing letters in the target_release and ver_release variables
|
||||||
|
# -- if they don't match, we'll just get a "they don't match
|
||||||
|
# somehow" kind of message (because I'm not going to code up a
|
||||||
|
# complex/clever alphanumeric lower/higher comparison thingy).
|
||||||
|
# Sigh.
|
||||||
|
ver_release=`echo $ver_release | sed 's/[a-z]//g'`
|
||||||
|
target_release=`echo $target_release | sed 's/[a-z]//g'`
|
||||||
|
|
||||||
result=same
|
result=same
|
||||||
if test "$ver" != "$target"; then
|
if test "$ver" != "$target"; then
|
||||||
if test "$ver_major" -lt "$target_major"; then
|
if test "$ver_major" -lt "$target_major"; then
|
||||||
@ -115,9 +125,8 @@ the correct version of the tools.
|
|||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
EOF
|
EOF
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$result" = "high"; then
|
elif test "$result" = "high"; then
|
||||||
if test "$highok" = "0"; then
|
if test "$highok" = "0"; then
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
@ -155,7 +164,27 @@ to give you the chance to quit before doing anything.
|
|||||||
EOF
|
EOF
|
||||||
sleep 5
|
sleep 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
elif test "$result" = "unknown"; then
|
||||||
|
cat <<EOF
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
ERROR: Program "$prog" does not have the correct version:
|
||||||
|
Found: $ver
|
||||||
|
Expected: $target
|
||||||
|
|
||||||
|
Expected versions:
|
||||||
|
m4: $M4_TARGET_VERSION
|
||||||
|
Automake: $AM_TARGET_VERSION
|
||||||
|
Autoconf: $AC_TARGET_VERSION
|
||||||
|
Libtool: $LT_TARGET_VERSION
|
||||||
|
|
||||||
|
Either change this script to match the found version, or install
|
||||||
|
the correct version of the tools.
|
||||||
|
----------------------------------------------------------------------
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user