This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: Patch: FYI: java.endorsed.dirs
- From: Alexandre Oliva <aoliva at redhat dot com>
- To: tromey at redhat dot com
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 26 Mar 2005 07:40:15 -0300
- Subject: Re: Patch: FYI: java.endorsed.dirs
- Organization: Red Hat Global Engineering Services Compiler Team
- References: <m3vf7hzzoj.fsf@localhost.localdomain>
On Mar 23, 2005, Tom Tromey <tromey@redhat.com> wrote:
> +## Needed because $(ZIP) is a relative path.
> +MULTIBUILDTOP = ../../
This breaks the build on multilib hosts, because now we can't find
fastjar building multilibs other than the default. I think you want
top_builddir before MULTIBUILDTOP in GCJH and ZIP pathnames, instead
of forcing MULTIBUILDTOP to something that doesn't match its intended
meaning but happens to work for the default multilib.
I'm starting a build test with this patch, but I won't be able to
check the results back before Monday, so feel free to check it in
before that if you like it and it works for you.
Index: libjava/ChangeLog
from Alexandre Oliva <aoliva@redhat.com>
* configure.ac (GCJH, ZIP): Prefix with top_builddir.
* configure: Rebuild.
* external/w3c_dom/Makefile.am (MULTIBUILDTOP): Don't override.
* external/w3c_dom/Makefile.in: Rebuild.
* external/sax/Makefile.am (MULTIBUILDTOP): Don't override.
* external/sax/Makefile.in: Rebuild.
Index: libjava/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.ac,v
retrieving revision 1.22
diff -u -p -r1.22 configure.ac
--- libjava/configure.ac 21 Mar 2005 18:12:21 -0000 1.22
+++ libjava/configure.ac 26 Mar 2005 10:38:46 -0000
@@ -1067,8 +1067,8 @@ fi
case "${which_gcj}" in
built)
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
- GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
- ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
+ GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
+ ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
;;
cross)
if test "x${with_newlib}" = "xyes"; then
@@ -1085,7 +1085,7 @@ case "${which_gcj}" in
GCJ="gcj -B`${PWDCMD-pwd}`/"
## In this case, gcj is found outside the build tree. However, zip is
## found in the build tree.
- ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
+ ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
GCJH=gcjh
;;
esac
Index: libjava/external/sax/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/external/sax/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- libjava/external/sax/Makefile.am 24 Mar 2005 19:42:40 -0000 1.5
+++ libjava/external/sax/Makefile.am 26 Mar 2005 10:38:46 -0000
@@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-object
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
-## Needed because $(ZIP) is a relative path.
-MULTIBUILDTOP = ../../
-
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
Index: libjava/external/w3c_dom/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/external/w3c_dom/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- libjava/external/w3c_dom/Makefile.am 24 Mar 2005 19:42:40 -0000 1.5
+++ libjava/external/w3c_dom/Makefile.am 26 Mar 2005 10:38:46 -0000
@@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-object
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
-## Needed because $(ZIP) is a relative path.
-MULTIBUILDTOP = ../../
-
## The compiler with whatever flags we want for both -c and -C
## compiles.
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
--
Alexandre Oliva http://www.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist oliva@{lsd.ic.unicamp.br, gnu.org}