1
1

Revert r20240 and make autogen.sh clean up after itself in terms of

*.rej files.

This commit was SVN r20243.

The following SVN revision numbers were found above:
  r20240 --> open-mpi/ompi@d88fa9282d
Этот коммит содержится в:
Jeff Squyres 2009-01-12 17:33:55 +00:00
родитель d1c6f3f89a
Коммит 56ad7acc8a

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

@ -449,6 +449,8 @@ EOF
{ {
EOF EOF
#' #'
rm -f ltdl.c.orig
rm -f ltdl.c.rej
else else
echo " -- your libtool doesn't need this! yay!" echo " -- your libtool doesn't need this! yay!"
fi fi
@ -458,6 +460,7 @@ EOF
-z "`grep otool64 config/ltmain.sh`"; then -z "`grep otool64 config/ltmain.sh`"; then
patch -N -p0 < config/ltmain_otool.diff patch -N -p0 < config/ltmain_otool.diff
rm -f config/ltmain.sh.orig rm -f config/ltmain.sh.orig
rm -f config/ltmain.sh.rej
else else
echo " -- your libtool doesn't need this! yay!" echo " -- your libtool doesn't need this! yay!"
fi fi
@ -466,6 +469,7 @@ EOF
if test -r opal/libltdl/loaders/dlopen.c && \ if test -r opal/libltdl/loaders/dlopen.c && \
test ! -z "`grep 'filename, LT_LAZY_OR_NOW' opal/libltdl/loaders/dlopen.c`"; then test ! -z "`grep 'filename, LT_LAZY_OR_NOW' opal/libltdl/loaders/dlopen.c`"; then
patch -N -p0 < config/libltdl_dlopen_global.diff patch -N -p0 < config/libltdl_dlopen_global.diff
rm -f opal/libltdl/loaders/dlopen.c.rej
else else
echo " -- your libltdl doesn't need this! yay!" echo " -- your libltdl doesn't need this! yay!"
fi fi
@ -483,6 +487,7 @@ EOF
cd opal/libltdl/m4 cd opal/libltdl/m4
patch -N -p0 < ../../../config/lt224-icc.diff > /dev/null 2>&1 patch -N -p0 < ../../../config/lt224-icc.diff > /dev/null 2>&1
rm -f libtool.m4.orig rm -f libtool.m4.orig
rm -f libtool.m4.rej
cd ../../.. cd ../../..
fi fi
else else
@ -513,15 +518,17 @@ EOF
echo " ++ patching for pathscale multi-line output (LT 2.x)" echo " ++ patching for pathscale multi-line output (LT 2.x)"
patch -N -p0 < config/lt21a-pathCC.diff > /dev/null 2>&1 patch -N -p0 < config/lt21a-pathCC.diff > /dev/null 2>&1
fi fi
rm -f aclocal.m4.orig
rm -f aclocal.m4.rej
# See http://lists.gnu.org/archive/html/bug-libtool/2008-05/msg00045.html # See http://lists.gnu.org/archive/html/bug-libtool/2008-05/msg00045.html
if check_version "2.1.9999" $ompi_libtoolize_found_version ; then if check_version "2.1.9999" $ompi_libtoolize_found_version ; then
echo " ++ patching for ifort (LT 2.2.0-4)" echo " ++ patching for ifort (LT 2.2.0-4)"
cd config cd config
patch -N -p0 < lt224-icc.diff > /dev/null 2>&1 patch -N -p0 < lt224-icc.diff > /dev/null 2>&1
rm -f libtool.m4.orig rm -f libtool.m4.orig
rm -f libtool.m4.rej
cd .. cd ..
fi fi
rm -f aclocal.m4.orig
# Libtool 1.5.2x and 2.1x automatically link in the "Cstd" STL library # Libtool 1.5.2x and 2.1x automatically link in the "Cstd" STL library
@ -547,6 +554,8 @@ EOF
# http://www.open-mpi.org/community/lists/devel/2008/11/4920.php # http://www.open-mpi.org/community/lists/devel/2008/11/4920.php
echo " ++ patching for Sun Studio Fortran compilers" echo " ++ patching for Sun Studio Fortran compilers"
patch -N -p0 < config/lt-sun-fortran.diff > /dev/null 2>&1 patch -N -p0 < config/lt-sun-fortran.diff > /dev/null 2>&1
rm -f libtool.m4.orig
rm -f libtool.m4.rej
fi fi
run_and_check $ompi_autoconf run_and_check $ompi_autoconf