Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gcc/4.4.1/120-java-nomulti.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Thu Dec 27 12:45:22 2012 +0100 (2012-12-27)
changeset 3152 b286c7993be5
parent 1393 b432bd628b10
permissions -rw-r--r--
scripts/addToolsVersion: properly handle .in vs. .in.2

While most components have their version in the .in file, some
have it in the .in.2 (eg. elf2flt).

Currently, to handle this case, we indiscriminately munge both files,
but this is wrong: in the elf2flt case, if we add a binutils version,
we do not want it to be added to elf2flt, and conversely.

So, for each tool, we need to explicitly know what file to munge.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> 
     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
crosstool-ng