Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp4595400ybp; Mon, 7 Oct 2019 10:45:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqwners34fhWm95sNlaKRHiloFhEiPEjB+S0oW1gvTtSK6gsqhIzNw8KatkEEe5QiU8NUOLD X-Received: by 2002:a05:6402:346:: with SMTP id r6mr29512120edw.124.1570470350669; Mon, 07 Oct 2019 10:45:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570470350; cv=none; d=google.com; s=arc-20160816; b=K8nBlAuy/BJXHgPG04DSD0IIJb5wTSdjPod72bqcglrBHZngaoTEKFCpJt/pvnfu22 L/6wmTE7GI5CQ3MQJOmG8js60+HDfxyEriuNFTXaoSjGevUTc1AqYraiL7+akyeLUe35 SeZT5VVfqEJXFkkLPBONAGcSvFMkg7Oew8WP4925Nc8/f1ZBCvQYBLXhH1hDkg2pXu75 Z0/qgS7J6FVkYZ8b+RCmf1rsig6b7aNOE/ttznchXWRqt5sgrAWlVoFzSXq/DJ6w1rPd O8UQQsw37od6emPvzKcz1jVHwvHGmrKYNQCfSIhO89PejZDMPuSm9mw/9p3Rl9ESDWX9 qTiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=eXFx08KLtJFr0xbBjSHn/DRy2G8/0ewiW+myiCY3fpI=; b=DN49qtFH+3CrgIV5OMVRvQXxyvYh/Bnas/agQYeWyFfDYdP2vkN3fJTxXljkJ39v4w 6MQlv+GsUxsYV20GU8gNQ+6TbsETKTZEM1ZdwrknIj7gaJuMmlILb+WzdnJFKN4aJt26 JnMLSIPQsZqp023cBa/nMw2npieo+XnOx6ddMh58v/wrB5otop4mJZhU01g6gvd9nc/Q wD7fmXRFFMHPNpEKWtp6meqwPTvrsoUj8svePKoWCeREHbHa5jtdK6/87CY6/kF7g2tT VioPbZMfHAvxB38knX/WO8po/wGByvmR5qFMByx85tTI2CjuseXx+Bm+NobHRuDQyEI4 PkOw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 8si9088243edz.299.2019.10.07.10.45.26; Mon, 07 Oct 2019 10:45:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728734AbfJGRlY (ORCPT + 99 others); Mon, 7 Oct 2019 13:41:24 -0400 Received: from mga01.intel.com ([192.55.52.88]:17771 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728031AbfJGRlX (ORCPT ); Mon, 7 Oct 2019 13:41:23 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Oct 2019 10:41:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,269,1566889200"; d="scan'208";a="196361497" Received: from tassilo.jf.intel.com (HELO tassilo.localdomain) ([10.7.201.137]) by orsmga003.jf.intel.com with ESMTP; 07 Oct 2019 10:41:22 -0700 Received: by tassilo.localdomain (Postfix, from userid 1000) id B77983019B5; Mon, 7 Oct 2019 10:41:22 -0700 (PDT) From: Andi Kleen To: acme@kernel.org Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: [PATCH] perf data: Fix babeltrace detection Date: Mon, 7 Oct 2019 10:41:20 -0700 Message-Id: <20191007174120.12330-1-andi@firstfloor.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen The symbol the feature file checks for is now actually in -lbabeltrace, not -lbabeltrace-ctf, at least as of libbabeltrace-1.5.6-2.fc30.x86_64 Always add both libraries to fix the feature detection. Signed-off-by: Andi Kleen --- tools/perf/Makefile.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index bf8caa7d17f6..71638917e18a 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -155,7 +155,7 @@ ifdef LIBBABELTRACE_DIR LIBBABELTRACE_LDFLAGS := -L$(LIBBABELTRACE_DIR)/lib endif FEATURE_CHECK_CFLAGS-libbabeltrace := $(LIBBABELTRACE_CFLAGS) -FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf +FEATURE_CHECK_LDFLAGS-libbabeltrace := $(LIBBABELTRACE_LDFLAGS) -lbabeltrace-ctf -lbabeltrace ifdef LIBZSTD_DIR LIBZSTD_CFLAGS := -I$(LIBZSTD_DIR)/lib @@ -895,7 +895,7 @@ ifndef NO_LIBBABELTRACE ifeq ($(feature-libbabeltrace), 1) CFLAGS += -DHAVE_LIBBABELTRACE_SUPPORT $(LIBBABELTRACE_CFLAGS) LDFLAGS += $(LIBBABELTRACE_LDFLAGS) - EXTLIBS += -lbabeltrace-ctf + EXTLIBS += -lbabeltrace-ctf -lbabeltrace $(call detected,CONFIG_LIBBABELTRACE) else msg := $(warning No libbabeltrace found, disables 'perf data' CTF format support, please install libbabeltrace-dev[el]/libbabeltrace-ctf-dev); -- 2.21.0