From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.2 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7227C48BDF for ; Tue, 22 Jun 2021 04:38:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C188F6135D for ; Tue, 22 Jun 2021 04:38:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbhFVEkq (ORCPT ); Tue, 22 Jun 2021 00:40:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229812AbhFVEkn (ORCPT ); Tue, 22 Jun 2021 00:40:43 -0400 Received: from mail-qt1-x84a.google.com (mail-qt1-x84a.google.com [IPv6:2607:f8b0:4864:20::84a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16D7CC06175F for ; Mon, 21 Jun 2021 21:38:27 -0700 (PDT) Received: by mail-qt1-x84a.google.com with SMTP id e20-20020ac85dd40000b029024ed7d58d2cso3099971qtx.8 for ; Mon, 21 Jun 2021 21:38:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=nyVTW/NfJ2wkCeZoen2ILlMbYSDECf1cn5qBJJZCWd0=; b=StjSZaMiKwuHNW8eRDB3FLTFwf8cjEhtxJu6FkU92v+Z3/7nJFcKNz5XjgNJGC5F9m WPizMhjjmX598C8vs5Nuj2zz7H4cK+KVQqxx1SoOMdqE+DH4makOO32AROQnmIb7WntS E1Bn+sH17u9n70ZIpxXFVeBG8MPlWl6PL0SPyd/CDK9gO0uqOhMLXQxYmGILkzZs6y2A miU8D7FdzWkr+8/E3G43img0A6ubEPbHJL9Qn6fWibplgP653T23dP81deqAIa5gkXLA MVPZ3FQpPifveFlwchkeXCOvOgxgXiRBeNN8NTYrPbKuF57XJAJdfpeq6LBxECyPdgAI D8Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=nyVTW/NfJ2wkCeZoen2ILlMbYSDECf1cn5qBJJZCWd0=; b=CUWO6xm0QbgHzRY7G+oUy0esgvTDwCqW/vPtFI+kBgDjzFI6lscCMsQPjMJ8dNMdO8 LO5/Ho2YFpS0obEK3PdnZ3hENDhkicOpHt/Unq/eV7rP9x4SPlfIwc5qsI29xYy/YRGH Q+PN2cGjkjNuDYwjzYvz7YaFHsOchA9XoMXrm5i5wztROO38NwJbhOGEcj1VoabD+T0n vWVMwfptKD/uR2E125UuYbLS6GpRt1UdKpOj7oY/mc0Uneffb3dUUPuLbU6MALIUNlA6 9Vd71clw271E2hN7xbNIza2j49SgvbVx+56fVEMj660eFjPaVMuMGsqnh2Dz9oMwVNOO k/MA== X-Gm-Message-State: AOAM530K7QUUmzMGt3xJBB6wxu2y8Dke9dy9OVWBiOnLOSDZk/gZb8ZH 6/cFRKLNGkwMyX+5vA1AydkzfB4nvxva X-Google-Smtp-Source: ABdhPJyHs4a5JhBga/7EW6l/pbrlQ9A5LjpNk6gVqEAvuhNxI6xpHsW2C3GuiUPfAZksMXwqwd/WKy4G+TQk X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:ffd6:b7f5:87ee:7be2]) (user=irogers job=sendgmr) by 2002:a0c:e8cc:: with SMTP id m12mr6473299qvo.27.1624336706133; Mon, 21 Jun 2021 21:38:26 -0700 (PDT) Date: Mon, 21 Jun 2021 21:38:09 -0700 In-Reply-To: <20210622043811.3108564-1-irogers@google.com> Message-Id: <20210622043811.3108564-2-irogers@google.com> Mime-Version: 1.0 References: <20210622043811.3108564-1-irogers@google.com> X-Mailer: git-send-email 2.32.0.288.g62a8d224e6-goog Subject: [PATCH 2/4] perf: Add define for libtraceevent version From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-users@vger.kernel.org, Tzvetomir Stoyanov , Steven Rostedt , Claire Jensen Cc: eranian@google.com, Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-trace-users@vger.kernel.org The definition is derived from pkg-config as discussed in: https://lore.kernel.org/lkml/20210610155915.20a252d3@oasis.local.home/ The definition is computed using expr rather than passed to be computed in C code, this avoids complications with quote in the variable expansions. For example see the target python/perf.so in Makefile.perf. Signed-off-by: Ian Rogers --- tools/perf/Makefile.config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 3a8a54b71654..6f318c16e8f1 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -1093,6 +1093,12 @@ ifdef LIBTRACEEVENT_DYNAMIC $(call feature_check,libtraceevent) ifeq ($(feature-libtraceevent), 1) EXTLIBS += -ltraceevent + LIBTRACEEVENT_VERSION := $(shell $(PKG_CONFIG) --modversion libtraceevent) + LIBTRACEEVENT_VERSION_1 := $(word 1, $(subst ., ,$(LIBTRACEEVENT_VERSION))) + LIBTRACEEVENT_VERSION_2 := $(word 2, $(subst ., ,$(LIBTRACEEVENT_VERSION))) + LIBTRACEEVENT_VERSION_3 := $(word 3, $(subst ., ,$(LIBTRACEEVENT_VERSION))) + LIBTRACEEVENT_VERSION_CPP := $(shell expr $(LIBTRACEEVENT_VERSION_1) \* 255 \* 255 + $(LIBTRACEEVENT_VERSION_2) \* 255 + $(LIBTRACEEVENT_VERSION_3)) + CFLAGS += -DLIBTRACEEVENT_VERSION=$(LIBTRACEEVENT_VERSION_CPP) else dummy := $(error Error: No libtraceevent devel library found, please install libtraceevent-devel); endif -- 2.32.0.288.g62a8d224e6-goog