Ticket #13: sherpa-1.1.1-relocation.patch

ATOOLS/Org/Library_Loader.C

@@ -18 +18 @@
 
 Library_Loader::Library_Loader(): m_wait(3600)
 {
+  char *var = NULL;
   m_paths=EnvironmentVariable(LD_PATH_NAME);
-  m_paths.push_back(SHERPA_LIBRARY_PATH);
+  var = getenv ("SHERPA_LIBRARY_PATH");
+  m_paths.push_back(var ? var : SHERPA_LIBRARY_PATH);
 }
 
 bool Library_Loader::CreateLockFile(const std::string &lockname)

ATOOLS/Org/Run_Parameter.C

@@ -88 +88 @@
   s_variables["SHERPA_LIB_PATH"]=std::string(((var=getenv("SHERPA_LIB_PATH"))==NULL?"":var));
   s_variables["SHERPA_DAT_PATH"]=std::string(((var=getenv("SHERPA_DAT_PATH"))==NULL?"":var));
   s_variables["LD_LIBRARY_PATH"]=std::string(((var=getenv("LD_LIBRARY_PATH"))==NULL?"":var));
-  s_variables["SHERPA_BIN_PATH"]=SHERPA_BINARY_PATH;
+  s_variables["SHERPA_BIN_PATH"]=std::string(((var=getenv("SHERPA_BIN_PATH"))==NULL?SHERPA_BINARY_PATH:var));
   s_variables["SHERPA_RUN_PATH"]=getenv("PWD");
   s_variables["HOME"]=std::string(((var=getenv("HOME"))==
                                    NULL?s_variables["SHERPA_RUN_PATH"]:var));
@@ -97 +97 @@
 
 void Run_Parameter::Init(std::string path,std::string file,int argc,char* argv[])
 {
+  char *var=NULL;
   m_path = path;
   path=s_variables["PATH_PIECE"];
   gen.m_timer.Start();
@@ -131 +132 @@
   std::string pdfpath=dr.GetValue<std::string>("SHERPA_PDF_PATH",std::string(""));
   if (pdfpath.length()>0 && pdfpath[0]=='/') s_variables["SHERPA_PDF_PATH"]=pdfpath;
   else if (s_variables["SHERPA_PDF_PATH"].length()==0) 
-    s_variables["SHERPA_PDF_PATH"]=SHERPA_SHARE_PATH;
-  s_variables["SHERPA_SHARE_PATH"]=SHERPA_SHARE_PATH;
+    s_variables["SHERPA_PDF_PATH"]=std::string(((var=getenv("SHERPA_SHARE_PATH"))==NULL?SHERPA_SHARE_PATH:var));
+  s_variables["SHERPA_SHARE_PATH"]=std::string(((var=getenv("SHERPA_SHARE_PATH"))==NULL?SHERPA_SHARE_PATH:var));
   // set cpp path
   std::string cpppath=dr.GetValue<std::string>("SHERPA_CPP_PATH",std::string(""));
   if (cpppath.length()>0 && cpppath[0]=='/') s_variables["SHERPA_CPP_PATH"]=cpppath;
@@ -145 +146 @@
   else if (s_variables["SHERPA_LIB_PATH"].length()==0) 
     s_variables["SHERPA_LIB_PATH"]=s_variables["SHERPA_CPP_PATH"]
       +std::string("/Process/lib");
-  s_variables["SHERPA_INC_PATH"]=SHERPA_INCLUDE_PATH;
+  s_variables["SHERPA_INC_PATH"]=std::string(((var=getenv("SHERPA_INC_PATH"))==NULL?SHERPA_INCLUDE_PATH:var));
   if (s_variables["SHERPA_DAT_PATH"].length()==0)
     if (path.length()>0 && path[0]=='/') s_variables["SHERPA_DAT_PATH"]=path;
     else s_variables["SHERPA_DAT_PATH"]=s_variables["SHERPA_RUN_PATH"]+"/"+path;

TOOLS/makeinstall

@@ -15 +15 @@
 
 IDUSR=`finger $USER | grep Name | cut -d":" -f3`
 
+# One more dirty hack to enable linking w/o -rpath: 
+#
+_topdir=`pwd`
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(find . -type 'd' | grep -v Decaydata | sed "s,^,${_topdir}/,;s,[ ]*$,/.libs,;" | tr '\n' ':')
+#
+
 rmr () { 
   for file in `ls -a` ; do   
     if [ $file != . ] && [ $file != .. ]; then

SHERPA-MC-1.1.1

@@ -16 +16 @@
 AC_PROG_CC
 AC_PROG_F77
 AC_F77_LIBRARY_LDFLAGS
-AM_PROG_LIBTOOL
+
+dnl #AM_PROG_LIBTOOL
+
+AC_PROG_LIBTOOL
+
+dnl # Patching libtool to disable linking with -rpath.
+dnl # Taken from Wmaker-0.91 configure.ac.
+dnl # [ by Marcelo Magallon <mmagallo@efis.ucr.ac.cr> ]
+
+AC_MSG_RESULT([Disabling linking with -rpath])
+mv libtool libtool.orig && \
+sed "s,^hardcode_libdir_flag_spec.*$,hardcode_libdir_flag_spec=\" -D__RPATH_GAG__ \",;" \
+< libtool.orig > libtool 
+chmod 755 libtool
+
 dnl Checks for header files.
 AC_HEADER_STDC
 dnl Checks for typedefs, structures, and compiler characteristics.