patches/gcc/4.4.4/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun May 16 19:41:53 2010 +0200 (2010-05-16)
changeset 1953 a93af06e180d
child 2148 ada9128c98b8
permissions -rw-r--r--
cc/gcc: add latest version

Add 4.4.4 and forward-port patchset from 4.4.3
     1 diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
     2 
     3 diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure
     4 --- gcc-4.4.4.orig/libjava/configure	2010-04-29 10:26:54.000000000 +0200
     5 +++ gcc-4.4.4/libjava/configure	2010-05-16 19:10:49.000000000 +0200
     6 @@ -1021,6 +1021,8 @@
     7                            default=yes
     8    --enable-java-maintainer-mode
     9                            allow rebuilding of .class and .h files
    10 +  --enable-libjava-multilib
    11 +                          build libjava as multilib
    12    --disable-dependency-tracking  speeds up one-time build
    13    --enable-dependency-tracking   do not reject slow dependency extractors
    14    --enable-maintainer-mode  enable make rules and dependencies not useful
    15 @@ -1973,6 +1975,16 @@
    16  fi
    17  
    18  
    19 +# Check whether --enable-libjava-multilib was given.
    20 +if test "${enable_libjava_multilib+set}" = set; then
    21 +  enableval=$enable_libjava_multilib;
    22 +fi
    23 +
    24 +if test "$enable_libjava_multilib" = no; then
    25 +  multilib=no
    26 +  ac_configure_args="$ac_configure_args --disable-multilib"
    27 +fi
    28 +
    29  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    30  
    31  
    32 diff -durN gcc-4.4.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac
    33 --- gcc-4.4.4.orig/libjava/configure.ac	2010-04-21 19:04:42.000000000 +0200
    34 +++ gcc-4.4.4/libjava/configure.ac	2010-05-16 19:10:49.000000000 +0200
    35 @@ -139,6 +139,13 @@
    36  	[allow rebuilding of .class and .h files]))
    37  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
    38  
    39 +AC_ARG_ENABLE(libjava-multilib,
    40 +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
    41 +if test "$enable_libjava_multilib" = no; then
    42 +  multilib=no
    43 +  ac_configure_args="$ac_configure_args --disable-multilib"
    44 +fi
    45 +
    46  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
    47  GCC_NO_EXECUTABLES
    48