From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757023AbbCCPeo (ORCPT ); Tue, 3 Mar 2015 10:34:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57915 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756764AbbCCPaE (ORCPT ); Tue, 3 Mar 2015 10:30:04 -0500 From: Jiri Olsa To: linux-kernel@vger.kernel.org Cc: Jiri Olsa , Adrian Hunter , Arnaldo Carvalho de Melo , Corey Ashford , David Ahern , Frederic Weisbecker , Ingo Molnar , Namhyung Kim , Paul Mackerras , Peter Zijlstra , Stephane Eranian Subject: [PATCH 02/14] perf tools: Add feature check for lzma library Date: Tue, 3 Mar 2015 16:29:29 +0100 Message-Id: <1425396581-17716-3-git-send-email-jolsa@kernel.org> In-Reply-To: <1425396581-17716-1-git-send-email-jolsa@kernel.org> References: <1425396581-17716-1-git-send-email-jolsa@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Will be used to decompress 'xz' objects. The check detects the liblzma.so devel library normally delivered by xz package. Signed-off-by: Jiri Olsa Cc: Adrian Hunter Cc: Arnaldo Carvalho de Melo Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian --- tools/perf/config/Makefile | 6 ++++-- tools/perf/config/feature-checks/Makefile | 6 +++++- tools/perf/config/feature-checks/test-lzma.c | 10 ++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 tools/perf/config/feature-checks/test-lzma.c diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index d44c64d64465..d77bcea691dd 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -228,7 +228,8 @@ CORE_FEATURE_TESTS = \ timerfd \ libdw-dwarf-unwind \ libbabeltrace \ - zlib + zlib \ + lzma LIB_FEATURE_TESTS = \ dwarf \ @@ -244,7 +245,8 @@ LIB_FEATURE_TESTS = \ libunwind \ libdw-dwarf-unwind \ libbabeltrace \ - zlib + zlib \ + lzma VF_FEATURE_TESTS = \ backtrace \ diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 8fe067864957..f7b1b7934782 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile @@ -32,7 +32,8 @@ FILES= \ test-libbabeltrace.bin \ test-compile-32.bin \ test-compile-x32.bin \ - test-zlib.bin + test-zlib.bin \ + test-lzma.bin CC := $(CROSS_COMPILE)gcc -MD PKG_CONFIG := $(CROSS_COMPILE)pkg-config @@ -151,6 +152,9 @@ test-compile-x32.bin: test-zlib.bin: $(BUILD) -lz +test-lzma.bin: + $(BUILD) -llzma + -include *.d ############################### diff --git a/tools/perf/config/feature-checks/test-lzma.c b/tools/perf/config/feature-checks/test-lzma.c new file mode 100644 index 000000000000..95adc8ced3dd --- /dev/null +++ b/tools/perf/config/feature-checks/test-lzma.c @@ -0,0 +1,10 @@ +#include + +int main(void) +{ + lzma_stream strm = LZMA_STREAM_INIT; + int ret; + + ret = lzma_stream_decoder(&strm, UINT64_MAX, LZMA_CONCATENATED); + return ret ? -1 : 0; +} -- 1.9.3