summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 0000000000..dd45341190
--- /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 5021d8839e..de675c2b9b 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