Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c6f0f61 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

tools build: Add feature check for lzma library 



Will be used to decompress 'xz' objects. The check detects
the liblzma.so devel library normally delivered by xz package.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
parent 00ae1127

tools/build/Makefile.feature

+4 −2
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ FEATURE_TESTS = \ 
	stackprotector-all		\

	timerfd				\

	libdw-dwarf-unwind		\

	zlib

	zlib				\

	lzma



FEATURE_DISPLAY =			\

	dwarf				\
@@ -65,7 +66,8 @@ FEATURE_DISPLAY = \ 
	libslang			\

	libunwind			\

	libdw-dwarf-unwind		\

	zlib

	zlib				\

	lzma



# Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.

# If in the future we need per-feature checks/flags for features not

tools/build/feature/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -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
@@ -45,7 +46,7 @@ __BUILD = $(CC) $(CFLAGS) -Wall -Werror -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) 
###############################



test-all.bin:

	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz

	$(BUILD) -fstack-protector-all -O2 -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl -lz -llzma



test-hello.bin:

	$(BUILD)
@@ -152,6 +153,9 @@ test-compile-x32.bin: 
test-zlib.bin:

	$(BUILD) -lz



test-lzma.bin:

	$(BUILD) -llzma



-include *.d



###############################

tools/build/feature/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ 
#undef main

#endif



#define main main_test_lzma

# include "test-lzma.c"

#undef main



int main(int argc, char *argv[])

{

	main_test_libpython();
@@ -138,6 +142,7 @@ int main(int argc, char *argv[]) 
	main_test_sync_compare_and_swap(argc, argv);

	main_test_zlib();

	main_test_pthread_attr_setaffinity_np();

	main_test_lzma();



	return 0;

}

tools/build/feature/test-lzma.c

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#include <lzma.h>



int main(void)

{

	lzma_stream strm = LZMA_STREAM_INIT;

	int ret;



	ret = lzma_stream_decoder(&strm, UINT64_MAX, LZMA_CONCATENATED);

	return ret ? -1 : 0;

}