summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-11 03:49:06 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:03 +0000
commitd9276d4a043c4b3f32a681531e6b9e92d45222c7 (patch)
treeac3835faf59a2958f31e2310f718717007255ad9 /meta
parentf7c568941aba9279c4351f39bc4396e35244d4d0 (diff)
downloadpoky-d9276d4a043c4b3f32a681531e6b9e92d45222c7.tar.gz
oprofileui: fix the build failure after gcc dso change
With a change in gcc all the libraries needs to be specified explicitely for linking. That breaks compile for this package as libm is not explicitely specified. This commit fixes that linking issue. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui-svn.inc5
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch25
2 files changed, 28 insertions, 2 deletions
diff --git a/meta/recipes-kernel/oprofile/oprofileui-svn.inc b/meta/recipes-kernel/oprofile/oprofileui-svn.inc
index 0e7e7940c0..5d40914734 100644
--- a/meta/recipes-kernel/oprofile/oprofileui-svn.inc
+++ b/meta/recipes-kernel/oprofile/oprofileui-svn.inc
@@ -1,8 +1,9 @@
1require oprofileui.inc 1require oprofileui.inc
2 2
3PV = "0.0+svnr${SRCPV}" 3PV = "0.0+svnr${SRCPV}"
4PR = "r0" 4PR = "r1"
5 5
6S = "${WORKDIR}/trunk" 6S = "${WORKDIR}/trunk"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/oprofileui;module=trunk;proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/oprofileui;module=trunk;proto=http \
9 file://dso_linking_change_build_fix.patch "
diff --git a/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch b/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000000..4b44c69bcf
--- /dev/null
+++ b/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
@@ -0,0 +1,25 @@
1With dso linking change in gcc, all the libraries are needed to be explicitely specified to linker now. It breaks this package in following way. The libm library needs to be specified explicitely.
2
3| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/oprofileui-0.0+svnr197-r0/trunk/src'^M
4| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -g -std=gnu99 -DPKG_DATA_DIR=\""/usr/share/oprofileui"\" -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o oprofile-viewer main.o client.o archive.o archive_window.o archive_save_window.o view.o report.o parser.o image.o symbol.o module.o symbol_instance.o module_instance.o callee_symbol_instance.o caller_symbol_instance.o state-util.o -pthread -lglade-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lxml2 -lgnomevfs-2 -lgmodule-2.0 -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgobject-2.0 -lgthread-2.0 -lrt -lglib-2.0 -pthread -lavahi-ui -lgtk-x11-2.0 -lavahi-common -lavahi-client -lavahi-glib -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 ../protocol/libop.a^M
5| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^X^B: invalid DSO for symbol `log@@GLIBC_2.0' definition^M
6| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libm.so.6: could not read symbols: Bad value^M
7| collect2: ld returned 1 exit status^M
8| make[2]: *** [oprofile-viewer] Error 1^M
9
10Nitin A Kamble <nitin.a.kamble@intel.com>
11Date: 2011/01/11
12
13Index: trunk/src/Makefile.am
14===================================================================
15--- trunk.orig/src/Makefile.am
16+++ trunk/src/Makefile.am
17@@ -56,7 +56,7 @@ oprofile_viewer_SOURCES = \
18
19 oprofile_viewer_LDFLAGS =
20
21-oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a
22+oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) -lm $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a
23
24 testparser_SOURCES = \
25 parser.c \