diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2011-05-03 21:54:27 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-05 11:54:43 +0100 |
| commit | 6252898534a885237a3df9c8cb4ea1fdd43f65c5 (patch) | |
| tree | fbcf7441f05e66c128bd0041dd46c8eaba1acf65 | |
| parent | 50a54e885e3ec1c889f754fa3f5dce0072cfb6c9 (diff) | |
| download | openembedded-core-6252898534a885237a3df9c8cb4ea1fdd43f65c5.tar.gz openembedded-core-6252898534a885237a3df9c8cb4ea1fdd43f65c5.tar.bz2 openembedded-core-6252898534a885237a3df9c8cb4ea1fdd43f65c5.zip | |
lttng-viewer: explicitly add linkage to lttvwindow
Fixes [YOCTO #412]
Also update FILES_${PN}.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-viewer/add_linkage_to_lttvwindow.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-kernel/lttng/lttng-viewer_0.12.38.bb | 10 |
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 @@ +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 <dexuan.cui@intel.com> + +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 + 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" LIC_FILES_CHKSUM = "file://COPYING;md5=f650d5f5af1e9648fe0b40e290d3adbb \ file://ltt/ltt.h;beginline=2;endline=18;md5=8b7da9190028c50396d97fc85bad0da9 \ file://lttv/lttv/traceset.c;beginline=2;endline=17;md5=bcab42863b64b41d153bf81bbe2490a6" -PR = "r0" +PR = "r1" + DEPENDS = "gtk+ pango popt" SECTION = "devel" ALTNAME = "lttv-${PV}-21032011" -SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz" +SRC_URI = "http://lttng.org/files/packages/${ALTNAME}.tar.gz \ + file://add_linkage_to_lttvwindow.patch" SRC_URI[md5sum] = "071bf3dd13e7562c08ee8f8971cfc76d" SRC_URI[sha256sum] = "cf87ffcf5d266b18979418e610a180a0b4214de41677f0be867885e15b2f7647" @@ -29,7 +31,7 @@ LEAD_SONAME = "liblttvtraceread*" FILES_${PN} += "\ ${libdir}/liblttvtraceread*.so \ ${libdir}/lttv/plugins/*.so \ - ${datadir}/LinuxTraceToolkitViewer/facilities/* \ - ${datadir}/LinuxTraceToolkitViewer/pixmaps/* " + ${datadir}/lttv/facilities/* \ + ${datadir}/lttv/pixmaps/* " FILES_${PN}-dbg += "${libdir}/lttv/plugins/.debug/" |