diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-4.5.1/fedora/gcc43-java-nomulti.patch')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-4.5.1/fedora/gcc43-java-nomulti.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/fedora/gcc43-java-nomulti.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/fedora/gcc43-java-nomulti.patch new file mode 100644 index 0000000000..3cb10f3c23 --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/fedora/gcc43-java-nomulti.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | Index: libjava/configure.ac | ||
2 | =================================================================== | ||
3 | --- libjava/configure.ac.orig 2010-03-21 12:41:37.000000000 -0700 | ||
4 | +++ libjava/configure.ac 2010-06-25 10:17:47.489886278 -0700 | ||
5 | @@ -139,6 +139,13 @@ | ||
6 | [allow rebuilding of .class and .h files])) | ||
7 | AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) | ||
8 | |||
9 | +AC_ARG_ENABLE(libjava-multilib, | ||
10 | + AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) | ||
11 | +if test "$enable_libjava_multilib" = no; then | ||
12 | + multilib=no | ||
13 | + ac_configure_args="$ac_configure_args --disable-multilib" | ||
14 | +fi | ||
15 | + | ||
16 | # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. | ||
17 | GCC_NO_EXECUTABLES | ||
18 | |||
19 | Index: libjava/configure | ||
20 | =================================================================== | ||
21 | --- libjava/configure.orig 2010-04-02 11:18:06.000000000 -0700 | ||
22 | +++ libjava/configure 2010-06-25 10:17:47.516381209 -0700 | ||
23 | @@ -1609,6 +1609,8 @@ | ||
24 | default=yes | ||
25 | --enable-java-maintainer-mode | ||
26 | allow rebuilding of .class and .h files | ||
27 | + --enable-libjava-multilib | ||
28 | + build libjava as multilib | ||
29 | --disable-dependency-tracking speeds up one-time build | ||
30 | --enable-dependency-tracking do not reject slow dependency extractors | ||
31 | --enable-maintainer-mode enable make rules and dependencies not useful | ||
32 | @@ -3346,6 +3348,16 @@ | ||
33 | fi | ||
34 | |||
35 | |||
36 | +# Check whether --enable-libjava-multilib was given. | ||
37 | +if test "${enable_libjava_multilib+set}" = set; then | ||
38 | + enableval=$enable_libjava_multilib; | ||
39 | +fi | ||
40 | + | ||
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 | |||
48 | |||