patches/gcc/4.4.3/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jul 10 00:02:05 2011 +0200 (2011-07-10)
branch1.11
changeset 2556 1c0580ebdf9d
parent 1611 e2516bba8fe5
permissions -rw-r--r--
scripts: on startup, also remove the buildtools dir

In case there's one lingering around (whether the previous build was
successful, or failed), we have to remove the buildtools directory
as well as the toochain build dir.

This should also fix the case where out makeinfo wrapper calls
itself recursively.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from 0e8ff57073838afea8830fe09d1d01cdf7cb37d8)
     1 diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
     2 --- gcc-4.4.0.orig/libjava/configure	2009-04-21 11:08:08.000000000 +0200
     3 +++ gcc-4.4.0/libjava/configure	2009-05-27 21:38:03.000000000 +0200
     4 @@ -1021,6 +1021,8 @@
     5                            default=yes
     6    --enable-java-maintainer-mode
     7                            allow rebuilding of .class and .h files
     8 +  --enable-libjava-multilib
     9 +                          build libjava as multilib
    10    --disable-dependency-tracking  speeds up one-time build
    11    --enable-dependency-tracking   do not reject slow dependency extractors
    12    --enable-maintainer-mode  enable make rules and dependencies not useful
    13 @@ -1973,6 +1975,16 @@
    14  fi
    15  
    16  
    17 +# Check whether --enable-libjava-multilib was given.
    18 +if test "${enable_libjava_multilib+set}" = set; then
    19 +  enableval=$enable_libjava_multilib;
    20 +fi
    21 +
    22 +if test "$enable_libjava_multilib" = no; then
    23 +  multilib=no
    24 +  ac_configure_args="$ac_configure_args --disable-multilib"
    25 +fi
    26 +
    27  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    28  
    29  
    30 diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
    31 --- gcc-4.4.0.orig/libjava/configure.ac	2009-04-09 23:54:28.000000000 +0200
    32 +++ gcc-4.4.0/libjava/configure.ac	2009-05-27 21:38:03.000000000 +0200
    33 @@ -139,6 +139,13 @@
    34  	[allow rebuilding of .class and .h files]))
    35  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
    36  
    37 +AC_ARG_ENABLE(libjava-multilib,
    38 +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
    39 +if test "$enable_libjava_multilib" = no; then
    40 +  multilib=no
    41 +  ac_configure_args="$ac_configure_args --disable-multilib"
    42 +fi
    43 +
    44  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    45  GCC_NO_EXECUTABLES
    46