patches/gcc/4.4.5/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 26 13:30:51 2012 +0100 (2012-12-26)
changeset 3145 598880dab0f3
permissions -rw-r--r--
libc/glibc: both glibc and eglibc have pkgversion and bugurl

Well, all eglibc version we support do, and latest glibc versions
we support do.

Not all glibc versions do, but older versions simply ignore the
unrecognised ./configure flags.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
     1 diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
     2 --- gcc-4.4.5.orig/libjava/configure	2010-10-01 10:26:18.000000000 +0200
     3 +++ gcc-4.4.5/libjava/configure	2010-10-09 22:58:04.000000000 +0200
     4 @@ -1022,6 +1022,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 @@ -1974,6 +1976,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.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
    31 --- gcc-4.4.5.orig/libjava/configure.ac	2010-06-11 13:49:16.000000000 +0200
    32 +++ gcc-4.4.5/libjava/configure.ac	2010-10-09 22:58:04.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