summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-desktop
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-11 15:22:37 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:03 (GMT)
commit5a91224e9c6936ed76c3c27842b438b437e10bff (patch)
treeed7dbe1cdf84633ee196ed7036f53ac76da7163b /meta/recipes-sato/matchbox-desktop
parent8327a9d2783e7a6209ea813295b9535653f0326e (diff)
downloadpoky-5a91224e9c6936ed76c3c27842b438b437e10bff.tar.gz
matchbox-desktop: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso linking change patch. This was causing build errors for this recipe. Specifying the libX11 library explicitely for linking to work without errors. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-desktop')
-rw-r--r--meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch26
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb5
-rw-r--r--meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb5
3 files changed, 32 insertions, 4 deletions
diff --git a/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000..54f3670
--- /dev/null
+++ b/meta/recipes-sato/matchbox-desktop/files/dso_linking_change_build_fix.patch
@@ -0,0 +1,26 @@
1after gcc linking has changed, all the libraries must be explicitely specified to for linking.
2This patch avoids this linking error:
3
4| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-desktop-2.0+svnr2096-r0/matchbox-desktop-2/src'^M
5| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-desktop main.o taku-category-bar.o desktop.o ../libtaku/libtaku.a -pthread -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 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -ldbus-1 -lpthread -lrt -lstartup-notification-1 ../libtaku/libinotify.a^M
6| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: F^A: invalid DSO for symbol `XFree' definition^M
7| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
8| collect2: ld returned 1 exit status^M
9| make[2]: *** [matchbox-desktop] Error 1
10
11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/01/11
13
14Index: matchbox-desktop-2/configure.ac
15===================================================================
16--- matchbox-desktop-2.orig/configure.ac
17+++ matchbox-desktop-2/configure.ac
18@@ -14,7 +14,7 @@ if test x$inotify_support = xyes; then
19 AC_DEFINE(WITH_INOTIFY, [1], [If inotify is enabled])
20 fi
21
22-PKG_CHECK_MODULES(GTK, gtk+-2.0)
23+PKG_CHECK_MODULES(GTK, [gtk+-2.0 x11])
24
25 AC_ARG_ENABLE(startup_notification,
26 AC_HELP_STRING([--disable-startup-notification], [disable startup notification support]),
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
index 83d4d0b..2943e4d 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_2.0.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "gtk+ startup-notification" 3DEPENDS = "gtk+ startup-notification"
4SECTION = "x11/wm" 4SECTION = "x11/wm"
5PR = "r1" 5PR = "r2"
6 6
7SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2" 7SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-desktop/2.0/matchbox-desktop-${PV}.tar.bz2 \
8 file://dso_linking_change_build_fix.patch"
8 9
9EXTRA_OECONF = "--enable-startup-notification" 10EXTRA_OECONF = "--enable-startup-notification"
10 11
diff --git a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
index f5aadfd..bed82ac 100644
--- a/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/meta/recipes-sato/matchbox-desktop/matchbox-desktop_svn.bb
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
11DEPENDS = "gtk+ startup-notification dbus" 11DEPENDS = "gtk+ startup-notification dbus"
12SECTION = "x11/wm" 12SECTION = "x11/wm"
13PV = "2.0+svnr${SRCPV}" 13PV = "2.0+svnr${SRCPV}"
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http" 16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN}-2;proto=http \
17 file://dso_linking_change_build_fix.patch"
17 18
18EXTRA_OECONF = "--enable-startup-notification --with-dbus" 19EXTRA_OECONF = "--enable-startup-notification --with-dbus"
19 20