1
1

Improve on r23665. Ensure patches can be used on Solaris.

This commit was SVN r23701.

The following SVN revision numbers were found above:
  r23665 --> open-mpi/ompi@7acb18f3d4
Этот коммит содержится в:
Ethan Mallove 2010-08-31 17:59:38 +00:00
родитель b982f908e8
Коммит eae9b4c564

Просмотреть файл

@ -28,6 +28,14 @@
unalias test sort cut xargs echo 2> /dev/null
unset GREP_COLORS
# Solaris patch is not compatible with Linux patch
uname_s=`uname -s`
if test "$uname_s" = "SunOS" ; then
patch="gpatch"
else
patch="patch"
fi
##############################################################################
#
# User-definable parameters (search path and minimum supported versions)
@ -444,15 +452,21 @@ EOF
echo "** Adjusting libltdl for OMPI :-("
echo " ++ patching PGI -tp bug in ltmain.sh"
if test -z "`grep -w tp config/ltmain.sh`"; then
patch -N -p0 < config/ltmain_pgi_tp.diff
else
# Patch ltmain.sh error for PGI -tp flag. Redirect stderr to
# /dev/null because this patch is only necessary for some versions of
# Libtool (e.g., 2.2.6b); it'll [rightfully] fail if you have a new
# enough Libtool that dosn't need this patch. But don't alarm the
# user and make them think that autogen failed if this patch fails --
# make the errors be silent.
$patch -N -p0 < config/ltmain_pgi_tp.diff >/dev/null 2>&1
if test ! $? -eq 0 ; then
echo " -- your libtool doesn't need this! yay!"
fi
rm -f config/ltmain.sh.rej
echo " ++ preopen error masking ib libltdl"
if test -r opal/libltdl/loaders/preopen.c; then
patch -N -p0 < config/libltdl-preopen-error.diff
$patch -N -p0 < config/libltdl-preopen-error.diff
rm -f opal/libltdl/loaders/preopen.c.rej
fi
else