From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755535AbbBRSgr (ORCPT ); Wed, 18 Feb 2015 13:36:47 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41391 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753574AbbBRSgo (ORCPT ); Wed, 18 Feb 2015 13:36:44 -0500 Date: Wed, 18 Feb 2015 10:35:55 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: eranian@google.com, namhyung@kernel.org, fweisbec@gmail.com, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, dsahern@gmail.com, bp@alien8.de, will.deacon@arm.com, alexis.berlemont@gmail.com, sukadev@linux.vnet.ibm.com, acme@redhat.com, peterz@infradead.org, paulus@samba.org, linux-kernel@vger.kernel.org, hpa@zytor.com, cjashfor@linux.vnet.ibm.com Reply-To: acme@redhat.com, sukadev@linux.vnet.ibm.com, alexis.berlemont@gmail.com, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, paulus@samba.org, linux-kernel@vger.kernel.org, peterz@infradead.org, tglx@linutronix.de, will.deacon@arm.com, bp@alien8.de, dsahern@gmail.com, jolsa@kernel.org, eranian@google.com, mingo@kernel.org, fweisbec@gmail.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf build: Add zlib objects building Git-Commit-ID: 1571b695053c4ccad66c5151d78247a6590338d6 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 List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 1571b695053c4ccad66c5151d78247a6590338d6 Gitweb: http://git.kernel.org/tip/1571b695053c4ccad66c5151d78247a6590338d6 Author: Jiri Olsa AuthorDate: Tue, 30 Dec 2014 13:31:12 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 12 Feb 2015 13:11:18 -0300 perf build: Add zlib objects building Move the zlib objects building under build framework to be included in the libperf build object. Signed-off-by: Jiri Olsa Tested-by: Sukadev Bhattiprolu Tested-by: Will Deacon Cc: Alexis Berlemont Cc: Borislav Petkov Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-cpbb47g82ahpa4yqfr9dcobq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 4 ---- tools/perf/config/Makefile | 1 + tools/perf/util/Build | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 7daccac..713f4d1 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -349,10 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif -ifndef NO_ZLIB - LIB_OBJS += $(OUTPUT)util/zlib.o -endif - ifdef ASCIIDOC8 export ASCIIDOC8 endif diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 2fc4d56..b97a7b9 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -640,6 +640,7 @@ ifndef NO_ZLIB ifeq ($(feature-zlib), 1) CFLAGS += -DHAVE_ZLIB_SUPPORT EXTLIBS += -lz + $(call detected,CONFIG_ZLIB) else NO_ZLIB := 1 endif diff --git a/tools/perf/util/Build b/tools/perf/util/Build index f698432..4599188 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -91,6 +91,7 @@ libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-y += scripting-engines/ libperf-$(CONFIG_PERF_REGS) += perf_regs.o +libperf-$(CONFIG_ZLIB) += zlib.o CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"