perf build: Add zlib objects building (1571b695) · Commits · 戴 / test

Move the zlib objects building under build framework to be included in the libperf build object. Signed-off-by:

Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Tested-by:

Will Deacon <will.deacon@arm.com> Cc: Alexis Berlemont <alexis.berlemont@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-cpbb47g82ahpa4yqfr9dcobq@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/Makefile.perf

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

tools/perf/config/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

tools/perf/util/Build

+1 −0

Original line number	Diff line number	Diff line
		@@ -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))"

Admin message