From c5084487eb7526323684e5389d28352c5787ebd2 Mon Sep 17 00:00:00 2001 From: Damien Lespiau Date: Thu, 2 Aug 2012 17:49:00 +0100 Subject: mesa: Update to 8.0.4 (latest stable version) - The license file has changed, but the project still has the same license - Patches have been rebased on top of the 8.0 branch. crossfix.patch and crossfix-mklib.patch have been merged as they address the same problem (From OE-Core rev: e4039eb74b20e96d4b8837cd58cf2d13d091e1ad) Signed-off-by: Damien Lespiau Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../mesa/mesa/0003-fix-for-x32.patch | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch (limited to 'meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch') diff --git a/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch new file mode 100644 index 0000000000..2d6a150e42 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch @@ -0,0 +1,50 @@ +Upstream-Status: Pending + +Using uname like this when cross compiling is a really bad idea. We +provide the correct linker flags, lets just assume we can get this +right ourselves. + +RP 2012/04/26 +--- + bin/mklib | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/bin/mklib b/bin/mklib +index b33aa90..16cb017 100755 +--- a/bin/mklib ++++ b/bin/mklib +@@ -330,15 +330,7 @@ case $ARCH in + ;; + esac + +- # Check if objects are 32-bit and we're running in 64-bit +- # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- ARM=`file $1 | grep ARM` +- # Do not add "-m32" option for arm. +- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -389,15 +381,7 @@ case $ARCH in + # exptmp is removed below + fi + +- # Check if objects are 32-bit and we're running in 64-bit +- # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- ARM=`file $1 | grep ARM` +- # Do not add "-m32" option for arm. +- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi +-- +1.7.10.4 + -- cgit v1.2.3-54-g00ecf