summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-02-29 13:41:37 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:22 +0100
commit8072c7020f61c5e1a6e28d254dd967649e5a70c4 (patch)
treed89f9c3a4475f534b25b363bcd5accb94fa12bce /meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
parentf1dcc26187e9cfc1103bf298208bb8af1b4e9030 (diff)
downloadpoky-8072c7020f61c5e1a6e28d254dd967649e5a70c4.tar.gz
settings-daemon: Upgrade to 0.0.2
* New versions builds with gdk-x11-3.0 and supports gconf key "matchbox_theme". * Remove patch that's already upstream. (From OE-Core rev: 26694d90e9cc3024571c756445183828e2691cd4) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch')
-rw-r--r--meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch31
1 files changed, 0 insertions, 31 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)