mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

mesa-dri, mesa-xlib: fix compilation with x32 toolchain

Browse Source 
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>
This commit is contained in:
Nitin A Kamble
2011-12-02 12:20:03 -08:00
committed by Richard Purdie
parent 13d011204a
commit a41df69a11
6 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-graphics/mesa/mesa-7.11.inc
View File

@@ -1,9 +1,14 @@
DEPENDS += "mesa-dri-glsl-native"
SRC_URI += "file://uclibc.patch \
file://crossfix.patch \
file://crossfix-mklib.patch \
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://uclibc.patch \
file://crossfix.patch \
file://crossfix-mklib.patch \
file://mesa_fix_for_x32.patch \
"
S = "${WORKDIR}/Mesa-${PV}"
SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"

2
meta/recipes-graphics/mesa/mesa-common.inc
View File

@@ -15,8 +15,6 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1
INC_PR = "r13"
PE = "2"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
S = "${WORKDIR}/Mesa-${PV}"
PROTO_DEPS = "xf86driproto glproto"
LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"

2
meta/recipes-graphics/mesa/mesa-dri_7.11.bb
View File

@@ -1,4 +1,4 @@
include mesa-common.inc
include mesa-${PV}.inc
include mesa-dri.inc
PR = "${INC_PR}.0"
PR = "${INC_PR}.1"

6
meta/recipes-graphics/mesa/mesa-git.inc
View File

@@ -6,9 +6,9 @@ PV = "7.11+gitr${SRCPV}"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
FILESEXTRAPATHS_prepend := "${THISDIR}/mesa-git:"
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
SRC_URI += "file://uclibc.patch \
file://crossfix.patch \
SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
file://uclibc.patch \
file://crossfix.patch \
"
S = "${WORKDIR}/git"

2
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
View File

@@ -1,5 +1,5 @@
include mesa-common.inc
include mesa-${PV}.inc
include mesa-xlib.inc
PR = "${INC_PR}.1"
PR = "${INC_PR}.2"

24
meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch Normal file
View File

@@ -0,0 +1,24 @@
UpstreamStatus: Pending
get correct compiler options for x32 gcc.
Received this patch from H.J. Lu <hjl.tools@gmail.com>
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
--- Mesa-7.11/bin/mklib.x32 2011-11-30 14:29:14.976465283 -0800
+++ Mesa-7.11/bin/mklib 2011-11-30 14:32:48.591525193 -0800
@@ -335,7 +335,12 @@ case $ARCH in
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
+ ABIX32=`file $1 | grep x86-64`
+ if [ "${ABI32}" ]; then
+ OPTS="-mx32 ${OPTS}"
+ else
+ OPTS="-m32 ${OPTS}"
+ fi
fi
if [ "${ALTOPTS}" ] ; then