OpenJDK: try to make it work on hybrid installs

* Fails because of _get_system_info changes?

dev-lang/openjdk/openjdk-1.7_2013_11_08.recipe

@@ -43,7 +43,13 @@ SRC_URI_12="http://ports-space.haiku-files.org/source/openjdk/jdk7-jaxws2_2_4-b0
 CHECKSUM_MD5_12="2f5b829ade70f67fe272d0b322e3e702"
 
 REVISION="2"
-ARCHITECTURES="x86 !x86_gcc2"
+ARCHITECTURES="x86"
+if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
+	# x86_gcc2 is fine as primary target architecture as long as we're building
+	# for a different secondary architecture.
+	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
+fi
+SECONDARY_ARCHITECTURES="x86"
 
 DISABLE_SOURCE_PACKAGE=yes
 	# at least as long as Ant and a complete SDK image are part of the sources
@@ -90,24 +96,24 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libfreetype
-	lib:libiconv
-	lib:libz
+	haiku$secondaryArchSuffx >= $haikuVersion
+	lib:libfreetype$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel >= $haikuVersion
-	devel:libfreetype
-	devel:libiconv
-	devel:libz
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:libfreetype$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
 	cmd:cpio >= 2.10
 	cmd:make
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:sed
 	cmd:tar
 	cmd:zip