Magellan Linux

Annotation of /trunk/gcc/patches/gcc-6.1.0-java-no-multilib.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2786 - (hide annotations) (download)
Fri May 13 12:08:28 2016 UTC (8 years, 1 month ago) by niro
File size: 1621 byte(s)
-added no multilib patch
1 niro 2786 --- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100
2     +++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100
3     @@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
4     [allow rebuilding of .class and .h files]))
5     AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
6    
7     +AC_ARG_ENABLE(libjava-multilib,
8     + AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
9     +if test "$enable_libjava_multilib" = no; then
10     + multilib=no
11     + ac_configure_args="$ac_configure_args --disable-multilib"
12     +fi
13     +
14     # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
15     GCC_NO_EXECUTABLES
16    
17     --- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100
18     +++ libjava/configure 2007-12-07 18:39:58.000000000 +0100
19     @@ -1021,6 +1021,8 @@ Optional Features:
20     default=yes
21     --enable-java-maintainer-mode
22     allow rebuilding of .class and .h files
23     + --enable-libjava-multilib
24     + build libjava as multilib
25     --disable-dependency-tracking speeds up one-time build
26     --enable-dependency-tracking do not reject slow dependency extractors
27     --enable-maintainer-mode enable make rules and dependencies not useful
28     @@ -1973,6 +1975,16 @@ else
29     fi
30    
31    
32     +# Check whether --enable-libjava-multilib was given.
33     +if test "${enable_libjava_multilib+set}" = set; then
34     + enableval=$enable_libjava_multilib;
35     +fi
36     +
37     +if test "$enable_libjava_multilib" = no; then
38     + multilib=no
39     + ac_configure_args="$ac_configure_args --disable-multilib"
40     +fi
41     +
42     # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
43    
44