Fix bugs with *.la files

diff --git a/config_files/CALCULATOR_BIN.sh b/config_files/CALCULATOR_BIN.sh
index 9d4f770c9e666ea2ba3b6a7874e84666a1cc0dff..bef578035268017db8a06f86b02316eb177aa84f 100755 (executable)
--- a/config_files/CALCULATOR_BIN.sh
+++ b/config_files/CALCULATOR_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/CALCULATORbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/CAS-6.0.sh b/config_files/CAS-6.0.sh
index fa1375889431d636198e00902570b348b4134885..8ce70ae09bf2fb255ab8b13572d84221ff53b37c 100755 (executable)
--- a/config_files/CAS-6.0.sh
+++ b/config_files/CAS-6.0.sh
@@ -133,12 +133,17 @@ ldir=${PRODUCT_DIR}/lib
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/Linux/lib; fi
 if [ ! -d $ldir ]; then ldir=${PRODUCT_DIR}/lin/lib; fi
 cd $ldir
+tcldir=`printenv TCLHOME`
 for l in X `find . -name "*.la"`; do
     if [ "$l" != "X" ] ; then
        l=`basename $l`
        libdir=`grep -e "libdir=.*" $l | sed -e "s/libdir=[\'|\"]\(.*\)[\'|\"]/\1/g"`
        sed -e "s%${libdir}%${ldir}%g" $l > _$l
        mv -f _$l $l
+       if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+           sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}/lib%g" $l > _$l
+           mv -f _$l $l
+       fi
        chmod a+x $l
     fi
 done

diff --git a/config_files/COMPONENT_BIN.sh b/config_files/COMPONENT_BIN.sh
index 798ecadcb881a12f05aa9bce4e9006ec329304e6..d735ecc4ffcd961b5a3cd07c2d3fdbc6cf0a55ef 100755 (executable)
--- a/config_files/COMPONENT_BIN.sh
+++ b/config_files/COMPONENT_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/COMPONENTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/GEOM_BIN.sh b/config_files/GEOM_BIN.sh
index 4af986fc2c8cc30ed2ff4e3227a18271af36f389..de10941cdda1d7104ef70d40ea8f29dd326841c7 100755 (executable)
--- a/config_files/GEOM_BIN.sh
+++ b/config_files/GEOM_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GEOMbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GEOM_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/GHS3DPLUGIN_BIN.sh b/config_files/GHS3DPLUGIN_BIN.sh
index 055ceb0289890e4408fbaa7315a60d07cf2e1e3b..942b77ae0f52b5d00f3190bbf2b82fd9fab23a13 100755 (executable)
--- a/config_files/GHS3DPLUGIN_BIN.sh
+++ b/config_files/GHS3DPLUGIN_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GHS3DPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/GUI_BIN.sh b/config_files/GUI_BIN.sh
index 608feb9a56d68b0b06807c1607868498512ca02b..83238d98701050d53935a3c0649b12f274746078 100755 (executable)
--- a/config_files/GUI_BIN.sh
+++ b/config_files/GUI_BIN.sh
@@ -74,6 +74,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/GUIbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export GUI_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/HELLO_BIN.sh b/config_files/HELLO_BIN.sh
index e51adb1237597b57ef2775e18128bc31ab8b1add..457694b3a58ec5d9797e149b42778316bab733f1 100755 (executable)
--- a/config_files/HELLO_BIN.sh
+++ b/config_files/HELLO_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/HELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export HELLO_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/KERNEL_BIN.sh b/config_files/KERNEL_BIN.sh
index 48102c75099977eeb8605f48da20a4b241dffba1..20b56485a6a3bc9d8188450b65e21f6244c8ae6b 100755 (executable)
--- a/config_files/KERNEL_BIN.sh
+++ b/config_files/KERNEL_BIN.sh
@@ -78,6 +78,7 @@ if [ -f /lib/libssl.so.0.9.7a ]; then
 fi
 
 # modify all *.la files
+export KERNEL_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/LIGHT_BIN.sh b/config_files/LIGHT_BIN.sh
index 0414554b824045d257672af580e0425181cfbfbd..fea73cb71d499626ef74b9eeb0ed89a3a953b43e 100755 (executable)
--- a/config_files/LIGHT_BIN.sh
+++ b/config_files/LIGHT_BIN.sh
@@ -65,6 +65,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/LIGHTbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export LIGHT_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/MED_BIN.sh b/config_files/MED_BIN.sh
index 7e894cef3da89fa8291008e14b53b2568dcac7bd..a31f520624649cd213197a388fecac1c440d1fa6 100755 (executable)
--- a/config_files/MED_BIN.sh
+++ b/config_files/MED_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/MEDbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export MED_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/NETGENPLUGIN_BIN.sh b/config_files/NETGENPLUGIN_BIN.sh
index bbfe4f090be73ecd5d12020ed73301340191c144..2939a3f4eeff6f4a2c82b8be8138fd682aae8da5 100755 (executable)
--- a/config_files/NETGENPLUGIN_BIN.sh
+++ b/config_files/NETGENPLUGIN_BIN.sh
@@ -69,6 +69,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/NETGENPLUGINbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/PYCALCULATOR_BIN.sh b/config_files/PYCALCULATOR_BIN.sh
index d3e0c2ae2b8321ecfe9ac0b1ab24817981e2445b..e87588cf89869a49ef1df50fc95f0fc4bbe055cc 100755 (executable)
--- a/config_files/PYCALCULATOR_BIN.sh
+++ b/config_files/PYCALCULATOR_BIN.sh
@@ -68,6 +68,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/PYCALCULATORbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/PYHELLO_BIN.sh b/config_files/PYHELLO_BIN.sh
index 6b14fdbf2f4c11f6d708ced848eda7725a1b8295..126586aa8d7de0fa8bc1c2ced7889c2e4b40b708 100755 (executable)
--- a/config_files/PYHELLO_BIN.sh
+++ b/config_files/PYHELLO_BIN.sh
@@ -67,6 +67,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/PYHELLObinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export PYHELLO_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/SMESH_BIN.sh b/config_files/SMESH_BIN.sh
index fb39833d9278cfd6d8a173e2c560c8645ff43ea3..2596e27b0a218c5b15229b7a272fb426977566b6 100755 (executable)
--- a/config_files/SMESH_BIN.sh
+++ b/config_files/SMESH_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/SMESHbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export SMESH_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/SUPERV_BIN.sh b/config_files/SUPERV_BIN.sh
index c2b18d495f7090b27d3aab843256bc5eca36b99f..0c9bbb1425011e815e56fd66ac695296feafa822 100755 (executable)
--- a/config_files/SUPERV_BIN.sh
+++ b/config_files/SUPERV_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/SUPERVbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export SUPERV_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/VISU_BIN.sh b/config_files/VISU_BIN.sh
index 6255734ab2d8ba9e0f33c6c4ab7455eb24f902d2..d6fdbf46f1a38c1870edf1c1aa1c6e967a74514d 100755 (executable)
--- a/config_files/VISU_BIN.sh
+++ b/config_files/VISU_BIN.sh
@@ -70,6 +70,7 @@ source ${INSTALL_WORK}/$SHRC
 check_jb tar xfz ${SOURCE_DIR}/VISUbinariesV3.1.0.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
+export VISU_ROOT_DIR=${PRODUCT_DIR}
 modif_la_files ${PRODUCT_DIR}/lib/salome
 
 print_env

diff --git a/config_files/common.sh b/config_files/common.sh
index 3c9b217bada01c520573ec21dfa0034b7d41b078..f8c08cab39794108d112257e480b88e74baa4fa6 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -522,7 +522,28 @@ if [ "$l" != "X" ] ; then
        sed -e "s%-L[^[:space:]]*python[0-9]\.[0-9]\([^[:space:]]*\)%-L${where_python}/lib/python${python_version}\1%g" $l > _$l
        mv -f _$l $l
     fi
-    # 10. modify libdir
+    # 10. process sip dependencies
+    sipdir=`find_in_path sip.so ${LD_LIBRARY_PATH}`
+    if [ -n "${sipdir}" ] && [ -d "${sipdir}" ] ; then
+       # echo $l $sipdir
+       sed -e "s%-L[^[:space:]]*sip[^[:space:]]*%-L${sipdir}%g" $l > _$l
+       mv -f _$l $l
+    fi
+    # 11. process PyQt dependencies
+    pyqtdir=`find_in_path qt.so ${LD_LIBRARY_PATH}`
+    if [ -n "${pyqtdir}" ] && [ -d "${pyqtdir}" ] ; then
+       # echo $l $pyqtdir
+       sed -e "s%-L[^[:space:]]*PyQt[^[:space:]]*%-L${pyqtdir}%g" $l > _$l
+       mv -f _$l $l
+    fi
+    # 12. process tcl/tk dependencies
+    tcldir=`printenv TCLHOME`/lib
+    if [ -n "${tcldir}" ] && [ -d "${tcldir}" ] ; then
+       # echo $l $TCLHOME $tcldir
+       sed -e "s%-L[^[:space:]]*tcltk[^[:space:]]*/lib%-L${tcldir}%g" $l > _$l
+       mv -f _$l $l
+    fi
+    # 13. modify libdir
     sed -e "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib/salome'%g" $l > _$l
     mv -f _$l $l
 fi

diff --git a/config_files/med-2.2.2.sh b/config_files/med-2.2.2.sh
index b45452188c36285518eb542bd547898604ab7bd3..681619da2417240b8bff681b600a5596751d9d0c 100755 (executable)
--- a/config_files/med-2.2.2.sh
+++ b/config_files/med-2.2.2.sh
@@ -86,9 +86,9 @@ tmp=""
 if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
 mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 
 chmod 755 libmed.la
@@ -116,9 +116,9 @@ tmp=""
 if [ -n "${HDF5HOME}" ]; then
     tmp="-L${HDF5HOME}/lib"
 fi
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new
 mv -f libmed.la.new libmed.la
-sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.4\.4/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
+sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-1\.6\.3/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new
 mv -f libmedC.la.new libmedC.la
 
 chmod 755 libmed.la