diff options
author | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 11:00:44 +0000 |
---|---|---|
committer | Thomas Kunze <thommycheck@gmx.de> | 2008-04-15 11:00:44 +0000 |
commit | 22586092474a75f63337026fcfaa25701ad5b872 (patch) | |
tree | 68d44a6ca2c400a64d08ea23f23354ceebab0ae7 /packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch | |
parent | acb6fa33fccf7196c86a3a28f927d4fa441d05eb (diff) | |
parent | 907c2d35eb8bb9f592909eb017820b7a8fe62ec6 (diff) |
merge of 'acd40ed8d57971494f1b3dea27c1e5c3ab6b2a7f'
and 'ff7245ddafaf0bcb4c4a73dea132994953a8ff8c'
Diffstat (limited to 'packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch')
-rw-r--r-- | packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch b/packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch new file mode 100644 index 0000000000..f07ead8f2b --- /dev/null +++ b/packages/gcc/gcc-4.3.0/fedora/gcc43-java-nomulti.patch @@ -0,0 +1,44 @@ +--- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100 ++++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100 +@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode, + [allow rebuilding of .class and .h files])) + AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes) + ++AC_ARG_ENABLE(libjava-multilib, ++ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib])) ++if test "$enable_libjava_multilib" = no; then ++ multilib=no ++ ac_configure_args="$ac_configure_args --disable-multilib" ++fi ++ + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. + GCC_NO_EXECUTABLES + +--- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100 ++++ libjava/configure 2007-12-07 18:39:58.000000000 +0100 +@@ -1018,6 +1018,8 @@ Optional Features: + --enable-gconf-peer compile GConf native peers for util.preferences + --enable-java-maintainer-mode + allow rebuilding of .class and .h files ++ --enable-libjava-multilib ++ build libjava as multilib + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors + --enable-maintainer-mode enable make rules and dependencies not useful +@@ -1848,6 +1850,16 @@ else + fi + + ++# Check whether --enable-libjava-multilib was given. ++if test "${enable_libjava_multilib+set}" = set; then ++ enableval=$enable_libjava_multilib; ++fi ++ ++if test "$enable_libjava_multilib" = no; then ++ multilib=no ++ ac_configure_args="$ac_configure_args --disable-multilib" ++fi ++ + # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX. + + |