summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2011-12-27 11:11:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:35 +0000
commit5e669dd07ce7e7ba8c71a5282eb023d9de805377 (patch)
tree0623ed1ef7b91a54684c228352c17c62ad28ac75 /meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
parent7463ae48faad5c1cbe67f4c011776e1c40d9b5fe (diff)
downloadpoky-5e669dd07ce7e7ba8c71a5282eb023d9de805377.tar.gz
oprofileui: upgrade to 82ecf8c6b53b84f80682a8312f9defa83a95f2a3
This patch removed two patches because those are there in the upstream. (From OE-Core rev: 787ed39a2b1a598482dfc3354c4698e3a586a096) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch')
-rw-r--r--meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch27
1 files changed, 0 insertions, 27 deletions
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
deleted file mode 100644
index 39ceb22e39..0000000000
--- a/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
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
10Upstream-Status: Inappropriate [configuration]
11
12Nitin A Kamble <nitin.a.kamble@intel.com>
13Date: 2011/01/11
14
15Index: trunk/src/Makefile.am
16===================================================================
17--- trunk.orig/src/Makefile.am
18+++ trunk/src/Makefile.am
19@@ -56,7 +56,7 @@ oprofile_viewer_SOURCES = \
20
21 oprofile_viewer_LDFLAGS =
22
23-oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a
24+oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) -lm $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a
25
26 testparser_SOURCES = \
27 parser.c \