summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch31
-rw-r--r--meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb (renamed from meta/recipes-sato/settings-daemon/settings-daemon_git.bb)9
2 files changed, 4 insertions, 36 deletions
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
deleted file mode 100644
index 594374467a..0000000000
--- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3after gcc linking has changed, all the libraries must be explicitely specified to for linking.
4This patch avoids this linking error:
5
6| make all-am^M
7| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
8| 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
9| /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
10| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M
11| collect2: ld returned 1 exit status^M
12| make[1]: *** [settings-daemon] Error 1^M
13| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M
14| make: *** [all] Error 2^M
15
16Nitin A Kamble <nitin.a.kamble@intel.com>
17Date: 2011/01/11
18
19Index: settings-daemon/configure.ac
20===================================================================
21--- settings-daemon.orig/configure.ac
22+++ settings-daemon/configure.ac
23@@ -14,7 +14,7 @@ AC_PROG_CC
24
25
26 dnl TODO: make gconf optional
27-PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0])
28+PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11])
29
30
31 AC_SUBST(APP_CFLAGS)
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
index c0615530af..56eb656ecb 100644
--- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb
+++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
@@ -4,16 +4,15 @@ BUGTRACKER = "http://bugzilla.yoctoproject.org/"
4LICENSE = "MIT-style" 4LICENSE = "MIT-style"
5LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ 5LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" 6 file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
7DEPENDS = "gconf glib-2.0 gtk+" 7DEPENDS = "gconf glib-2.0 gtk+3"
8SECTION = "x11" 8SECTION = "x11"
9SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1"
10PV = "0.0+git${SRCPV}"
11
12 9
10# SRCREV tagged 0.0.2
11SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
13SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ 12SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \
14 file://addsoundkeys.patch;apply=yes \ 13 file://addsoundkeys.patch;apply=yes \
15 file://70settings-daemon.sh \ 14 file://70settings-daemon.sh \
16 file://dso_linking_change_build_fix.patch" 15 "
17 16
18S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
19 18