This is the mail archive of the
java-patches@sourceware.cygnus.com
mailing list for the Java project.
[libgcj 2.95] Native multilibs aren't installed properly
- To: java-patches@sourceware.cygnus.com
- Subject: [libgcj 2.95] Native multilibs aren't installed properly
- From: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
- Date: Tue, 10 Aug 1999 02:09:28 +0200 (MET DST)
I noticed that multilibs in native configurations aren't installed
properly. All are installed into $(libdir), so the last version installed
overwrites the previous ones. I observed this behavior on Digital UNIX
V4.0B (where gcc 2.95 introduced -mieee multilibing) and IRIX 6.2 (with
-mabi=32 and -mabi=64). The following patches fix this.
The libffi/configure.in patch contains my previous configure --help patch,
since both affect lines nearby. multilib support for libffi may not be
complete.
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Email: ro@TechFak.Uni-Bielefeld.DE
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
Index: zlib/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/zlib/Makefile.am,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile.am
--- Makefile.am 1999/07/19 19:11:54 1.5
+++ Makefile.am 1999/08/09 22:11:48
@@ -13,7 +13,7 @@ MULTICLEAN = true
## Install a library built with a cross compiler in tooldir, not
## libdir.
if USE_LIBDIR
-toolexeclibdir = $(libdir)
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
else
toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile.am
--- Makefile.am 1999/08/08 14:06:19 1.26
+++ Makefile.am 1999/08/09 22:11:41
@@ -15,7 +15,7 @@ endif
## Install a library built with a cross compiler in tooldir, not
## libdir.
if USE_LIBDIR
-toolexeclibdir = $(libdir)
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
else
toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in (USE_LIBDIR): Define for native builds.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
Use USE_LIBDIR.
Index: libffi/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libffi/Makefile.am,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.am
--- Makefile.am 1999/08/08 22:58:30 1.2
+++ Makefile.am 1999/08/09 22:11:37
@@ -21,8 +21,14 @@ MULTISUBDIR =
MULTIDO = true
MULTICLEAN = true
+## Install a library built with a cross compiler in tooldir, not
+## libdir.
+if USE_LIBDIR
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
+else
toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
+endif
toolexeclib_LTLIBRARIES = libffi.la
Index: libffi/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/configure.in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 configure.in
--- configure.in 1999/08/08 13:27:19 1.1.1.1
+++ configure.in 1999/08/09 22:11:41
@@ -67,14 +67,16 @@ AC_SUBST(TARGETDIR)
AC_SUBST(SHELL)
-AC_ARG_ENABLE(debug,[ --enable-debug Debugging mode], AC_DEFINE(FFI_DEBUG))
+AC_ARG_ENABLE(debug,[ --enable-debug debugging mode], AC_DEFINE(FFI_DEBUG))
-AC_ARG_ENABLE(debug,[ --disable-structs Omit code for struct support], AC_DEFINE(FFI_NO_STRUCTS))
+AC_ARG_ENABLE(debug,[ --disable-structs omit code for struct support], AC_DEFINE(FFI_NO_STRUCTS))
-AC_ARG_ENABLE(debug,[ --disable-raw-api Make the raw api unavailable], AC_DEFINE(FFI_NO_RAW_API))
+AC_ARG_ENABLE(debug,[ --disable-raw-api make the raw api unavailable], AC_DEFINE(FFI_NO_RAW_API))
AC_ARG_ENABLE(purify-safety,
-[ --enable-purify-safety Purify-safe mode], AC_DEFINE(USING_PURIFY))
+[ --enable-purify-safety purify-safe mode], AC_DEFINE(USING_PURIFY))
+
+AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
AC_OUTPUT(include/Makefile include/ffi.h Makefile,,
test ! -d include && mkdir include
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
Index: boehm-gc/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- Makefile.am 1999/07/19 19:17:22 1.9
+++ Makefile.am 1999/08/09 22:11:33
@@ -17,7 +17,7 @@ MULTICLEAN = true
## Install a library built with a cross compiler in tooldir, not
## libdir.
if USE_LIBDIR
-toolexeclibdir = $(libdir)
+toolexeclibdir = $(libdir)$(MULTISUBDIR)
else
toolexecdir = $(exec_prefix)/$(target_alias)
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)