From 32240fdfb91b882153511833cdef24d038d1347e Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Tue, 3 May 2011 21:54:27 +0800 Subject: lttng-viewer: explicitly add linkage to lttvwindow Fixes [YOCTO #412] Also update FILES_${PN}. (From OE-Core rev: 6252898534a885237a3df9c8cb4ea1fdd43f65c5) Signed-off-by: Dexuan Cui Signed-off-by: Richard Purdie --- .../lttng-viewer/add_linkage_to_lttvwindow.patch | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch (limited to 'meta/recipes-kernel/lttng/lttng-viewer') 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 @@ +Upstream-Status: Inappropriate [configuration] + +Explicitly add linkage to lttvwindow. + +Without the fix, lttv-gui inside target can't run, complaining +"undefined symbol: LTTV_VIEWER_CONSTRUCTORS". + +Tue May 3 21:39:37 CST 2011 + +Signed-off-by: Dexuan Cui + +diff --git a/lttv/modules/gui/common.am b/lttv/modules/gui/common.am +index ce50113..89083aa 100644 +--- a/lttv/modules/gui/common.am ++++ b/lttv/modules/gui/common.am +@@ -21,3 +21,4 @@ AM_LDFLAGS = $(MODULE_LDFLAGS) + + libdir = ${lttvplugindir} + ++LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow +diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am +index c953fc9..489d640 100644 +--- a/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am ++++ b/lttv/modules/gui/lttvwindow/lttvwindow/Makefile.am +@@ -1,13 +1,14 @@ + ## Process this file with automake to produce Makefile.in + +-include ../../common.am +- + INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ + -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + $(DEFAULT_INCLUDES) + +-#libdir = ${lttvplugindir} ++AM_CFLAGS = $(MODULE_CFLAGS) ++AM_LDFLAGS = $(MODULE_LDFLAGS) ++ ++libdir = ${lttvplugindir} + + lib_LTLIBRARIES = liblttvwindow.la + -- cgit v1.2.3-54-g00ecf