This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: Fix for bootstrap/3075
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Subject: Patch: Fix for bootstrap/3075
- From: Tom Tromey <tromey at redhat dot com>
- Date: 07 Jun 2001 21:26:30 -0600
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>, Mark Mitchell <mark at codesourcery dot com>
- Reply-To: tromey at redhat dot com
Mark (et al) --
This patch fixes bootstrap/3075.
With this patch installed I can configure and build (with
--enable-languages=java) both in srcdir and in a separate directory.
I tested this on my x86 Linux box.
Ok for the branch? (I don't want to assume anything... are checkins
on the branch Mark's-approval-only at this point?)
I am going to check in a similar patch on the trunk.
Tom
Index: boehm-gc/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/ChangeLog,v
retrieving revision 1.66.4.7
diff -u -r1.66.4.7 ChangeLog
--- boehm-gc/ChangeLog 2001/05/01 21:41:46 1.66.4.7
+++ boehm-gc/ChangeLog 2001/06/07 22:23:58
@@ -1,3 +1,10 @@
+2001-06-07 Tom Tromey <tromey@redhat.com>
+
+ * configure, Makefile.in: Rebuilt.
+ * configure: Don't call AC_CONFIG_AUX_DIR.
+ * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
+ boehm_gc_basedir.
+
2001-05-01 Jeffrey Oldham <oldham@codesourcery.com>
* gc_priv.h (UNLOCK): Change type of GC_noop1 argument.
Index: boehm-gc/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/Makefile.am,v
retrieving revision 1.18.4.3
diff -u -r1.18.4.3 Makefile.am
--- boehm-gc/Makefile.am 2001/03/22 19:02:39 1.18.4.3
+++ boehm-gc/Makefile.am 2001/06/07 22:23:59
@@ -113,7 +113,7 @@
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
-CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
# Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.21.4.1
diff -u -r1.21.4.1 configure.in
--- boehm-gc/configure.in 2001/04/26 04:33:06 1.21.4.1
+++ boehm-gc/configure.in 2001/06/07 22:23:59
@@ -2,9 +2,6 @@
AC_INIT(gc_mark.h)
-dnl Can't be done in BOEHM_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(..)
-
AC_CANONICAL_SYSTEM
BOEHM_CONFIGURE(.)
Index: libjava/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.674.2.80
diff -u -r1.674.2.80 ChangeLog
--- libjava/ChangeLog 2001/06/05 09:56:06 1.674.2.80
+++ libjava/ChangeLog 2001/06/07 23:57:27
@@ -1,3 +1,13 @@
+2001-06-07 Tom Tromey <tromey@redhat.com>
+
+ * configure, Makefile.am: Rebuilt.
+ * configure.in: Pass `--with-auxdir' to subdir configure. Don't
+ call AC_CONFIG_AUX_DIR. Look for unwind.h relative to
+ libgcj_basedir.
+ * Makefile.am (CONFIG_STATUS_DEPENDENCIES): Use srcdir, not
+ libgcj_basedir.
+ ($(extra_headers)): New target.
+
2001-05-31 Martin Kahlert <martin.kahlert@infineon.com>
Bryce McKinlay <bryce@waitaki.otago.ac.nz>
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.129.2.12
diff -u -r1.129.2.12 Makefile.am
--- libjava/Makefile.am 2001/05/30 14:07:08 1.129.2.12
+++ libjava/Makefile.am 2001/06/07 23:57:28
@@ -358,6 +358,9 @@
## Headers we maintain by hand and which we want to install.
extra_headers = java/lang/Object.h java/lang/Class.h
+$(extra_headers):
+ @:
+
## Install the headers. It is fairly ugly that we have to do this by
## hand.
install-data-local:
@@ -1432,7 +1435,7 @@
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
-CONFIG_STATUS_DEPENDENCIES = $(libgcj_basedir)/configure.host
+CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.73.2.10
diff -u -r1.73.2.10 configure.in
--- libjava/configure.in 2001/05/29 16:28:14 1.73.2.10
+++ libjava/configure.in 2001/06/07 23:57:29
@@ -1,9 +1,6 @@
dnl Process this with autoconf to create configure
AC_INIT(java/lang/System.java)
-dnl Can't be done in LIBGCJ_CONFIGURE because that confuses automake.
-AC_CONFIG_AUX_DIR(..)
-
AC_CANONICAL_SYSTEM
AC_PROG_LN_S
@@ -26,6 +23,8 @@
AC_DEFINE(USE_LTDL)
# Sigh. Libtool's macro doesn't do the right thing.
INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
+ # FIXME: this is a hack.
+ ac_configure_args="$ac_configure_args --with-auxdir=../$ac_aux_dir"
fi
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
@@ -350,8 +349,8 @@
# gcc, then look there. Otherwise look in compat-include. If all else
# fails, just hope the user has set things up somehow.
echo "probing $srcdir/../gcc/unwind.h"
-if test -r $srcdir/../gcc/unwind.h; then
- GCC_UNWIND_INCLUDE='-I$(top_srcdir)/../gcc'
+if test -r $libgcj_basedir/../gcc/unwind.h; then
+ GCC_UNWIND_INCLUDE='-I$(libgcj_basedir)/../gcc'
else
if test -d $srcdir/../compat-include; then
GCC_UNWIND_INCLUDE='-I$(top_srcdir)/../compat-include'
@@ -827,7 +826,7 @@
changequote(<<,>>)
d=`echo $f | sed -e 's,/[^/]*$,,'`
changequote([,])
- $srcdir/../mkinstalldirs $d
+ $libgcj_basedir/../mkinstalldirs $d
echo > $f
}
done