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