diff options
67 files changed, 55 insertions, 1413 deletions
diff --git a/4.0.3/gentoo/03_all_gcc4-java-nomulti.patch b/4.0.3/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.0.3/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.0.4/gentoo/03_all_gcc4-java-nomulti.patch b/4.0.4/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.0.4/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.1.0/gentoo/03_all_gcc4-java-nomulti.patch b/4.1.0/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.1.0/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.1.1/gentoo/03_all_gcc4-java-nomulti.patch b/4.1.1/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.1.1/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.1.2/gentoo/03_all_gcc4-java-nomulti.patch b/4.1.2/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.1.2/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.2.0/gentoo/03_all_gcc4-java-nomulti.patch b/4.2.0/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.2.0/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.2.0/gentoo/README.history b/4.2.0/gentoo/README.history index 83c860b..3ca9d2d 100644 --- a/4.2.0/gentoo/README.history +++ b/4.2.0/gentoo/README.history @@ -1,3 +1,6 @@ +1.5 [pending] + - 03_all_gcc4-java-nomulti.patch + 1.4 10 Jul 2007 + 43_all_gcc42-PR32500.patch diff --git a/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch b/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.2.2/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.2.2/gentoo/README.history b/4.2.2/gentoo/README.history index edd72e8..a7a4a3e 100644 --- a/4.2.2/gentoo/README.history +++ b/4.2.2/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc4-java-nomulti.patch + 56_all_gcc-4.2-pr31899.patch 1.0 11 Oct 2007 diff --git a/4.2.3/gentoo/03_all_gcc4-java-nomulti.patch b/4.2.3/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.2.3/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.2.3/gentoo/README.history b/4.2.3/gentoo/README.history index 7f46322..47b4d06 100644 --- a/4.2.3/gentoo/README.history +++ b/4.2.3/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc4-java-nomulti.patch + 56_all_gcc-4-pr32177.patch + 65_all_gcc-hppa-pr34627.patch diff --git a/4.2.4/gentoo/03_all_gcc4-java-nomulti.patch b/4.2.4/gentoo/03_all_gcc4-java-nomulti.patch deleted file mode 100644 index 3a6554d..0000000 --- a/4.2.4/gentoo/03_all_gcc4-java-nomulti.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 -+++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 -@@ -367,6 +367,10 @@ use_gtk_awt="" - TOOLKIT= - AC_SUBST(TOOLKIT) - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi -+ - for peer in $peerlibs ; do - case $peer in - xlib) ---- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 -+++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 -@@ -4118,6 +4118,9 @@ use_gtk_awt="" - # The default toolkit to use is the first one specified. - TOOLKIT= - -+if test -n "${with_multisubdir}"; then -+ peerlibs=no -+fi - - for peer in $peerlibs ; do - case $peer in diff --git a/4.2.4/gentoo/README.history b/4.2.4/gentoo/README.history index a93b0c1..26ea4e0 100644 --- a/4.2.4/gentoo/README.history +++ b/4.2.4/gentoo/README.history @@ -1,5 +1,6 @@ 1.2 [pending] + 01_all_gcc-4.1-alpha-asm-mcpu.patch + - 03_all_gcc4-java-nomulti.patch + 63_all_gcc42-pr28482.patch 1.1 15 Jan 2009 diff --git a/4.3.0/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.0/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.0/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.0/gentoo/README.history b/4.3.0/gentoo/README.history index d5a1a69..6c73eca 100644 --- a/4.3.0/gentoo/README.history +++ b/4.3.0/gentoo/README.history @@ -1,4 +1,5 @@ 1.3 [pending] + - 03_all_gcc43-java-nomulti.patch + 69_all-gcc43-pr38591-depend.patch 1.2 10 May 2008 diff --git a/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.1/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.1/gentoo/README.history b/4.3.1/gentoo/README.history index 520dd96..22608af 100644 --- a/4.3.1/gentoo/README.history +++ b/4.3.1/gentoo/README.history @@ -1,4 +1,5 @@ 1.2 [pending] + - 03_all_gcc43-java-nomulti.patch + 69_all-gcc43-pr38591-depend.patch 1.1 05 Jul 2008 diff --git a/4.3.2/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.2/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.2/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.2/gentoo/README.history b/4.3.2/gentoo/README.history index 4b29f5f..6836a27 100644 --- a/4.3.2/gentoo/README.history +++ b/4.3.2/gentoo/README.history @@ -1,4 +1,5 @@ 1.9 [pending] + - 03_all_gcc43-java-nomulti.patch + 69_all-gcc43-pr38591-depend.patch 1.8 02 Sep 2009 diff --git a/4.3.3/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.3/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.3/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.3/gentoo/README.history b/4.3.3/gentoo/README.history index ebd9ae7..5331b4b 100644 --- a/4.3.3/gentoo/README.history +++ b/4.3.3/gentoo/README.history @@ -1,4 +1,5 @@ 1.3 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 69_all-gcc43-pr38591-depend.patch + 93_all_gcc43-pr37179.patch diff --git a/4.3.4/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.4/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.4/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.4/gentoo/README.history b/4.3.4/gentoo/README.history index 849815e..00d69ec 100644 --- a/4.3.4/gentoo/README.history +++ b/4.3.4/gentoo/README.history @@ -1,4 +1,5 @@ 1.5 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch 1.4 02 Dec 2011 diff --git a/4.3.5/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.5/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.5/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.5/gentoo/README.history b/4.3.5/gentoo/README.history index d2457d8..cbc64d4 100644 --- a/4.3.5/gentoo/README.history +++ b/4.3.5/gentoo/README.history @@ -1,4 +1,5 @@ 1.2 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch 1.1 17 Oct 2010 diff --git a/4.3.6/gentoo/03_all_gcc43-java-nomulti.patch b/4.3.6/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.3.6/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.3.6/gentoo/README.history b/4.3.6/gentoo/README.history index 77cbc0e..d7dfae2 100644 --- a/4.3.6/gentoo/README.history +++ b/4.3.6/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch 1.0 01 Jul 2011 diff --git a/4.4.0/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.0/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.0/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.0/gentoo/README.history b/4.4.0/gentoo/README.history index ec627ec..b9cc9be 100644 --- a/4.4.0/gentoo/README.history +++ b/4.4.0/gentoo/README.history @@ -1,4 +1,5 @@ 1.3 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.1/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.1/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.1/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.1/gentoo/README.history b/4.4.1/gentoo/README.history index f9fb65f..a6c5c88 100644 --- a/4.4.1/gentoo/README.history +++ b/4.4.1/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.2/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.2/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.2/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.2/gentoo/README.history b/4.4.2/gentoo/README.history index a56c036..a7d77bb 100644 --- a/4.4.2/gentoo/README.history +++ b/4.4.2/gentoo/README.history @@ -1,6 +1,7 @@ 1.1 [pending] + 01_all_gcc-4.1-alpha-asm-mcpu.patch + 02_all_gcc-4.4-alpha-PR42113.patch + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.3/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.3/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.3/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.3/gentoo/README.history b/4.4.3/gentoo/README.history index 80e606c..5bb7b51 100644 --- a/4.4.3/gentoo/README.history +++ b/4.4.3/gentoo/README.history @@ -1,4 +1,5 @@ 1.5 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.4/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.4/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.4/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.4/gentoo/README.history b/4.4.4/gentoo/README.history index 731ffb9..28470ed 100644 --- a/4.4.4/gentoo/README.history +++ b/4.4.4/gentoo/README.history @@ -1,4 +1,5 @@ 1.5 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.5/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.5/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.5/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.5/gentoo/README.history b/4.4.5/gentoo/README.history index 612bde8..47e24a6 100644 --- a/4.4.5/gentoo/README.history +++ b/4.4.5/gentoo/README.history @@ -1,4 +1,5 @@ 1.4 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.6/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.6/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.6/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.6/gentoo/README.history b/4.4.6/gentoo/README.history index 977ce7d..3e6a38b 100644 --- a/4.4.6/gentoo/README.history +++ b/4.4.6/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch + 27_all_gcj-glibc-2.15-pr50888.patch diff --git a/4.4.7/gentoo/03_all_gcc43-java-nomulti.patch b/4.4.7/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.4.7/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.4.7/gentoo/README.history b/4.4.7/gentoo/README.history index 2f255bc..f9eb12a 100644 --- a/4.4.7/gentoo/README.history +++ b/4.4.7/gentoo/README.history @@ -1,4 +1,5 @@ 1.1 [pending] + - 03_all_gcc43-java-nomulti.patch - 10_all_gcc-default-fortify-source.patch + 15_all_libgfortran-Werror.patch diff --git a/4.5.0/gentoo/03_all_gcc43-java-nomulti.patch b/4.5.0/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.5.0/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.5.0/gentoo/README.history b/4.5.0/gentoo/README.history index ded155d..fa62d3c 100644 --- a/4.5.0/gentoo/README.history +++ b/4.5.0/gentoo/README.history @@ -1,3 +1,6 @@ +1.6 [pending] + - 03_all_gcc43-java-nomulti.patch + 1.5 28 Sep 2012 + 05_all_gcc-4.5.x-siginfo.patch + 15_all_libgfortran-Werror.patch diff --git a/4.5.1/gentoo/03_all_gcc43-java-nomulti.patch b/4.5.1/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index f07ead8..0000000 --- a/4.5.1/gentoo/03_all_gcc43-java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- 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. - - diff --git a/4.5.1/gentoo/README.history b/4.5.1/gentoo/README.history index 10b1209..495d237 100644 --- a/4.5.1/gentoo/README.history +++ b/4.5.1/gentoo/README.history @@ -1,3 +1,6 @@ +1.6 [pending] + - 03_all_gcc43-java-nomulti.patch + 1.5 27 Sep 2011 + 05_all_gcc-4.5.x-siginfo.patch + 15_all_libgfortran-Werror.patch diff --git a/4.5.2/gentoo/03_all_gcc43-java-nomulti.patch b/4.5.2/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index b7ee24b..0000000 --- a/4.5.2/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.2/gentoo/README.history b/4.5.2/gentoo/README.history index 810c324..30c6648 100644 --- a/4.5.2/gentoo/README.history +++ b/4.5.2/gentoo/README.history @@ -1,3 +1,6 @@ +1.3 [pending] + - 03_all_gcc43-java-nomulti.patch + 1.2 27 Sep 2011 + 05_all_gcc-4.5.x-siginfo.patch + 15_all_libgfortran-Werror.patch diff --git a/4.5.3/gentoo/03_all_gcc43-java-nomulti.patch b/4.5.3/gentoo/03_all_gcc43-java-nomulti.patch deleted file mode 100644 index b7ee24b..0000000 --- a/4.5.3/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.3/gentoo/README.history b/4.5.3/gentoo/README.history index 250b1e3..4cd3d91 100644 --- a/4.5.3/gentoo/README.history +++ b/4.5.3/gentoo/README.history @@ -1,3 +1,6 @@ +1.7 [pending] + - 03_all_gcc43-java-nomulti.patch + 1.6 27 Sep 2011 + 05_all_gcc-4.5.x-siginfo.patch + 15_all_libgfortran-Werror.patch 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 diff --git a/4.6.0/gentoo/03_all_java-nomulti.patch b/4.6.0/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.6.0/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.6.0/gentoo/README.history b/4.6.0/gentoo/README.history index 87914a8..cf1d6b3 100644 --- a/4.6.0/gentoo/README.history +++ b/4.6.0/gentoo/README.history @@ -1,3 +1,6 @@ +1.4 [pending] + - 03_all_java-nomulti.patch + 1.3 27 Sep 2011 + 05_all_gcc-4.6.x-siginfo.patch - 08_all_cross-compile.patch diff --git a/4.6.1/gentoo/03_all_java-nomulti.patch b/4.6.1/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.6.1/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.6.1/gentoo/README.history b/4.6.1/gentoo/README.history index c5f5d97..59d80a2 100644 --- a/4.6.1/gentoo/README.history +++ b/4.6.1/gentoo/README.history @@ -1,3 +1,6 @@ +1.2 [pending] + - 03_all_java-nomulti.patch + 1.1 27 Sep 2011 + 05_all_gcc-4.6.x-siginfo.patch - 08_all_cross-compile.patch diff --git a/4.6.2/gentoo/03_all_java-nomulti.patch b/4.6.2/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.6.2/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.6.2/gentoo/README.history b/4.6.2/gentoo/README.history index 9651fb8..49a8490 100644 --- a/4.6.2/gentoo/README.history +++ b/4.6.2/gentoo/README.history @@ -1,3 +1,6 @@ +1.6 [pending] + - 03_all_java-nomulti.patch + 1.5 27 Sep 2011 + 05_all_gcc-4.6.x-siginfo.patch - 08_all_cross-compile.patch diff --git a/4.6.3/gentoo/03_all_java-nomulti.patch b/4.6.3/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.6.3/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.6.3/gentoo/README.history b/4.6.3/gentoo/README.history index c84886d..62ad1c1 100644 --- a/4.6.3/gentoo/README.history +++ b/4.6.3/gentoo/README.history @@ -1,3 +1,6 @@ +1.8 [pending] + - 03_all_java-nomulti.patch + 1.7 27 Sep 2011 + 15_all_libgfortran-Werror.patch diff --git a/4.7.0/gentoo/03_all_java-nomulti.patch b/4.7.0/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.7.0/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.7.0/gentoo/README.history b/4.7.0/gentoo/README.history index 35ba705..fb8899a 100644 --- a/4.7.0/gentoo/README.history +++ b/4.7.0/gentoo/README.history @@ -1,3 +1,6 @@ +1.3 [pending] + - 03_all_java-nomulti.patch + 1.2 27 Sep 2012 + 05_all_gcc-4.7.0-siginfo.patch + 15_all_libgfortran-Werror.patch diff --git a/4.7.1/gentoo/03_all_java-nomulti.patch b/4.7.1/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.7.1/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.7.1/gentoo/README.history b/4.7.1/gentoo/README.history index 4fabf02..746047f 100644 --- a/4.7.1/gentoo/README.history +++ b/4.7.1/gentoo/README.history @@ -1,3 +1,6 @@ +1.6 [pending] + - 03_all_java-nomulti.patch + 1.5 21 Oct 2012 + 39_all_gfortran-sysroot-pr54725.patch diff --git a/4.7.2/gentoo/03_all_java-nomulti.patch b/4.7.2/gentoo/03_all_java-nomulti.patch deleted file mode 100644 index 5fce8b2..0000000 --- a/4.7.2/gentoo/03_all_java-nomulti.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/libjava/configure -+++ b/libjava/configure -@@ -1618,6 +1618,8 @@ Optional Features: - default=yes - --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 -@@ -3361,6 +3363,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. - - ---- a/libjava/configure.ac -+++ b/libjava/configure.ac -@@ -139,6 +139,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 - diff --git a/4.7.2/gentoo/README.history b/4.7.2/gentoo/README.history index 8a42aef..58eae4a 100644 --- a/4.7.2/gentoo/README.history +++ b/4.7.2/gentoo/README.history @@ -1,3 +1,6 @@ +1.4 [pending] + - 03_all_java-nomulti.patch + 1.3 04 Nov 2012 + 93_all_pr33763_4.7.3_extern-inline.patch + 94_all_pr53708_4.7.3_user-alignment.patch |