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: 13065138 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A80F2C47089 for ; Mon, 5 Dec 2022 23:00:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234017AbiLEXAi (ORCPT ); Mon, 5 Dec 2022 18:00:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233934AbiLEXA2 (ORCPT ); Mon, 5 Dec 2022 18:00:28 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B72F1E3D2 for ; Mon, 5 Dec 2022 15:00:27 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-37360a6236fso137418597b3.12 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=cqe+RO5MzPpJ3yVtN762wXEpaxcebseXf+zZn2Xxcajgum71Y4p/a7ZBQfAFj9WZxI MxfWbcGvBBjJbSF6fM2Zt3md20okRBRyyjOq4NqMiMO38dupjK57T581XZRe8TEUx50/ Npw4jAwKJjHVx/BaoYisXZX6YxrMYbD48GP9H2sZelNYlVKxE+/+55OeXmxOtX9Opdqn dV03vnra0lslVOqrAEjyMQVCF/aIPO9h3E58hMYm49nZoYufnzzlOtaB+maA6GWufink c41Dg2N4zIM1XDyJmunrteT0NvQI403FrkqJORLVF1BieNnzi0DeVynsxIpGfW3ooD+e Nyrg== X-Gm-Message-State: ANoB5pk/dqCWP8S/0tPFgviJvQaTZwR5M3mxJsyjvChiTGPzqBKsxyuO 8UrJic9QXqOQdzbiVxOn2rtHIbiqqcEi X-Google-Smtp-Source: AA0mqf6kYPN63s6r/LmOIdeoVrRTHGNcj1Yc84GK+j2U35wrcRGViI6T6nHPkyENWehvnR8R/w7RcTbddD1g 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 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org 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