summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 23:25:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 10:57:50 +0100
commit2cce411267c19232aa51292f95f2b8e55c0a0457 (patch)
treeedfed66ca86bd090a1de1d3fe98a5201412435b5
parent407c6c4dc810b366ded83c6152d0a2104d13a2e9 (diff)
downloadpoky-2cce411267c19232aa51292f95f2b8e55c0a0457.tar.gz
kernelshark/trace-cmd: Clean up QA warnings including fising LDFLAGS issues
(From OE-Core rev: b85047e1047e45c2126f2267fe412e9a08d8044a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/trace-cmd/kernelshark_git.bb10
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch43
-rw-r--r--meta/recipes-kernel/trace-cmd/trace-cmd_git.bb5
3 files changed, 54 insertions, 4 deletions
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
index 6b4692efd5..733bddcc20 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" 4 file://kernel-shark.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
5 5
6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" 6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49"
7PR = r0 7PR = r1
8PV = "1.0.5+git${SRCPV}" 8PV = "1.0.5+git${SRCPV}"
9 9
10DEPENDS = "gtk+" 10DEPENDS = "gtk+"
@@ -12,11 +12,17 @@ RDEPENDS_${PN} = "trace-cmd"
12 12
13inherit pkgconfig 13inherit pkgconfig
14 14
15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git" 15SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
16 file://addldflags.patch"
16S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
17 18
18EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui" 19EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'prefix=${prefix}' gui"
19 20
21FILES_${PN} += "${datadir}/trace-cmd/plugins/*.so"
22FILES_${PN}-dbg += "${datadir}/trace-cmd/plugins/.debug/"
23
24FILESPATH = "${FILE_DIRNAME}/trace-cmd"
25
20do_install() { 26do_install() {
21 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui 27 oe_runmake CC="${CC}" AR="${AR}" prefix="${prefix}" DESTDIR="${D}" install_gui
22} 28}
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
new file mode 100644
index 0000000000..8e8f578e61
--- /dev/null
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd/addldflags.patch
@@ -0,0 +1,43 @@
1Upstream-Status: Pending
2
3Add ability for the Makefile to respect LDFLAGS.
4
5Also remove hardcoded /usr/local/include include path.
6
7RP 7/5/2011
8
9Index: git/Makefile
10===================================================================
11--- git.orig/Makefile 2011-07-05 11:58:11.699910550 +0100
12+++ git/Makefile 2011-07-05 23:30:12.319920617 +0100
13@@ -189,10 +189,11 @@
14 TRACECMD_VERSION = $(TC_VERSION).$(TC_PATCHLEVEL).$(TC_EXTRAVERSION)
15 KERNELSHARK_VERSION = $(KS_VERSION).$(KS_PATCHLEVEL).$(KS_EXTRAVERSION)
16
17-INCLUDES = -I. -I/usr/local/include $(CONFIG_INCLUDES)
18+INCLUDES = -I. $(CONFIG_INCLUDES)
19
20 # Set compile option CFLAGS if not set elsewhere
21 CFLAGS ?= -g -Wall
22+LDFLAGS ?=
23
24 # Append required CFLAGS
25 override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
26@@ -225,7 +226,7 @@
27
28 do_app_build = \
29 ($(print_app_build) \
30- $(CC) $^ -rdynamic -o $@ $(CONFIG_LIBS) $(LIBS))
31+ $(CC) $^ -rdynamic -o $@ $(LDFLAGS) $(CONFIG_LIBS) $(LIBS))
32
33 do_compile_shared_library = \
34 ($(print_shared_lib_compile) \
35@@ -237,7 +238,7 @@
36
37 do_plugin_build = \
38 ($(print_plugin_build) \
39- $(CC) $(CFLAGS) -shared -nostartfiles -o $@ $<)
40+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -o $@ $<)
41
42 do_build_static_lib = \
43 ($(print_static_lib_build) \
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index 5cf433a1cc..1278dc7199 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -4,12 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
4 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e" 4 file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e"
5 5
6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49" 6SRCREV = "6c696cec3f264a9399241b6e648f58bc97117d49"
7PR = "r1" 7PR = "r2"
8PV = "1.0.5+git${SRCPV}" 8PV = "1.0.5+git${SRCPV}"
9 9
10inherit pkgconfig 10inherit pkgconfig
11 11
12SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git" 12SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git;protocol=git \
13 file://addldflags.patch"
13S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
14 15
15EXTRA_OEMAKE = "'prefix=${prefix}'" 16EXTRA_OEMAKE = "'prefix=${prefix}'"