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=-11.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 74837C43613 for ; Sat, 22 Jun 2019 06:50:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 427B22070B for ; Sat, 22 Jun 2019 06:50:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="HZF+CWkZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726292AbfFVGuT (ORCPT ); Sat, 22 Jun 2019 02:50:19 -0400 Received: from terminus.zytor.com ([198.137.202.136]:48609 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726067AbfFVGuS (ORCPT ); Sat, 22 Jun 2019 02:50:18 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x5M6o5Rd2010105 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 21 Jun 2019 23:50:05 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x5M6o5Rd2010105 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019061801; t=1561186205; bh=12WzQpl+3yaZDsqnbr9SxmxBtqCvsJrX+KM02H/P8CM=; h=Date:From:Cc:Reply-To:To:Subject:From; b=HZF+CWkZc2mN7ndTo1uL8WzraIz3LANewjsMXed6iBiLHtfgCBtoxM7EdvTupDpgc QnowWmAi7M3FEayGDyWJ2aJcFVT5n67oNVn6kLmkJXCCqOVgQvZpIcI48CJsaHiaHh 2Sl6opA/owTPH4hjM0tEN/6W9LQ7auRdLMSgpYkfzsaJhac1hb6rQO+l37zNkOk+BX y+FELbu0rpWndt2ua9yLzIr4OJivF9HeOOInQEfNHKevaV6cDt50XpzL221L/QvVge /aAJrNxDg2tot56rujyqhhrDo25+QYbWEPjYWUHOPZQavM/qCD3fhmxr2iqRCPo9Yb hgiqtWDL2aVjg== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x5M6o5fH2010099; Fri, 21 Jun 2019 23:50:05 -0700 Date: Fri, 21 Jun 2019 23:50:05 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, mingo@kernel.org, f.fainelli@gmail.com, acme@redhat.com Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, jolsa@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, mingo@kernel.org, f.fainelli@gmail.com, acme@redhat.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Add test to check if slang.h is in /usr/include/slang/ Git-Commit-ID: cbefd24f0aee3a5d787a013f207f6fd31d3c76d2 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cbefd24f0aee3a5d787a013f207f6fd31d3c76d2 Gitweb: https://git.kernel.org/tip/cbefd24f0aee3a5d787a013f207f6fd31d3c76d2 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 18 Jun 2019 17:43:35 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 18 Jun 2019 17:43:35 -0300 tools build: Add test to check if slang.h is in /usr/include/slang/ A few odd old distros (rhel5, 6, yeah, lots of those out in use, in many cases we want to use upstream perf on it) have the slang header files in /usr/include/slang/, so add a test that will be performed only when test-all.c (the one with the most common sane settings) fails, either because we're in one of these odd distros with slang/slang.h or because something else failed (say libelf is not present). So for the common case nothing changes, no additional test is performed. Next step is to check in perf the result of these tests. Cc: Adrian Hunter Cc: Florian Fainelli Cc: Jiri Olsa Cc: Namhyung Kim Fixes: 1955c8cf5e26 ("perf tools: Don't hardcode host include path for libslang") Link: https://lkml.kernel.org/n/tip-2sy7hbwkx68jr6n97qxgg0c6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/build/Makefile.feature | 2 +- tools/build/feature/Makefile | 4 ++++ .../build/feature/{test-libslang.c => test-libslang-include-subdir.c} | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 50377cc2f5f9..86b793dffbc4 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -53,6 +53,7 @@ FEATURE_TESTS_BASIC := \ libpython \ libpython-version \ libslang \ + libslang-include-subdir \ libcrypto \ libunwind \ pthread-attr-setaffinity-np \ @@ -114,7 +115,6 @@ FEATURE_DISPLAY ?= \ numa_num_possible_cpus \ libperl \ libpython \ - libslang \ libcrypto \ libunwind \ libdw-dwarf-unwind \ diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile index 7ef7cf04a292..0658b8cd0e53 100644 --- a/tools/build/feature/Makefile +++ b/tools/build/feature/Makefile @@ -31,6 +31,7 @@ FILES= \ test-libpython.bin \ test-libpython-version.bin \ test-libslang.bin \ + test-libslang-include-subdir.bin \ test-libcrypto.bin \ test-libunwind.bin \ test-libunwind-debug-frame.bin \ @@ -184,6 +185,9 @@ $(OUTPUT)test-libaudit.bin: $(OUTPUT)test-libslang.bin: $(BUILD) -lslang +$(OUTPUT)test-libslang-include-subdir.bin: + $(BUILD) -lslang + $(OUTPUT)test-libcrypto.bin: $(BUILD) -lcrypto diff --git a/tools/build/feature/test-libslang.c b/tools/build/feature/test-libslang-include-subdir.c similarity index 76% copy from tools/build/feature/test-libslang.c copy to tools/build/feature/test-libslang-include-subdir.c index 9cbff8d1df53..3ea47ec7590e 100644 --- a/tools/build/feature/test-libslang.c +++ b/tools/build/feature/test-libslang-include-subdir.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -#include +#include int main(void) {