summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2011-11-18 14:36:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-18 14:37:15 +0000
commit6aa658495b028cd1301b9892fdc19a1b67ff06ca (patch)
tree58afa999fcaad32ec22dcd8b2322e12f6791fcd4 /meta/recipes-graphics
parent983ce7f1b43652b2aabaa1b617b01950aa372efd (diff)
downloadpoky-6aa658495b028cd1301b9892fdc19a1b67ff06ca.tar.gz
mesa: fix calling host's commands
mesa use its script file bin/mklib to generate libraries, and call the host's commands "ar/ranlib/gcc/g++". Fix it to call the cross-compile tools properly. (From OE-Core rev: 0a815e889d056f44af1ada623b4b2edcb699693a) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa-7.11.inc1
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch71
3 files changed, 73 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
index 746b764ced..2f14ed4f2b 100644
--- a/meta/recipes-graphics/mesa/mesa-7.11.inc
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -2,6 +2,7 @@ DEPENDS += "mesa-dri-glsl-native"
2 2
3SRC_URI += "file://uclibc.patch \ 3SRC_URI += "file://uclibc.patch \
4 file://crossfix.patch \ 4 file://crossfix.patch \
5 file://crossfix-mklib.patch \
5 " 6 "
6SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13" 7SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
7SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf" 8SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 06ebb7508c..1d9c8946fa 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d" 13LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
14 14
15INC_PR = "r12" 15INC_PR = "r13"
16PE = "2" 16PE = "2"
17 17
18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" 18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
diff --git a/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch b/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
new file mode 100644
index 0000000000..dc0822891b
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
@@ -0,0 +1,71 @@
1This patch is ported from WindRiver linux and to fix cross compile failure.
2
3And original commits are:
4commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
5commit 5c4212084b871a0c0fb7d174280ec9a634637deb
6
7Upstream-Status: Pending
8
9Signed-off-by: Kang Kai <kai.kang@windriver.com>
10
11--- Mesa-7.10.2/bin/mklib.orig 2011-09-28 16:15:34.170000074 +0800
12+++ Mesa-7.10.2/bin/mklib 2011-09-28 16:15:42.370000073 +0800
13@@ -49,8 +49,8 @@
14 /*) ;;
15 *) FILE="$ORIG_DIR/$FILE" ;;
16 esac
17- MEMBERS=`ar t $FILE`
18- ar x $FILE
19+ MEMBERS=`${AR} t $FILE`
20+ ${AR} x $FILE
21 for MEMBER in $MEMBERS ; do
22 NEWFILES="$NEWFILES $DIR/$MEMBER"
23 done
24@@ -77,7 +77,7 @@
25 make_ar_static_lib() {
26 OPTS=$1
27 shift;
28- RANLIB=$1
29+ USE_RANLIB=$1
30 shift;
31 LIBNAME=$1
32 shift;
33@@ -87,11 +87,11 @@
34 rm -f ${LIBNAME}
35
36 # make static lib
37- ar ${OPTS} ${LIBNAME} ${OBJECTS}
38+ ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
39
40 # run ranlib
41- if [ ${RANLIB} = 1 ] ; then
42- ranlib ${LIBNAME}
43+ if [ ${USE_RANLIB} = 1 ] ; then
44+ ${RANLIB} ${LIBNAME}
45 fi
46
47 echo ${LIBNAME}
48@@ -313,9 +313,9 @@
49 if [ "x$LINK" = "x" ] ; then
50 # -linker was not specified so set default link command now
51 if [ $CPLUSPLUS = 1 ] ; then
52- LINK=g++
53+ LINK=$CXX
54 else
55- LINK=gcc
56+ LINK=$CC
57 fi
58 fi
59
60@@ -531,9 +531,9 @@
61 if [ "x$LINK" = "x" ] ; then
62 # -linker was not specified so set default link command now
63 if [ $CPLUSPLUS = 1 ] ; then
64- LINK=g++
65+ LINK=${CXX}
66 else
67- LINK=gcc
68+ LINK=${CC}
69 fi
70 fi
71