diff options
Diffstat (limited to 'meta/recipes-kernel/trace-cmd/trace-cmd')
-rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch | 28 | ||||
-rw-r--r-- | meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch | 36 |
2 files changed, 54 insertions, 10 deletions
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch index 8e8f578e61..14730db905 100644 --- a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch | |||
@@ -1,29 +1,37 @@ | |||
1 | Upstream-Status: Pending | 1 | trace-cmd: Cross-compile fixes for LDFLAGS and include path |
2 | 2 | ||
3 | Add ability for the Makefile to respect LDFLAGS. | 3 | Add ability for the Makefile to respect LDFLAGS. |
4 | |||
5 | Also remove hardcoded /usr/local/include include path. | 4 | Also remove hardcoded /usr/local/include include path. |
6 | 5 | ||
7 | RP 7/5/2011 | 6 | Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e] |
7 | |||
8 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
9 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
10 | |||
11 | --- | ||
12 | Makefile | 7 ++++--- | ||
13 | 1 file changed, 4 insertions(+), 3 deletions(-) | ||
8 | 14 | ||
9 | Index: git/Makefile | 15 | Index: git/Makefile |
10 | =================================================================== | 16 | =================================================================== |
11 | --- git.orig/Makefile 2011-07-05 11:58:11.699910550 +0100 | 17 | --- git.orig/Makefile |
12 | +++ git/Makefile 2011-07-05 23:30:12.319920617 +0100 | 18 | +++ git/Makefile |
13 | @@ -189,10 +189,11 @@ | 19 | @@ -202,12 +202,13 @@ export Q VERBOSE |
14 | TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) | 20 | TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION) |
15 | KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) | 21 | KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION) |
16 | 22 | ||
17 | -INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) | 23 | -INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES) |
18 | +INCLUDES = -I. $(CONFIG_INCLUDES) | 24 | +INCLUDES = -I. $(CONFIG_INCLUDES) |
19 | 25 | ||
26 | include features.mk | ||
27 | |||
20 | # Set compile option CFLAGS if not set elsewhere | 28 | # Set compile option CFLAGS if not set elsewhere |
21 | CFLAGS ?= -g -Wall | 29 | CFLAGS ?= -g -Wall |
22 | +LDFLAGS ?= | 30 | +LDFLAGS ?= |
23 | 31 | ||
24 | # Append required CFLAGS | 32 | ifndef NO_PTRACE |
25 | override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) | 33 | ifneq ($(call try-cc,$(SOURCE_PTRACE),),y) |
26 | @@ -225,7 +226,7 @@ | 34 | @@ -251,7 +252,7 @@ do_fpic_compile = \ |
27 | 35 | ||
28 | do_app_build = \ | 36 | do_app_build = \ |
29 | ($(print_app_build) \ | 37 | ($(print_app_build) \ |
@@ -32,7 +40,7 @@ Index: git/Makefile | |||
32 | 40 | ||
33 | do_compile_shared_library = \ | 41 | do_compile_shared_library = \ |
34 | ($(print_shared_lib_compile) \ | 42 | ($(print_shared_lib_compile) \ |
35 | @@ -237,7 +238,7 @@ | 43 | @@ -263,7 +264,7 @@ do_compile_plugin_obj = \ |
36 | 44 | ||
37 | do_plugin_build = \ | 45 | do_plugin_build = \ |
38 | ($(print_plugin_build) \ | 46 | ($(print_plugin_build) \ |
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch new file mode 100644 index 0000000000..8402426c5f --- /dev/null +++ b/meta/recipes-kernel/trace-cmd/trace-cmd/make-docs-optional.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Disable building docs until we have asciidocs available as a recipe. | ||
2 | |||
3 | Upstream-Status: Inappropriate [Account for missing dependency, the lazy way] | ||
4 | |||
5 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | ||
6 | |||
7 | --- | ||
8 | Makefile | 8 ++++++-- | ||
9 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
10 | |||
11 | Index: git/Makefile | ||
12 | =================================================================== | ||
13 | --- git.orig/Makefile | ||
14 | +++ git/Makefile | ||
15 | @@ -327,7 +327,9 @@ TARGETS = $(CMD_TARGETS) $(GUI_TARGETS) | ||
16 | # If you want kernelshark, then do: make gui | ||
17 | ### | ||
18 | |||
19 | -all: all_cmd doc show_gui_make | ||
20 | +# Make doc optional | ||
21 | +#all: all_cmd doc show_gui_make | ||
22 | +all: all_cmd show_gui_make | ||
23 | |||
24 | all_cmd: $(CMD_TARGETS) | ||
25 | |||
26 | @@ -503,7 +505,9 @@ install_python: $(PYTHON_SO_INSTALL) $(P | ||
27 | install_cmd: all_cmd install_plugins install_python | ||
28 | $(Q)$(call do_install,trace-cmd,$(bindir_SQ)) | ||
29 | |||
30 | -install: install_cmd install_doc | ||
31 | +# Make doc optional | ||
32 | +#install: install_cmd install_doc | ||
33 | +install: install_cmd | ||
34 | @echo "Note: to install the gui, type \"make install_gui\"" | ||
35 | |||
36 | install_gui: install_cmd gui | ||