From a2838b7ee8c336814f6675163fced0199c382aa7 Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Fri, 23 Oct 2015 16:46:21 -0400 Subject: [PATCH] openjdk: Fix secondaryArchSuffix syntax, mark untested again. The correct solution is probably to have this package explicitly download an earlier HPKG and use it, because circular dependencies are against general notions of sanity (and the Kitchen can't deal with them) --- dev-lang/openjdk/openjdk-1.8.u40_b27.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe index 3323e71b4..06fea6b84 100644 --- a/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe +++ b/dev-lang/openjdk/openjdk-1.8.u40_b27.recipe @@ -21,7 +21,7 @@ SOURCE_URI_8="hg+http://hg.openjdk.java.net/jdk8u/jdk8u/nashorn#jdk8u40-b27" SOURCE_DIR="jdk" ARCHITECTURES="!x86_gcc2 ?x86" -SECONDARY_ARCHITECTURES="x86" +SECONDARY_ARCHITECTURES="?x86" # circular dependency - needs fixing DISABLE_SOURCE_PACKAGE=yes # at least as long as Ant and a complete SDK image are part of the sources @@ -184,7 +184,7 @@ INSTALL() SUMMARY_sources="OpenJDK Development Kit (JDK) source files, demos and examples" PROVIDES_sources=" - openjdk$secondaryArchSuffix_sources = $portVersion compat >= 1.8 + openjdk${secondaryArchSuffix}_sources = $portVersion compat >= 1.8 " REQUIRES_sources=" openjdk$secondaryArchSuffix