[SCM] master: Specify absolute path to solibs, so that the correct one is loaded.

[cagney at sourceware dot org]

The branch, master has been updated
       via  7412e5a7e9e3256885448ede4d72c302ddbc469e (commit)
      from  9e102f1cd6ceeef293733e313656ef47e8bd7118 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 7412e5a7e9e3256885448ede4d72c302ddbc469e
Author: Andrew Cagney <cagney@redhat.com>
Date:   Sat Jun 7 12:37:38 2008 -0400

    Specify absolute path to solibs, so that the correct one is loaded.
    
    frysk-common/ChangeLog
    2008-06-07  Andrew Cagney  <cagney@redhat.com>
    
    	* Makefile.rules (Runner): Specify absolute path to shared
    	libraries.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog      |    5 +++++
 frysk-common/Makefile.rules |   22 ++++++++--------------
 2 files changed, 13 insertions(+), 14 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 6be00bc..b9c1e51 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-07  Andrew Cagney  <cagney@redhat.com>
+
+	* Makefile.rules (Runner): Specify absolute path to shared
+	libraries.
+
 2008-05-29  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.rules (Runner): Add frysk-sys directory; let JAVA
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 568866d..6cbaf54 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -393,25 +393,19 @@ Runner:
 	rm -f $@
 	echo "#!/bin/sh"					>> $@.tmp
 	echo "export LD_PRELOAD=\"\\"                           >> $@.tmp
+	echo "$(frysk_imports)/elfutils/libelf/libelf.so \\"	>> $@.tmp
+	echo "$(frysk_imports)/elfutils/libdw/libdw.so \\"	>> $@.tmp
+	echo "$(frysk_imports)/elfutils/libasm/libasm.so \\"	>> $@.tmp
+	echo "$(frysk_imports)/libunwind-i386/src/.libs/libunwind-x86.so \\" >> $@.tmp
+	echo "$(frysk_imports)/libunwind-ppc32/src/.libs/libunwind-ppc32.so \\" >> $@.tmp
+	echo "$(frysk_imports)/libunwind-ppc64/src/.libs/libunwind-ppc64.so \\" >> $@.tmp
+	echo "$(frysk_imports)/libunwind-x86_64/src/.libs/libunwind-x86_64.so \\" >> $@.tmp
 	echo "libstdc++.so.6 \\"                                >> $@.tmp
-	echo "libdw.so \\"					>> $@.tmp
-	echo "libelf.so \\"					>> $@.tmp
-	echo "libunwind-x86.so \\"				>> $@.tmp
-	echo "libunwind-ppc32.so \\"				>> $@.tmp
-	echo "libunwind-ppc64.so \\"				>> $@.tmp
-	echo "libunwind-x86_64.so \\"				>> $@.tmp
 	echo "\""		  			      	>> $@.tmp
 	echo "# hack to hopefully find the right libstdc++.so"  >> $@.tmp
 	echo "export LD_LIBRARY_PATH=$(frysk_sys)\\"		>> $@.tmp
-	echo ":$(frysk_imports)/elfutils/libdw\\"		>> $@.tmp
-	echo ":$(frysk_imports)/elfutils/libelf\\"		>> $@.tmp
 	echo ":$(frysk_imports)/elfutils/backends\\"		>> $@.tmp
-	echo ":$(frysk_imports)/libunwind-i386/src/.libs\\"	>> $@.tmp
-	echo ":$(frysk_imports)/libunwind-ppc32/src/.libs\\"	>> $@.tmp
-	echo ":$(frysk_imports)/libunwind-ppc64/src/.libs\\" 	>> $@.tmp
-	echo ":$(frysk_imports)/libunwind-x86_64/src/.libs\\"	>> $@.tmp
-	echo ":/usr/lib64\\"					>> $@.tmp
-	echo ":/usr/lib"					>> $@.tmp
+	echo ":/usr/lib64:/usr/lib"				>> $@.tmp
 	echo "export CLASSPATH=\\"				>> $@.tmp
 	echo "$(CLASSPATH):$(GEN_DIRNAME).jar:TestRunner.jar"	>> $@.tmp
 	echo "JAVA=$${JAVA:-gij}"				>> $@.tmp


hooks/post-receive
--
frysk system monitor/debugger