From patchwork Wed Aug 6 20:26:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 377405 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 5541114009C for ; Thu, 7 Aug 2014 06:26:36 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 7ED6830C4A; Wed, 6 Aug 2014 20:26:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZHEkQoN2VFHe; Wed, 6 Aug 2014 20:26:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CA726308DA; Wed, 6 Aug 2014 20:26:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 600F11BFA29 for ; Wed, 6 Aug 2014 20:26:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5CC108A3DD for ; Wed, 6 Aug 2014 20:26:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xbNg08kEz8fQ for ; Wed, 6 Aug 2014 20:26:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by hemlock.osuosl.org (Postfix) with ESMTPS id 0B2478A347 for ; Wed, 6 Aug 2014 20:26:31 +0000 (UTC) Received: from fwd25.aul.t-online.de (fwd25.aul.t-online.de [172.20.26.130]) by mailout07.t-online.de (Postfix) with SMTP id 5E7202BBE69 for ; Wed, 6 Aug 2014 22:26:28 +0200 (CEST) Received: from fli4l.lan.fli4l (rITGpMZT8hk6BzZZ+OGPYMGZ8qz7IrRlufO3xLCnsDamFV+yDWmtVA-v+HiC8o4Zln@[87.146.215.63]) by fwd25.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1XF7n0-2C4BQe0; Wed, 6 Aug 2014 22:26:26 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:60682) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.83) (envelope-from ) id 1XF7n0-0007sw-39; Wed, 06 Aug 2014 22:26:26 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Wed, 6 Aug 2014 22:26:22 +0200 Message-Id: <1407356782-3118-1-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-ID: rITGpMZT8hk6BzZZ+OGPYMGZ8qz7IrRlufO3xLCnsDamFV+yDWmtVA-v+HiC8o4Zln X-TOI-MSGID: fa4990d6-23ea-4eb8-aa70-0983ae0669a7 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] dependencies: Reject gcj in BR2_NEEDS_HOST_JAVA check X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Xbmc uses the Groovy java package to generate API code, for details see http://wiki.xbmc.org/index.php?title=Codegeneration#How_it_works Groovy itself is broken when used with gcj: http://jira.codehaus.org/browse/GROOVY-3701 Xbmc recommends to use another java package instead, like openjdk: http://forum.xbmc.org/showthread.php?tid=199742 Until we come up with a host package to provide a java setup and in order to make autobuilder happy let´s reject gcj when we check for a java installation on the host. Currently Xbmc is the only package using BR2_NEEDS_HOST_JAVA so changing the behaviour of dependencies.sh has no side effects. Fixes http://autobuild.buildroot.net/results/213/213d7454a1dc68cfb8f4c8d9508f52ebf8e58e33/ http://autobuild.buildroot.net/results/639/639cda872cf36c122cbd6139dd76f6b51ac1864e/ http://autobuild.buildroot.net/results/c9e/c9eb12c95b2939c64590692a82af8d84bbd90956/ Signed-off-by: Bernd Kuhls --- support/dependencies/dependencies.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 88e5ad2..b09e376 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -188,7 +188,19 @@ if grep ^BR2_TOOLCHAIN_BUILDROOT=y $BR2_CONFIG > /dev/null && \ fi if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then - check_prog_host "java" + JAVA=$(which java 2> /dev/null) + if [ -z "$JAVA" ] ; then + echo + echo "You must install 'java' on your build machine"; + exit 1; + fi; + JAVA_GCJ=$($JAVA -version 2>&1 | grep gcj) + if [ ! -z "$JAVA_GCJ" ] ; then + echo + echo "$JAVA_GCJ is not sufficient to compile your package selection." + echo "Please install OpenJDK/IcedTea/Oracle Java." + exit 1 ; + fi fi if grep -q ^BR2_NEEDS_HOST_JAVAC=y $BR2_CONFIG ; then