From: Jim G. <jga...@us...> - 2017-08-20 16:18:05
|
Update of /cvsroot/openss/OpenSpeedShop_ROOT In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20324 Modified Files: .support_for_install.sh Log Message: Fix bug in finding fPIC version of libibery when building with the new binutils-2.28 patch. Index: .support_for_install.sh =================================================================== RCS file: /cvsroot/openss/OpenSpeedShop_ROOT/.support_for_install.sh,v retrieving revision 1.185 retrieving revision 1.186 diff -C2 -d -r1.185 -r1.186 *** .support_for_install.sh 18 Aug 2017 14:34:43 -0000 1.185 --- .support_for_install.sh 20 Aug 2017 16:18:03 -0000 1.186 *************** *** 6088,6153 **** #echo "check libiberty libdir" ! if [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built lib, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty_pic.a elif [ -f /usr/lib/libiberty_pic.a ]; then ! #echo "found /usr/lib libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty_pic.a elif [ -f /usr/lib64/libiberty_pic.a ]; then ! #echo "found /usr/lib64 libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! #echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_BINUTILS built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty.a ]; then ! #echo "KRELL_ROOT_PREFIX built lib, libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty.a elif [ -f /usr/lib/libiberty.a ]; then ! #echo "found /usr/lib libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty.a elif [ -f /usr/lib64/libiberty.a ]; then ! #echo "found /usr/lib64 libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty.a --- 6088,6153 ---- #echo "check libiberty libdir" ! if [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ! elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ! elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" ! export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR ! export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ! elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built lib, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty_pic.a elif [ -f /usr/lib/libiberty_pic.a ]; then ! echo "found /usr/lib libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty_pic.a elif [ -f /usr/lib64/libiberty_pic.a ]; then ! echo "found /usr/lib64 libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty_pic" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a ]; then ! echo "KRELL_ROOT_PREFIX built libdir, libiberty_pic, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty_pic.a elif [ ! -z $KRELL_ROOT_BINUTILS ] && [ -f $KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_BINUTILS built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_BINUTILS/$LIBDIR export LIBIBERTY_LIBNAME=$KRELL_ROOT_BINUTILS/$LIBDIR/libiberty.a elif [ ! -z $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built libiberty" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/$LIBDIR/libiberty.a elif [ -d $KRELL_ROOT_PREFIX ] && [ -f $KRELL_ROOT_PREFIX/lib/libiberty.a ]; then ! echo "KRELL_ROOT_PREFIX built lib, libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=$KRELL_ROOT_PREFIX/lib export LIBIBERTY_LIBNAME=$KRELL_ROOT_PREFIX/lib/libiberty.a elif [ -f /usr/lib/libiberty.a ]; then ! echo "found /usr/lib libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib export LIBIBERTY_LIBNAME=/usr/lib/libiberty.a elif [ -f /usr/lib64/libiberty.a ]; then ! echo "found /usr/lib64 libiberty, KRELL_ROOT_PREFIX=$KRELL_ROOT_PREFIX" export LIBIBERTYLIBDIR=/usr/lib64 export LIBIBERTY_LIBNAME=/usr/lib64/libiberty.a |