From 81aed50cf3ebe460043a25eb58191c6a6e961aaa Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 3 Apr 2012 20:06:39 +0000 Subject: [PATCH] SALOME 6.5.0 preparation: update script for libxml2 (2.7.8) --- config_CentOS_5.5_64bit.xml | 2 +- config_Debian_4.0.xml | 2 +- config_Debian_4.0_64bit.xml | 2 +- config_Debian_5.0_64bit.xml | 2 +- config_Debian_6.0_64bit.xml | 2 +- config_Mandriva_2008.0.xml | 2 +- config_Mandriva_2008.0_64bit.xml | 2 +- config_Red_Hat_Enterprise_WS_4_64bit.xml | 2 +- config_Scientific_SL_5.1_64bit.xml | 2 +- config_files/{libxml2-2.7.8.sh => libxml2.sh} | 24 +++++++++---------- 10 files changed, 20 insertions(+), 22 deletions(-) rename config_files/{libxml2-2.7.8.sh => libxml2.sh} (88%) diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml index de1a13e..a406404 100755 --- a/config_CentOS_5.5_64bit.xml +++ b/config_CentOS_5.5_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml index 2cefcb8..70b9a66 100755 --- a/config_Debian_4.0.xml +++ b/config_Debian_4.0.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml index 3674f45..8fda210 100755 --- a/config_Debian_4.0_64bit.xml +++ b/config_Debian_4.0_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml index f82c28b..ce5b588 100755 --- a/config_Debian_5.0_64bit.xml +++ b/config_Debian_5.0_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml index 97ac476..152dcf7 100755 --- a/config_Debian_6.0_64bit.xml +++ b/config_Debian_6.0_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml index 91979b9..641b2f1 100755 --- a/config_Mandriva_2008.0.xml +++ b/config_Mandriva_2008.0.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml index 8090c0f..3be8087 100755 --- a/config_Mandriva_2008.0_64bit.xml +++ b/config_Mandriva_2008.0_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml index 3f28e6d..bb04654 100755 --- a/config_Red_Hat_Enterprise_WS_4_64bit.xml +++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml index d30a5cd..1edb774 100755 --- a/config_Scientific_SL_5.1_64bit.xml +++ b/config_Scientific_SL_5.1_64bit.xml @@ -687,7 +687,7 @@ version="2.7.8" disable="false" installdiskspace="14740,43504,81544" - script="libxml2-2.7.8.sh"/> + script="libxml2.sh"/> diff --git a/config_files/libxml2-2.7.8.sh b/config_files/libxml2.sh similarity index 88% rename from config_files/libxml2-2.7.8.sh rename to config_files/libxml2.sh index 4f478b4..e70c782 100755 --- a/config_files/libxml2-2.7.8.sh +++ b/config_files/libxml2.sh @@ -1,12 +1,12 @@ #!/bin/bash -noprofile #################################################################################### -# File : libxml2-2.7.8.sh +# File : libxml2.sh # Created : Thu Dec 18 12:01:00 2002 # Author : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com) # Project : SALOME # Module : Installation Wizard -# Copyright : 2002-2008 CEA +# Copyright : 2002-2012 CEA # # This script is the part of the SALOME installation procedure. # @@ -59,6 +59,7 @@ source ${INSTALL_WORK}/$SHRC check_jb tar xfz ${SRC_DIR}/${PRODUCT}.tar.gz -C ${INST_ROOT} +# patch problem with crash on 64bit platform; required at least for v2.7.8 if [ -f patches/libxml2_2.7.8.patch ] ; then cp patches/libxml2_2.7.8.patch ${PRODUCT_SRC_DIR} ( cd ${PRODUCT_SRC_DIR}; patch < libxml2_2.7.8.patch ) @@ -78,8 +79,7 @@ install_source cd ${PRODUCT_SRC_DIR} test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR} -check_job ${PRODUCT_DIR}/CONFIGURE.LOG \ - ./configure --prefix=${PRODUCT_DIR} +check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} GCC=`which gcc` cat >> ${PRODUCT_DIR}/MAKE.LOG < $l$lnew -mv $l$lnew $l -chmod 755 $l +for l in X `find -type f -name *.la`; do + if [ "${l}" != "X" ] ; then + sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;" ${l} + fis done +# modify pkgconfig cd ${PRODUCT_DIR}/lib/pkgconfig for l in X `find . -name "*.pc"`; do if [ "${l}" != "X" ] ; then - sed -e "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} > ${l}_ - chmod -f --reference=${l} ${l}_ ; mv -f ${l}_ ${l} + sed -i "s%prefix=.*%prefix=${PRODUCT_DIR}%g" ${l} fi done -- 2.39.2