patches/gcc/4.4.4/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Oct 12 23:47:24 2010 +0200 (2010-10-12)
branch1.8
changeset 2151 ee9ce2595560
parent 1948 d341be24dc68
permissions -rw-r--r--
cc/gcc: fix 4.4.4 patchset

Most patches contained two spurious first lines.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
(transplanted from ada9128c98b89569b54aefe9b7a4b0bd2bd20023)
     1 diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure
     2 --- gcc-4.4.4.orig/libjava/configure	2010-04-29 10:26:54.000000000 +0200
     3 +++ gcc-4.4.4/libjava/configure	2010-05-16 19:10:49.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.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac
    31 --- gcc-4.4.4.orig/libjava/configure.ac	2010-04-21 19:04:42.000000000 +0200
    32 +++ gcc-4.4.4/libjava/configure.ac	2010-05-16 19:10:49.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