mirror of
https://git.yoctoproject.org/poky
synced 2026-02-25 02:49:40 +01:00
80986e1182
Update the trace-cmd and kernelshark recipes to version 1.2. Rename the recipes to the more descriptive trace-cmd_1.2.bb and kernelshark_1.2.bb respectively. Update addldflags.patch for 1.2 and current Upstream-Status (Accepted). Add make-docs-optional.patch to avoid building the new doc target which requires asciidocs. We should add asciidocs and properly package the docs, but for now it's more important to get the sources current. (From OE-Core rev: 73ac48377491561151658617d8cc45936242eb0c) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
trace-cmd: Cross-compile fixes for LDFLAGS and include path
|
|
|
|
Add ability for the Makefile to respect LDFLAGS.
|
|
Also remove hardcoded /usr/local/include include path.
|
|
|
|
Upstream-Status: Accepted [Post 1.2: 5f576e9af7ad706774d9764a9ae3989376797c0e]
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
|
|
|
|
---
|
|
Makefile | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
Index: git/Makefile
|
|
===================================================================
|
|
--- git.orig/Makefile
|
|
+++ git/Makefile
|
|
@@ -202,12 +202,13 @@ export Q VERBOSE
|
|
TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
|
|
KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
|
|
|
|
-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
|
|
+INCLUDES = -I. $(CONFIG_INCLUDES)
|
|
|
|
include features.mk
|
|
|
|
# Set compile option CFLAGS if not set elsewhere
|
|
CFLAGS ?= -g -Wall
|
|
+LDFLAGS ?=
|
|
|
|
ifndef NO_PTRACE
|
|
ifneq ($(call try-cc,$(SOURCE_PTRACE),),y)
|
|
@@ -251,7 +252,7 @@ do_fpic_compile = \
|
|
|
|
do_app_build = \
|
|
($(print_app_build) \
|
|
- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
|
|
+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
|
|
|
|
do_compile_shared_library = \
|
|
($(print_shared_lib_compile) \
|
|
@@ -263,7 +264,7 @@ do_compile_plugin_obj = \
|
|
|
|
do_plugin_build = \
|
|
($(print_plugin_build) \
|
|
- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
|
|
|
|
do_build_static_lib = \
|
|
($(print_static_lib_build) \
|