summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-stroke
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-01-11 17:48:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 21:37:04 (GMT)
commita698372e9b8e139ce2fa24aaaae8bcffc3e6a4b1 (patch)
treea43949de387e099b8faff6158bb9c993dcf3065a /meta/recipes-sato/matchbox-stroke
parente6d4c253a895b307cc163cbd9e2fb78b5122de92 (diff)
downloadpoky-a698372e9b8e139ce2fa24aaaae8bcffc3e6a4b1.tar.gz
matchbox-stroke: : 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 libxrender 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-stroke')
-rw-r--r--meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch36
-rw-r--r--meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb4
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000..dd45341
--- /dev/null
+++ b/meta/recipes-sato/matchbox-stroke/files/dso_linking_change_build_fix.patch
@@ -0,0 +1,36 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke'^M
5| Making all in src^M
6| make[2]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/matchbox-stroke-0.0+svnr1820-r0/matchbox-stroke/src'^M
7| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o matchbox-stroke matchbox-stroke.o matchbox-stroke-ui.o matchbox-stroke-recog.o matchbox-stroke-mode.o matchbox-stroke-action.o config-parser.o util-hash.o util.o -lXft -lX11 -lXtst -lfakekey -lexpat -lm^M
8| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: u: invalid DSO for symbol `XRenderFindVisualFormat' definition^M
9| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M
10| collect2: ld returned 1 exit status^M
11| make[2]: *** [matchbox-stroke] Error 1
12
13Nitin A Kamble <nitin.a.kamble@intel.com>
14Date: 2011/01/11
15
16
17Index: matchbox-stroke/configure.ac
18===================================================================
19--- matchbox-stroke.orig/configure.ac
20+++ matchbox-stroke/configure.ac
21@@ -38,7 +38,7 @@ AC_ARG_WITH(expat-lib,
22 expat_lib=$withval, expat_lib=yes)
23
24
25-PKG_CHECK_MODULES(MBSTROKE, xft libfakekey,,
26+PKG_CHECK_MODULES(MBSTROKE, xft libfakekey xrender,,
27 AC_MSG_ERROR([*** Required Librarys not found ***]))
28
29 dnl ------ Expat ------------------------------------------------------------
30@@ -160,4 +160,4 @@ echo "
31 compiler: ${CC}
32
33 Building with Debug: ${enable_debug}
34-"
35\ No newline at end of file
36+"
diff --git a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
index 5021d88..de675c2 100644
--- a/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
+++ b/meta/recipes-sato/matchbox-stroke/matchbox-stroke_svn.bb
@@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://src/matchbox-stroke.h;endline=12;md5=8ed5c5bbec2321fb
8DEPENDS = "libfakekey expat libxft" 8DEPENDS = "libfakekey expat libxft"
9SECTION = "x11/wm" 9SECTION = "x11/wm"
10PV = "0.0+svnr${SRCPV}" 10PV = "0.0+svnr${SRCPV}"
11PR = "r1"
11 12
12SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 13SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
13 file://single-instance.patch;patch=1 \ 14 file://single-instance.patch;patch=1 \
14 file://configure_fix.patch;patch=1;maxrev=1819 " 15 file://configure_fix.patch;patch=1;maxrev=1819 \
16 file://dso_linking_change_build_fix.patch "
15 17
16S = "${WORKDIR}/${PN}" 18S = "${WORKDIR}/${PN}"
17 19