From: vsr <vsr@opencascade.com>
Date: Fri, 23 Dec 2005 09:26:37 +0000 (+0000)
Subject: Fix problems with native Python caused by latest integrations
X-Git-Tag: V_2_2_7~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=41e08e8ff8bbac2d7c598531e4057598c2d85e33;p=tools%2Finstall.git

Fix problems with native Python caused by latest integrations
---

diff --git a/config_files/Python-2.2.1.sh b/config_files/Python-2.2.1.sh
index 2dea9f8..b93add4 100755
--- a/config_files/Python-2.2.1.sh
+++ b/config_files/Python-2.2.1.sh
@@ -24,10 +24,10 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${PYTHONHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -63,10 +63,10 @@ if [ -n "${pythonhome}" ] ; then
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=${pythonhome}
 export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=${pythonpath}
-export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF
 	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -113,6 +113,7 @@ EOF
 
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
+(cd ${PRODUCT_DIR}/lib/python2.2/config; ln -s ../../libpython2.2.so.1.0 libpython2.2.so)
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}
diff --git a/config_files/Python-2.3.4.sh b/config_files/Python-2.3.4.sh
index f36b825..8178434 100755
--- a/config_files/Python-2.3.4.sh
+++ b/config_files/Python-2.3.4.sh
@@ -24,10 +24,10 @@ cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${PYTHONHOME}/bin:\${PATH}
+export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=\${PYTHONHOME}/lib/python\${PYTHON_VERSION}:\${PYTHONPATH}
-export LD_LIBRARY_PATH=\${PYTHONHOME}/lib:\${LD_LIBRARY_PATH}
 ##
 EOF
 (test -w ${PRODUCT_DIR} && cp ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh ${PRODUCT_DIR})
@@ -62,10 +62,10 @@ if [ -n "${pythonhome}" ] ; then
 #$DELIM ${PRODUCT_TYPE} $DELIM
 export PYTHONHOME=${pythonhome}
 export PATH=${path}
+export LD_LIBRARY_PATH=${ld_library_path}
 export PYTHON_VERSION=\`python -c "import sys; print sys.version[:3]"\`
 export PYTHON_INCLUDE=\${PYTHONHOME}/include/python\${PYTHON_VERSION}
 export PYTHONPATH=${pythonpath}
-export LD_LIBRARY_PATH=${ld_library_path}
 ##
 EOF
 	make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}"
@@ -112,6 +112,7 @@ EOF
 
 check_job ${PRODUCT_DIR}/MAKE.LOG make 
 check_job ${PRODUCT_DIR}/MAKINSTALL.LOG make install
+(cd ${PRODUCT_DIR}/lib/python2.3/config; ln -s ../../libpython2.3.so.1.0 libpython2.3.so)
 
 #du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 cd ${PRODUCT_DIR}; rm -fr ${PRODUCT_WORK}