This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] Fix path of the classmap.db file
- From: Matthias Klose <doko at ubuntu dot com>
- To: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Wed, 02 Jul 2008 14:17:03 +0200
- Subject: [patch] Fix path of the classmap.db file
Andrew Haley pointed out that gcj-dbtool -p doesn't work correctly, this is due
to a wrong macro LIBGCJ_DEFAULT_DATABASE_TAIL, having a wrong gcj subdirectory
encoded. The LIBGCJ_DEFAULT_DATABASE macro is already using the path.
Tested that the gcj-dbtool built with this patch uses the correct path.
Ok for the trunk and the 4.3 branch?
Matthias
2008-07-02 Matthias Klose <doko@ubuntu.com>
* configure.ac: Substitute gcjsubdir.
* Makefile.am (db_pathtail): Use it.
* Makefile.in, configure: Regenerate.
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac (revision 137349)
+++ libjava/configure.ac (working copy)
@@ -1416,6 +1416,7 @@
;;
esac
AC_SUBST(dbexecdir)
+AC_SUBST(gcjsubdir)
AC_DEFINE(JV_VERSION, "1.5.0", [Compatibility version string])
AC_DEFINE(JV_API_VERSION, "1.5", [API compatibility version string])
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 137349)
+++ libjava/Makefile.am (working copy)
@@ -74,7 +74,8 @@
## Name of the default .db.
db_name = classmap.db
## Compiler specific component of the .db file
-db_pathtail = gcj-$(gcc_version)/$(db_name)
+gcjsubdir = @gcjsubdir@
+db_pathtail = $(gcjsubdir)/$(db_name)
## For now, only on native systems. FIXME.
if NATIVE