public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM] master: Let JAVA be overridden in Runner/JniRunner.
@ 2008-06-09 15:12 cagney
0 siblings, 0 replies; only message in thread
From: cagney @ 2008-06-09 15:12 UTC (permalink / raw)
To: frysk-cvs
The branch, master has been updated
via 0831e02b030d1a15067a78742947832df4c3af9f (commit)
via 3cf25ad5b0db850cf7e782442ea2e933664f7488 (commit)
from e72cddb17cbe725315d59b04682073d5d865efb0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 0831e02b030d1a15067a78742947832df4c3af9f
Author: Andrew Cagney <cagney@redhat.com>
Date: Mon Jun 9 11:11:26 2008 -0400
Let JAVA be overridden in Runner/JniRunner.
frysk-common/ChangeLog
2008-06-09 Andrew Cagney <cagney@redhat.com>
* Makefile.rules (Runner): (Really) Let JAVA be overwritten by an
environment variable. Disable demangler and addr2line.
commit 3cf25ad5b0db850cf7e782442ea2e933664f7488
Author: Andrew Cagney <cagney@redhat.com>
Date: Thu Jun 5 08:13:34 2008 -0400
Update build requirements for fedora 9.
-----------------------------------------------------------------------
Summary of changes:
frysk-common/ChangeLog | 5 ++++
frysk-common/Makefile.rules | 41 +++++++++++++++++++++++++--------------
htdocs/build/fedora/index.html | 28 ++++++++++++++++----------
htdocs/build/index.html | 6 ++--
4 files changed, 51 insertions(+), 29 deletions(-)
First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index b9c1e51..8d1b606 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-09 Andrew Cagney <cagney@redhat.com>
+
+ * Makefile.rules (Runner): (Really) Let JAVA be overwritten by an
+ environment variable. Disable demangler and addr2line.
+
2008-06-07 Andrew Cagney <cagney@redhat.com>
* Makefile.rules (Runner): Specify absolute path to shared
diff --git a/frysk-common/Makefile.rules b/frysk-common/Makefile.rules
index 6cbaf54..7f30cd3 100644
--- a/frysk-common/Makefile.rules
+++ b/frysk-common/Makefile.rules
@@ -392,24 +392,35 @@ frysk_sys = $$(cd ../frysk-sys && pwd)
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 "\"" >> $@.tmp
+ echo "" >> $@.tmp
+ echo "# some pre-definitions" >> $@.tmp
+ echo "elfutils=$(frysk_imports)/elfutils" >> $@.tmp
+ echo "libunwind=$(frysk_imports)/libunwind" >> $@.tmp
+ echo "java=\"$(JAVA) $(GEN_GCJ_NO_SIGCHLD_FLAGS)\"" >> $@.tmp
+ echo "" >> $@.tmp
+ echo "# Hack to pull in JNI dependences" >> $@.tmp
+ echo "export LD_PRELOAD=\\" >> $@.tmp
+ echo "\$${elfutils}/libelf/libelf.so\\ \\" >> $@.tmp
+ echo "\$${elfutils}/libdw/libdw.so\\ \\" >> $@.tmp
+ echo "\$${elfutils}/libasm/libasm.so\\ \\" >> $@.tmp
+ echo "\$${libunwind}-i386/src/.libs/libunwind-x86.so\\ \\" >> $@.tmp
+ echo "\$${libunwind}-ppc32/src/.libs/libunwind-ppc32.so\\ \\" >> $@.tmp
+ echo "\$${libunwind}-ppc64/src/.libs/libunwind-ppc64.so\\ \\" >> $@.tmp
+ echo "\$${libunwind}-x86_64/src/.libs/libunwind-x86_64.so\\ \\" >> $@.tmp
+ echo "libstdc++.so.6" >> $@.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/backends\\" >> $@.tmp
+ echo ":\$${elfutils}/backends\\" >> $@.tmp
echo ":/usr/lib64:/usr/lib" >> $@.tmp
- echo "export CLASSPATH=\\" >> $@.tmp
- echo "$(CLASSPATH):$(GEN_DIRNAME).jar:TestRunner.jar" >> $@.tmp
- echo "JAVA=$${JAVA:-gij}" >> $@.tmp
- echo "\$${JAVA} \"\$$@\"" >> $@.tmp
+ echo "" >> $@.tmp
+ echo "# Set up classpath" >> $@.tmp
+ echo "export CLASSPATH=$(CLASSPATH)\\" >> $@.tmp
+ echo ":$(GEN_DIRNAME).jar\\" >> $@.tmp
+ echo ":TestRunner.jar" >> $@.tmp
+ echo "" >> $@.tmp
+ echo "# invoke the interpreter" >> $@.tmp
+ echo "exec \$${JAVA:-\$${java}} \"\$$@\"" >> $@.tmp
chmod a+x $@.tmp
mv $@.tmp $@
diff --git a/htdocs/build/fedora/index.html b/htdocs/build/fedora/index.html
index 34bd876..914afbd 100644
--- a/htdocs/build/fedora/index.html
+++ b/htdocs/build/fedora/index.html
@@ -64,6 +64,23 @@ Fedora systems.
<dl>
+<dt>Fedora 9</dt>
+
+<dd>
+
+You will need to install the following:
+
+<pre>
+sudo yum install -y \
+ antlr jdom junit gcc-java gcc-c++ \
+ libglade-java-devel libvte-java-devel \
+ automake xmlto transfig eclipse-ecj dogtail \
+ sharutils git audit-libs-devel binutils-devel \
+ yelp libtool make rpm-build
+</pre>
+
+</dd>
+
<dt>Fedora 8</dt>
<dd>
@@ -85,17 +102,6 @@ In addition, you may need to force a re-install of java-1.5.0-gcj.
See <a href="https://bugzilla.redhat.com/show_bug.cgi?id=377341#c4">Fedora
Bug 377341</a> for details.
-<br>
-
-For additional updates, check
-the <a href="/bugzilla/showdependencytree.cgi?id=4743">Fedora 8</a>,
-tracker bug.
-
-<br>
-
-For earlier Fedora releases check the <a href="fedora/">Fedora
-Page</a.
-
</dd>
<dt><a name="f7">Fedora 7</a><br><a name="fc6">Fedora Core 6</a></dt>
diff --git a/htdocs/build/index.html b/htdocs/build/index.html
index 32fcad1..cf88b64 100644
--- a/htdocs/build/index.html
+++ b/htdocs/build/index.html
@@ -79,7 +79,7 @@ that all its prerequisites are met.</p>
<dl>
-<dt><a name="f">Fedora 8</a></dt>
+<dt><a name="f">Fedora 9</a></dt>
<dd>
@@ -91,7 +91,7 @@ sudo yum install -y \
libglade-java-devel libvte-java-devel \
automake xmlto transfig eclipse-ecj dogtail \
sharutils git audit-libs-devel binutils-devel \
- yelp libtool make
+ yelp libtool make rpm-build
</pre>
<br>
@@ -103,7 +103,7 @@ Bug 377341</a> for details.
<br>
For additional updates, check
-the <a href="/bugzilla/showdependencytree.cgi?id=4743">Fedora 8</a>,
+the <a href="/bugzilla/showdependencytree.cgi?id=4743">Fedora 9</a>,
tracker bug.
<br>
hooks/post-receive
--
frysk system monitor/debugger
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-09 15:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-06-09 15:12 [SCM] master: Let JAVA be overridden in Runner/JniRunner cagney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).