summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch42
-rw-r--r--meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb10
2 files changed, 48 insertions, 4 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
new file mode 100644
index 0000000000..4a135dff24
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch
@@ -0,0 +1,42 @@
1Upstream-Status: Inappropriate [configuration]
2
3Explicitly add linkage to lttvwindow.
4
5Without the fix, lttv-gui inside target can't run, complaining
6"undefined symbol: LTTV_VIEWER_CONSTRUCTORS".
7
8Tue May 3 21:39:37 CST 2011
9
10Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
11
12diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am
13index ce50113..89083aa 100644
14--- a/lttv/modules/gui/common.am
15+++ b/lttv/modules/gui/common.am
16@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS)
17
18 libdir = ${lttvplugindir}
19
20+LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow
21diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
22index c953fc9..489d640 100644
23--- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
24+++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am
25@@ -1,13 +1,14 @@
26 ## Process this file with automake to produce Makefile.in
27
28-include ../../common.am
29-
30 INCLUDES = \
31 -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
32 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
33 $(DEFAULT_INCLUDES)
34
35-#libdir = ${lttvplugindir}
36+AM_CFLAGS = $(MODULE_CFLAGS)
37+AM_LDFLAGS = $(MODULE_LDFLAGS)
38+
39+libdir = ${lttvplugindir}
40
41 lib_LTLIBRARIES = liblttvwindow.la
42
diff --git a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
index b8f2f2c7a2..5e7bd4cdea 100644
--- a/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
+++ b/meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb
@@ -9,14 +9,16 @@ LICENSE = "GPLv2 & LGPLv2.1"
9LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \
10 file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \ 10 file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \
11 file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6" 11 file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6"
12PR = "r0" 12PR = "r1"
13
13DEPENDS = "gtk+ pango popt" 14DEPENDS = "gtk+ pango popt"
14 15
15SECTION = "devel" 16SECTION = "devel"
16 17
17ALTNAME = "lttv-${PV}-21032011" 18ALTNAME = "lttv-${PV}-21032011"
18 19
19SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz" 20SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz \
21 file://add_linkage_to_lttvwindow.patch"
20 22
21SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d" 23SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d"
22SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647" 24SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647"
@@ -29,7 +31,7 @@ LEAD_SONAME = "liblttvtraceread*"
29FILES_${PN} += "\ 31FILES_${PN} += "\
30 ${libdir}/liblttvtraceread*.so \ 32 ${libdir}/liblttvtraceread*.so \
31 ${libdir}/lttv/plugins/*.so \ 33 ${libdir}/lttv/plugins/*.so \
32 ${datadir}/LinuxTraceToolkitViewer/facilities/* \ 34 ${datadir}/lttv/facilities/* \
33 ${datadir}/LinuxTraceToolkitViewer/pixmaps/* " 35 ${datadir}/lttv/pixmaps/* "
34FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/" 36FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/"
35 37