From 589e02ed65b89c9f2524ad85cd8f3507d8905c8b Mon Sep 17 00:00:00 2001
From: pascal <pascal@openbsd.org>
Date: Sun, 8 Apr 2012 12:40:51 +0000
Subject: [PATCH] Fix previous to work when building java, but not go.  Noticed
 and patch by Andre Zepezauer on ports@ (thanks).

ok sthen@
---
 lang/gcc/4.6/patches/patch-configure | 34 ++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/lang/gcc/4.6/patches/patch-configure b/lang/gcc/4.6/patches/patch-configure
index 29578bd1bc1..5750428c3bd 100644
--- a/lang/gcc/4.6/patches/patch-configure
+++ b/lang/gcc/4.6/patches/patch-configure
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.3 2012/04/06 07:50:32 pascal Exp $
---- configure.orig	Wed Apr  4 23:07:41 2012
-+++ configure	Thu Apr  5 17:58:40 2012
+$OpenBSD: patch-configure,v 1.4 2012/04/08 12:40:51 pascal Exp $
+--- configure.orig	Sun Dec 18 11:03:44 2011
++++ configure	Sun Apr  8 14:36:19 2012
 @@ -2698,8 +2698,7 @@ host_libs="intl mmalloc libiberty opcodes bfd readline
  host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
  
@@ -11,11 +11,31 @@ $OpenBSD: patch-configure,v 1.3 2012/04/06 07:50:32 pascal Exp $
  	target-qthreads \
  	target-libjava"
  
-@@ -2719,6 +2718,7 @@ target_libraries="target-libgcc \
+@@ -2716,6 +2715,7 @@ target_libraries="target-libgcc \
+ 		target-libquadmath \
+ 		target-libgfortran \
+ 		target-boehm-gc \
++		target-libffi \
  		${libgcj} \
  		target-libobjc \
  		target-libada \
-+		target-libffi \
- 		target-libgo"
+@@ -3049,7 +3049,9 @@ fi
  
- # these tools are built using the target libraries, and are intended to
+ # Save it here so that, even in case of --enable-libgcj, if the Java
+ # front-end isn't enabled, we still get libgcj disabled.
+-libgcj_saved=$libgcj
++# And with the Java front-end enabled, the variable libgcj_saved will
++# be used in gcc/java/config-lang.in to specify library dependencies.
++libgcj_saved="target-libffi ${libgcj}"
+ case $enable_libgcj in
+ yes)
+   # If we reset it here, it won't get added to noconfigdirs in the
+@@ -3060,7 +3062,7 @@ yes)
+ no)
+   # Make sure we get it printed in the list of not supported target libs.
+   # Don't disable libffi, though, other languages use it.
+-  noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`"
++  noconfigdirs="$noconfigdirs ${libgcj}"
+   # Clear libgcj_saved so that even if java is enabled libffi won't be
+   # built.
+   libgcj_saved=