Re: Patch: FYI: java.endorsed.dirs

[Alexandre Oliva <aoliva at redhat dot com>]

On Mar 26, 2005, Tom Tromey <tromey@redhat.com> wrote:

>>>>>> "Alexandre" == Alexandre Oliva <aoliva@redhat.com> writes:
>>> +## Needed because $(ZIP) is a relative path.
>>> +MULTIBUILDTOP = ../../

Alexandre> This breaks the build on multilib hosts, because now we
Alexandre> can't find fastjar building multilibs other than the
Alexandre> default.

> Man, I completely forgot I added that during this round of patches.
> I'm going to approve Mike's patch for this, since it is known to work.
> After that we can see -- your patch looks cleaner, but I thought there
> was some problem with getting MULTIBUILDTOP set in the subdir
> Makefiles.

Yep, it's not propagated.  This patch fixes it in a relatively clean
way.  We can't just add it to AM_MAKEFLAGS, otherwise all multilibs
will get the same setting when the primary multilib recurses into
them.

Index: libjava/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>

	* configure.ac: Propagate MULTIlib settings to sub Makefiles.
	(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 28 Mar 2005 19:06:35 -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
@@ -1399,6 +1399,12 @@ case " $CONFIG_FILES " in
    ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
    ;;
 esac
+for ac_multi_file in $CONFIG_FILES; do
+  case $ac_multi_file in
+  */Makefile)
+    grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;;
+  esac
+done
 ],
 srcdir=${srcdir}
 host=${host}
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 28 Mar 2005 19:06:35 -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 28 Mar 2005 19:06:35 -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}