From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29106 invoked by alias); 7 Jun 2008 16:38:23 -0000 Received: (qmail 29079 invoked by uid 367); 7 Jun 2008 16:38:23 -0000 Date: Sat, 07 Jun 2008 16:38:00 -0000 Message-ID: <20080607163823.29063.qmail@sourceware.org> From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Specify absolute path to solibs, so that the correct one is loaded. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9e102f1cd6ceeef293733e313656ef47e8bd7118 X-Git-Newrev: 7412e5a7e9e3256885448ede4d72c302ddbc469e Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q2/txt/msg00353.txt.bz2 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 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 * 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 + + * Makefile.rules (Runner): Specify absolute path to shared + libraries. + 2008-05-29 Andrew Cagney * 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