summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/lttng/lttng-viewer
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-05-03 21:54:27 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-05 12:26:33 +0100
commit32240fdfb91b882153511833cdef24d038d1347e (patch)
treeab28ddab0a4f9995a270d073f8b07c1472cb5e4b /meta/recipes-kernel/lttng/lttng-viewer
parentc4d01fc8aa3d5823e776f4b33becfad39cfc47ef (diff)
downloadpoky-32240fdfb91b882153511833cdef24d038d1347e.tar.gz
lttng-viewer: explicitly add linkage to lttvwindow
Fixes [YOCTO #412] Also update FILES_${PN}. (From OE-Core rev: 6252898534a885237a3df9c8cb4ea1fdd43f65c5) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/lttng/lttng-viewer')
-rw-r--r--meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch42
1 files changed, 42 insertions, 0 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