From patchwork Mon Dec 5 22:59:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 29982 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2515980wrr; Mon, 5 Dec 2022 15:01:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf68biL43xSFbtjMDIP/m6qibBuEhI+UHtzPBvd6aej3jxPrritv8ejhl4FUkDeCbe7kCO/B X-Received: by 2002:a17:906:6acc:b0:78d:b371:16e5 with SMTP id q12-20020a1709066acc00b0078db37116e5mr56408997ejs.456.1670281300772; Mon, 05 Dec 2022 15:01:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670281300; cv=none; d=google.com; s=arc-20160816; b=AS2m/+P+6kY9NAwt8MASMJRnq0u7gAhxrWKzAk5jKyW1VlzlWsnVvw5msUbWoc1d+7 haRSlrLzEfZKHonx/+V2iYmiNV8/tBZ0Kn6cP5gQt618hobbmuq2lTEF1oDPqyz8LHnm oMgbmFQrPm8wyDEgPcVD+wbnwQUwQXHwP6cpEVfDPhnYqcrPRhjX7TSSewN2PCU/PTXD YOCDuzJvFy2TbmuBRKqu539pKk4GU+tZJGSMMW3X9Enunq6aASM8KHMHvhXeRzifkBD1 qp0+Qd67JVf0YVhCZhiEOE9lufx7MVRFPkpZd/gtUP8/ZI8/TFB9dXrbtir01y1J7Oor o8rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=wJd3unxth988O4ChzrsMI/KkhK+0qKkYIwY6FEhWnkw=; b=lbFwwbxv1CyigJ+28sCCzmTCvxcpkZv65hbb412ByaJ3C5qdfzDpYWVgLMbg1V1bc3 tF0E5uBeCSVJFaiHK5YteQNWmelLA3WPcKtHJ5AV/LkGN0bFLNixpzF4GPBHfVBmRkiA mNRFrHBuQOBvdfoXBBGTnk+HNPIk6Z/igg0mOadPSb5hmaY/oLzqTG/skc49OhoPyvk3 /YFS03ACTLsoYP8zZ+Yi4tEnQO84dIq2ceeSXxBxfYBzFBqkZbF1yrxQsYHyrFf8mHeJ +xtwWWYp9+sA/ZH1wMNk0A+PnqtFbMhKP0vvicATHtqzloHaJp8FfcFJtcnqlpGKtpiG o4uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=FRqWAbY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dp19-20020a170906c15300b0078e27f2ef52si11817067ejc.603.2022.12.05.15.01.16; Mon, 05 Dec 2022 15:01:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=FRqWAbY7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233943AbiLEXAj (ORCPT + 99 others); Mon, 5 Dec 2022 18:00:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233935AbiLEXA2 (ORCPT ); Mon, 5 Dec 2022 18:00:28 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 191BF1E3CA for ; Mon, 5 Dec 2022 15:00:27 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id 187-20020a250dc4000000b006f8cd26bfcfso12382055ybn.13 for ; Mon, 05 Dec 2022 15:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wJd3unxth988O4ChzrsMI/KkhK+0qKkYIwY6FEhWnkw=; b=FRqWAbY73AhNd8V+YTBgN6yaWg8iUzX4pU80v+SCHpgI/CTXgfdrQ3K6fT+cpHj3uK EN5s0GjjgdzS3hy6tkwp/DWOzWu+WGEE2iu2CtwpTOxyXZvJlrJAR2lxwYo/kuruMZDo wXqcmeVWRRne58FdQ0dMiMTDtw4d25znA2BSldV2h539ICJgz5EFcbcAWd47VKBxVWHh vb1IRENH3hhu4plY23kCwlQSIOeMOPcxCGTPNVPZfP0cZyczVVfL/MnAW1TT2q0pMdvn NVnISfXhPsjcX8e5ezltJY7owSrNOQW6J8CidR0+9LbOp8S0MHg6xScCsZFP4rKQX0uq dgrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wJd3unxth988O4ChzrsMI/KkhK+0qKkYIwY6FEhWnkw=; b=E1GmPvQvMdKYeJbfmOm5ov8uDrZdlTh8Pc+JImMvzga2LwHEwCw83Z4u3NpJa09H8H soetsPyP9Y0YfwrucCcb5KtesYtNYP5uDbzd37cKNnr1ydecu4OWU24RvysyT75Ot5NI aM6FEi/EajH67y8fttnp9DMkYbcTmgKSZjYc4m4uLGG/s57SEWEQRr7TKJZQ+g0tSTCX 7D2MGzpX+Rr/hkcd7VV9Pg5fJ4XCtW6nRUpm2veOn8PjVvNoWQz9ySfVeUStq9DjtSSJ WJkewqtG9IwfeYKG2+OlseA61mZ0hlEH5J1pP/NA+3bJPAB6/GVTIad934NGH84Iiuy0 bp9g== X-Gm-Message-State: ANoB5pkg3/8bIcPjpqPJDQ1egWGE5z74YAYBLE0Fd+100JrgvZL9Ohk8 gu//btzNFJFCmMddmVLFOXKEK66QfRx+ X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:d2ab:5fbb:e81a:9151]) (user=irogers job=sendgmr) by 2002:a25:d906:0:b0:6f9:bd14:f0b4 with SMTP id q6-20020a25d906000000b006f9bd14f0b4mr26845398ybg.408.1670281226358; Mon, 05 Dec 2022 15:00:26 -0800 (PST) Date: Mon, 5 Dec 2022 14:59:38 -0800 In-Reply-To: <20221205225940.3079667-1-irogers@google.com> Message-Id: <20221205225940.3079667-2-irogers@google.com> Mime-Version: 1.0 References: <20221205225940.3079667-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Subject: [PATCH 1/3] perf build: Fixes for LIBTRACEEVENT_DYNAMIC From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Nick Desaulniers , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Cc: Stephane Eranian , Ian Rogers , Alexander Gordeev X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751416885161033280?= X-GMAIL-MSGID: =?utf-8?q?1751416885161033280?= If LIBTRACEEVENT_DYNAMIC is enabled then avoid the install step for the plugins. If disabled correct DESTDIR so that the plugins are installed under /traceevent/plugins. Fixes: ef019df01e20 ("perf build: Install libtraceevent locally when building") Reported-by: Alexander Gordeev Signed-off-by: Ian Rogers --- tools/perf/Makefile.perf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index a17a6ea85e81..6689f644782f 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -884,7 +884,7 @@ $(LIBTRACEEVENT_DYNAMIC_LIST): libtraceevent_plugins install-traceevent-plugins: libtraceevent_plugins $(Q)$(MAKE) -C $(LIBTRACEEVENT_PLUGINS_DIR) O=$(LIBTRACEEVENT_PLUGINS_OUTPUT) \ - DESTDIR=$(LIBTRACEEVENT_PLUGINS_DESTDIR) prefix= \ + DESTDIR=$(DESTDIR_SQ)$(prefix) prefix= \ $(LIBTRACEEVENT_FLAGS) install endif @@ -1093,7 +1093,11 @@ install-tests: all install-gtk $(INSTALL) tests/shell/coresight/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/coresight' $(Q)$(MAKE) -C tests/shell/coresight install-tests -install-bin: install-tools install-tests install-traceevent-plugins +install-bin: install-tools install-tests + +ifndef LIBTRACEEVENT_DYNAMIC +install-bin: install-traceevent-plugins +endif install: install-bin try-install-man