From 058dfc9228680302e3349a286df1ec40d9b8a97f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 29 May 2009 13:42:40 +0000 Subject: [PATCH] Check the lib64 subdirectory for 64bit platforms for runtime external libs. Default value for required GLITE_USER. --- org.glite.yaim.lb/config/functions/config_glite_lb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/org.glite.yaim.lb/config/functions/config_glite_lb b/org.glite.yaim.lb/config/functions/config_glite_lb index 03e2450..54ed16e 100644 --- a/org.glite.yaim.lb/config/functions/config_glite_lb +++ b/org.glite.yaim.lb/config/functions/config_glite_lb @@ -4,6 +4,7 @@ function config_glite_lb_check(){ function config_glite_lb_setenv(){ + yaimgridenv_set GLITE_USER ${GLITE_USER:-glite} yaimgridenv_set GLITE_JP_LOCATION ${GLITE_JP_LOCATION:-} yaimgridenv_set GLITE_WMS_QUERY_TIMEOUT ${GLITE_WMS_QUERY_TIMEOUT:-300} yaimgridenv_set GLITE_HOST_CERT ${GLITE_HOME_DIR:-/home/glite}/.certs/hostcert.pem @@ -18,8 +19,18 @@ function config_glite_lb_setenv(){ yaimgridenv_set GLITE_LB_RTM_DN ${GLITE_LB_RTM_DN:-/C=UK/O=eScience/OU=Imperial/L=Physics/CN=heppc24.hep.ph.ic.ac.uk/Email=janusz.martyniak@imperial.ac.uk} yaimgridenv_set GLITE_LB_SUPER_USERS ${GLITE_LB_SUPER_USERS:-} - yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/c-ares/lib - yaimgridpath_append LD_LIBRARY_PATH ${INSTALL_ROOT:-opt}/classads/lib + cares_prefix=${INSTALL_ROOT:-/opt}/c-ares + classads_prefix=${INSTALL_ROOT:-/opt}/classads + if [ x`uname -m` = xx8664 ]; then + if [ -d "$cares_prefix/lib64" ]; then + cares_libarch=lib64 + fi + if [ -d "$classads_prefix/lib64" ]; then + classads_libarch=lib64 + fi + fi + yaimgridpath_append LD_LIBRARY_PATH $cares_prefix/${cares_libarch:-lib} + yaimgridpath_append LD_LIBRARY_PATH $classads_prefix/${classads_libarch:-lib} } function config_glite_lb() { -- 1.8.2.3