Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935052AbcJQO4o (ORCPT ); Mon, 17 Oct 2016 10:56:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52572 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933745AbcJQO4i (ORCPT ); Mon, 17 Oct 2016 10:56:38 -0400 Date: Mon, 17 Oct 2016 07:53:25 -0700 From: tip-bot for Anton Blanchard Message-ID: Cc: peterz@infradead.org, tglx@linutronix.de, acme@redhat.com, mingo@kernel.org, hpa@zytor.com, eranian@google.com, anton@samba.org, linux-kernel@vger.kernel.org, alexander.shishkin@linux.intel.com Reply-To: mingo@kernel.org, acme@redhat.com, tglx@linutronix.de, peterz@infradead.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, anton@samba.org, hpa@zytor.com, eranian@google.com In-Reply-To: <1476325243-15788-1-git-send-email-anton@ozlabs.org> References: <1476325243-15788-1-git-send-email-anton@ozlabs.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf jit: Fix build issue on Ubuntu Git-Commit-ID: 53613e005496234bb684e5db551fbcededa73999 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1871 Lines: 43 Commit-ID: 53613e005496234bb684e5db551fbcededa73999 Gitweb: http://git.kernel.org/tip/53613e005496234bb684e5db551fbcededa73999 Author: Anton Blanchard AuthorDate: Thu, 13 Oct 2016 13:20:43 +1100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 17 Oct 2016 11:25:34 -0300 perf jit: Fix build issue on Ubuntu When building on Ubuntu 16.04, I get the following error: Makefile:49: *** the openjdk development package appears to me missing, install and try again. Stop. The problem is that update-java-alternatives has multiple spaces between fields, and cut treats each space as a new delimiter: java-1.8.0-openjdk-ppc64el 1081 /usr/lib/jvm/java-1.8.0-openjdk-ppc64el Fix this by using awk, which handles this fine. Signed-off-by: Anton Blanchard Reviewed-by: Stephane Eranian Cc: Alexander Shishkin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1476325243-15788-1-git-send-email-anton@ozlabs.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/jvmti/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/jvmti/Makefile b/tools/perf/jvmti/Makefile index 5ce61a1..df14e6b 100644 --- a/tools/perf/jvmti/Makefile +++ b/tools/perf/jvmti/Makefile @@ -36,7 +36,7 @@ SOLIBEXT=so # The following works at least on fedora 23, you may need the next # line for other distros. ifneq (,$(wildcard /usr/sbin/update-java-alternatives)) -JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | cut -d ' ' -f 3) +JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') else ifneq (,$(wildcard /usr/sbin/alternatives)) JDIR=$(shell alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g')