summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-02 12:20:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 22:47:07 +0000
commita41df69a11a27ab67c0c6df08546f66ec3d83da6 (patch)
tree53aafb5376308d192991c56fb0d510dd2ba926cf /meta
parent13d011204a8711d3342b23a4c2a94307af84aeb9 (diff)
downloadpoky-a41df69a11a27ab67c0c6df08546f66ec3d83da6.tar.gz
mesa-dri, mesa-xlib: fix compilation with x32 toolchain
Add support for building with x32 toolchain. Simplified the use of SRC_URI & S vars across multiple files. (From OE-Core rev: 145de26a7415357a08bcdbc0307b5a60e2ad1420) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/mesa/mesa-7.11.inc11
-rw-r--r--meta/recipes-graphics/mesa/mesa-common.inc2
-rw-r--r--meta/recipes-graphics/mesa/mesa-dri_7.11.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa-git.inc6
-rw-r--r--meta/recipes-graphics/mesa/mesa-xlib_7.11.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch24
6 files changed, 37 insertions, 10 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
index 2f14ed4f2b..7c4a6904d9 100644
--- a/meta/recipes-graphics/mesa/mesa-7.11.inc
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -1,9 +1,14 @@
1DEPENDS += "mesa-dri-glsl-native" 1DEPENDS += "mesa-dri-glsl-native"
2 2
3SRC_URI += "file://uclibc.patch \ 3
4 file://crossfix.patch \ 4SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
5 file://crossfix-mklib.patch \ 5 file://uclibc.patch \
6 file://crossfix.patch \
7 file://crossfix-mklib.patch \
8 file://mesa_fix_for_x32.patch \
6 " 9 "
10S = "${WORKDIR}/Mesa-${PV}"
11
7SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13" 12SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
8SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf" 13SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
9 14
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index df035e6e27..59e8e6480d 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1
15INC_PR = "r13" 15INC_PR = "r13"
16PE = "2" 16PE = "2"
17 17
18SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
19S = "${WORKDIR}/Mesa-${PV}"
20 18
21PROTO_DEPS = "xf86driproto glproto" 19PROTO_DEPS = "xf86driproto glproto"
22LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native" 20LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
index 5d25127fcf..219e55517c 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.11.bb
@@ -1,4 +1,4 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-${PV}.inc 2include mesa-${PV}.inc
3include mesa-dri.inc 3include mesa-dri.inc
4PR = "${INC_PR}.0" 4PR = "${INC_PR}.1"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc b/meta/recipes-graphics/mesa/mesa-git.inc
index 594d9b8adb..1b4c0a69b4 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -6,9 +6,9 @@ PV = "7.11+gitr${SRCPV}"
6LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67" 6LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
7FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:" 7FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
8 8
9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git" 9SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
10SRC_URI += "file://uclibc.patch \ 10 file://uclibc.patch \
11 file://crossfix.patch \ 11 file://crossfix.patch \
12 " 12 "
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
index 7912287fe0..7547b22cc7 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
@@ -1,5 +1,5 @@
1include mesa-common.inc 1include mesa-common.inc
2include mesa-${PV}.inc 2include mesa-${PV}.inc
3include mesa-xlib.inc 3include mesa-xlib.inc
4PR = "${INC_PR}.1" 4PR = "${INC_PR}.2"
5 5
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
new file mode 100644
index 0000000000..22a2339ad9
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
@@ -0,0 +1,24 @@
1UpstreamStatus: Pending
2
3get correct compiler options for x32 gcc.
4
5Received this patch from H.J. Lu <hjl.tools@gmail.com>
6
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
8
9--- Mesa-7.11/bin/mklib.x32 2011-11-30 14:29:14.976465283 -0800
10+++ Mesa-7.11/bin/mklib 2011-11-30 14:32:48.591525193 -0800
11@@ -335,7 +335,12 @@ case $ARCH in
12 set ${OBJECTS}
13 ABI32=`file $1 | grep 32-bit`
14 if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
15- OPTS="-m32 ${OPTS}"
16+ ABIX32=`file $1 | grep x86-64`
17+ if [ "${ABI32}" ]; then
18+ OPTS="-mx32 ${OPTS}"
19+ else
20+ OPTS="-m32 ${OPTS}"
21+ fi
22 fi
23
24 if [ "${ALTOPTS}" ] ; then