From 787ed39a2b1a598482dfc3354c4698e3a586a096 Mon Sep 17 00:00:00 2001 From: Shane Wang Date: Tue, 27 Dec 2011 11:11:15 +0800 Subject: oprofileui: upgrade to 82ecf8c6b53b84f80682a8312f9defa83a95f2a3 This patch removed two patches because those are there in the upstream. Signed-off-by: Shane Wang --- .../oprofileui/dso_linking_change_build_fix.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch (limited to 'meta/recipes-kernel/oprofile/oprofileui/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 deleted file mode 100644 index 39ceb22e3..000000000 --- a/meta/recipes-kernel/oprofile/oprofileui/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -With 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. - -| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/oprofileui-0.0+svnr197-r0/trunk/src'^M -| 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 -| /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 -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libm.so.6: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make[2]: *** [oprofile-viewer] Error 1^M - -Upstream-Status: Inappropriate [configuration] - -Nitin A Kamble -Date: 2011/01/11 - -Index: trunk/src/Makefile.am -=================================================================== ---- trunk.orig/src/Makefile.am -+++ trunk/src/Makefile.am -@@ -56,7 +56,7 @@ oprofile_viewer_SOURCES = \ - - oprofile_viewer_LDFLAGS = - --oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a -+oprofile_viewer_LDADD = $(OPROFILEUI_LIBS) -lm $(AVAHI_LIBS) $(top_builddir)/protocol/libop.a - - testparser_SOURCES = \ - parser.c \ -- cgit v1.2.3