diff options
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r-- | meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch | 29 | ||||
-rw-r--r-- | meta/recipes-sato/settings-daemon/settings-daemon_svn.bb | 5 |
2 files changed, 32 insertions, 2 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 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 @@ | |||
1 | after gcc linking has changed, all the libraries must be explicitely specified to for linking. | ||
2 | This patch avoids this linking error: | ||
3 | |||
4 | | make all-am^M | ||
5 | | make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
6 | | 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 | ||
7 | | /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 | ||
8 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M | ||
9 | | collect2: ld returned 1 exit status^M | ||
10 | | make[1]: *** [settings-daemon] Error 1^M | ||
11 | | make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
12 | | make: *** [all] Error 2^M | ||
13 | |||
14 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
15 | Date: 2011/01/11 | ||
16 | |||
17 | Index: settings-daemon/configure.ac | ||
18 | =================================================================== | ||
19 | --- settings-daemon.orig/configure.ac | ||
20 | +++ settings-daemon/configure.ac | ||
21 | @@ -14,7 +14,7 @@ AC_PROG_CC | ||
22 | |||
23 | |||
24 | dnl TODO: make gconf optional | ||
25 | -PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) | ||
26 | +PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) | ||
27 | |||
28 | |||
29 | 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+" | |||
8 | SECTION = "x11" | 8 | SECTION = "x11" |
9 | PV = "0.0+svnr${SRCPV}" | 9 | PV = "0.0+svnr${SRCPV}" |
10 | 10 | ||
11 | PR = "r3" | 11 | PR = "r4" |
12 | 12 | ||
13 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ | 13 | SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ |
14 | file://addsoundkeys.patch;apply=yes \ | 14 | file://addsoundkeys.patch;apply=yes \ |
15 | file://70settings-daemon.sh" | 15 | file://70settings-daemon.sh \ |
16 | file://dso_linking_change_build_fix.patch" | ||
16 | 17 | ||
17 | S = "${WORKDIR}/${PN}" | 18 | S = "${WORKDIR}/${PN}" |
18 | 19 | ||