[PATCH] Add support for --disable-libjava-multilib

Jakub Jelinek jakub@redhat.com
Sat Dec 15 01:57:00 GMT 2007


Hi!

libjava is far bigger than any other target library in gcc and takes much
longer to build.  This patch (the configure bits originate from SUSE?,
I've only added corresponding configure.ac change) allows building all
target libs but libjava as multilib.  This can be handy in distribution
builds (as can be seen by both SUSE and Red Hat having something similar
(though I admit my original patch was much bigger hack)), or when various
devel libraries and headers libjava needs (Xorg, GNOME, ALSA, firefox, ...)
are only available for the primary arch, or even when just trying to
bootstrap/regtest gcc quickly on say x86_64.  I can surely keep this as our
private hack and others who need something similar can do the same, but
I thought I'd at least ask if this wouldn't be something others would
benefit from too.

--- libjava/configure.ac.jj	2007-12-07 17:55:50.000000000 +0100
+++ libjava/configure.ac	2007-12-07 18:36:56.000000000 +0100
@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
 	[allow rebuilding of .class and .h files]))
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
 
+AC_ARG_ENABLE(libjava-multilib,
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 GCC_NO_EXECUTABLES
 
--- libjava/configure.jj	2007-12-07 17:55:50.000000000 +0100
+++ libjava/configure	2007-12-07 18:39:58.000000000 +0100
@@ -1018,6 +1018,8 @@ Optional Features:
   --enable-gconf-peer     compile GConf native peers for util.preferences
   --enable-java-maintainer-mode
                           allow rebuilding of .class and .h files
+  --enable-libjava-multilib
+                          build libjava as multilib
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1848,6 +1850,16 @@ else
 fi
 
 
+# Check whether --enable-libjava-multilib was given.
+if test "${enable_libjava_multilib+set}" = set; then
+  enableval=$enable_libjava_multilib;
+fi
+
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 
 

	Jakub



More information about the Gcc-patches mailing list