diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-11-22 04:02:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-11-22 04:02:40 +0000 |
| commit | 8af2bab17f3349db70e323b2e75859aabfc8e839 (patch) | |
| tree | ad4ae7c34bf23dd546da59ab102e91796f976fe8 /4.5.4 | |
| parent | Backport patches to ignore always_inline attribute on redefined extern inline... (diff) | |
| download | gcc-patches-8af2bab17f3349db70e323b2e75859aabfc8e839.tar.gz gcc-patches-8af2bab17f3349db70e323b2e75859aabfc8e839.tar.bz2 gcc-patches-8af2bab17f3349db70e323b2e75859aabfc8e839.zip | |
drop libjava multilib patch since we do not enable/disable this lib independently of the multilib flag -- either you get all of multilib, or you get none of it. if you do not want java, then do not USE=gcj.
Diffstat (limited to '4.5.4')
| -rw-r--r-- | 4.5.4/gentoo/03_all_gcc43-java-nomulti.patch | 44 | ||||
| -rw-r--r-- | 4.5.4/gentoo/README.history | 1 |
2 files changed, 1 insertions, 44 deletions
diff --git a/4.5.4/gentoo/03_all_gcc43-java-nomulti.patch b/4.5.4/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index b7ee24b..0000000 --- a/4.5.4/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- libjava/configure.ac.jj -+++ libjava/configure.ac -@@ -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 -+++ libjava/configure -@@ -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. - - diff --git a/4.5.4/gentoo/README.history b/4.5.4/gentoo/README.history index b3a50e5..a50b2cf 100644 --- a/4.5.4/gentoo/README.history +++ b/4.5.4/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc43-java-nomulti.patch + 15_all_libgfortran-Werror.patch 1.0 15 Jul 2012 |