From 04a49804678e35125e9ac7e080a4a193f78f4d6b Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 3 Apr 2012 20:36:06 +0000 Subject: [PATCH] Remove obsolete staff --- config_files/boost.sh | 24 +----------------------- config_files/cmake.sh | 2 +- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/config_files/boost.sh b/config_files/boost.sh index f61cdfe..ac9fab4 100755 --- a/config_files/boost.sh +++ b/config_files/boost.sh @@ -87,9 +87,6 @@ python_xversion=`echo $python_version | awk -F. '{print $1*100+$2}'` cd ${PRODUCT_SRC_DIR}/tools/build/v2/engine -#chmod +w ./Jambase -#sed -i 's/\/usr\/share\/boost-build/\$\(PRODUCT_SRC_DIR\)/g' ./Jambase - # add python version to the build.jam py_versions=`grep -E "for local v in ([0-9]\.[0-9])+" ./build.jam | sed -e"s%.*for local v in \(.*\)%\1%g"` echo $py_versions | grep $python_version >&/dev/null @@ -108,8 +105,7 @@ if [ "$?" != "0" ] ; then if [ ${added} -eq 0 ]; then vv="${vv} ${python_version}" fi - chmod +w ./build.jam - sed -i "s%for local v in\( [0-9]\.[0-9]\)\+%for local v in${vv}%g" ./build.jam + chmod +w ./build.jam && sed -i "s%for local v in\( [0-9]\.[0-9]\)\+%for local v in${vv}%g" ./build.jam fi GCC=`which gcc` @@ -147,24 +143,6 @@ if [ "$?" -ne "0" ] ; then cat $INSTALL_WORK/errlog >> ${PRODUCT_DIR}/INSTALL.LOG fi -# create additional links for libraries -#cd ${PRODUCT_DIR}/lib - -#maj_ver=`gcc -dumpversion | awk -F[.-] '{if(NF>0) print $1; else print 0}'` -#min_ver=`gcc -dumpversion | awk -F[.-] '{if(NF>1) print $2; else print 0}'` -#gcc_ver=$maj_ver$min_ver - -#listlib=`find . -name "libboost_*-gcc${gcc_ver}-mt-${BOOST_VVERSION}.so" -exec basename {} ";" | sed -e "s%libboost_\(.*\)-gcc${gcc_ver}-mt-${BOOST_VVERSION}.so%\1%g"` - -#for aLib in XXX $listlib ; do -# if [ "$aLib" == "XXX" ] ; then continue ; fi -# aLibLink=libboost_${aLib}-mt.so -# aLib=libboost_${aLib}-gcc${gcc_ver}-mt-${BOOST_VVERSION}.so -# if [ -f ${aLib} ] && [ ! -e ${aLibLink} ] ; then -# ln -sf ${aLib} ${aLibLink} -# fi -#done - cd ${PRODUCT_DIR}; # remove sources and temporary files after building diff --git a/config_files/cmake.sh b/config_files/cmake.sh index 84a7b9f..099f457 100755 --- a/config_files/cmake.sh +++ b/config_files/cmake.sh @@ -96,7 +96,7 @@ source ${INSTALL_WORK}/$SHRC # create a product directory test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} - check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} +check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR} # to generate environment script for sources try_preinstalled -- 2.39.2