From 8327a9d2783e7a6209ea813295b9535653f0326e Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Tue, 11 Jan 2011 07:16:13 -0800 Subject: settings-daemon: fix build error with new 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 --- .../files/dso_linking_change_build_fix.patch | 29 ++++++++++++++++++++++ .../settings-daemon/settings-daemon_svn.bb | 5 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch (limited to 'meta') diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..5fd96d4645 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch @@ -0,0 +1,29 @@ +after gcc linking has changed, all the libraries must be explicitely specified to for linking. +This patch avoids this linking error: + +| make all-am^M +| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M +| 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 settings-daemon settings_daemon-xsettings-common.o settings_daemon-xsettings-manager.o settings_daemon-settings-daemon.o -pthread -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0^M +| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: *^A: invalid DSO for symbol `XCreateSimpleWindow' definition^M +| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M +| collect2: ld returned 1 exit status^M +| make[1]: *** [settings-daemon] Error 1^M +| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M +| make: *** [all] Error 2^M + +Nitin A Kamble +Date: 2011/01/11 + +Index: settings-daemon/configure.ac +=================================================================== +--- settings-daemon.orig/configure.ac ++++ settings-daemon/configure.ac +@@ -14,7 +14,7 @@ AC_PROG_CC + + + dnl TODO: make gconf optional +-PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) ++PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) + + + AC_SUBST(APP_CFLAGS) diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb index 720ebfbebe..4f798b85b0 100644 --- a/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb +++ b/meta/recipes-sato/settings-daemon/settings-daemon_svn.bb @@ -8,11 +8,12 @@ DEPENDS = "gconf glib-2.0 gtk+" SECTION = "x11" PV = "0.0+svnr${SRCPV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ file://addsoundkeys.patch;apply=yes \ - file://70settings-daemon.sh" + file://70settings-daemon.sh \ + file://dso_linking_change_build_fix.patch" S = "${WORKDIR}/${PN}" -- cgit v1.2.3