diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2012-08-02 17:49:00 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-06 15:18:52 +0100 |
commit | c5084487eb7526323684e5389d28352c5787ebd2 (patch) | |
tree | 4b05a4ce6ae7425c469bf2edfe6f183921d25323 /meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch | |
parent | abfa907b4c4e682be63b82a14d5f0855d137e3c5 (diff) | |
download | poky-c5084487eb7526323684e5389d28352c5787ebd2.tar.gz |
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 <damien.lespiau@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch | 50 |
1 files changed, 50 insertions, 0 deletions
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 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Using uname like this when cross compiling is a really bad idea. We | ||
4 | provide the correct linker flags, lets just assume we can get this | ||
5 | right ourselves. | ||
6 | |||
7 | RP 2012/04/26 | ||
8 | --- | ||
9 | bin/mklib | 16 ---------------- | ||
10 | 1 file changed, 16 deletions(-) | ||
11 | |||
12 | diff --git a/bin/mklib b/bin/mklib | ||
13 | index b33aa90..16cb017 100755 | ||
14 | --- a/bin/mklib | ||
15 | +++ b/bin/mklib | ||
16 | @@ -330,15 +330,7 @@ case $ARCH in | ||
17 | ;; | ||
18 | esac | ||
19 | |||
20 | - # Check if objects are 32-bit and we're running in 64-bit | ||
21 | - # environment. If so, pass -m32 flag to linker. | ||
22 | set ${OBJECTS} | ||
23 | - ABI32=`file $1 | grep 32-bit` | ||
24 | - ARM=`file $1 | grep ARM` | ||
25 | - # Do not add "-m32" option for arm. | ||
26 | - if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then | ||
27 | - OPTS="-m32 ${OPTS}" | ||
28 | - fi | ||
29 | |||
30 | if [ "${ALTOPTS}" ] ; then | ||
31 | OPTS=${ALTOPTS} | ||
32 | @@ -389,15 +381,7 @@ case $ARCH in | ||
33 | # exptmp is removed below | ||
34 | fi | ||
35 | |||
36 | - # Check if objects are 32-bit and we're running in 64-bit | ||
37 | - # environment. If so, pass -m32 flag to linker. | ||
38 | set ${OBJECTS} | ||
39 | - ABI32=`file $1 | grep 32-bit` | ||
40 | - ARM=`file $1 | grep ARM` | ||
41 | - # Do not add "-m32" option for arm. | ||
42 | - if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then | ||
43 | - OPTS="-m32 ${OPTS}" | ||
44 | - fi | ||
45 | if [ "${ALTOPTS}" ] ; then | ||
46 | OPTS=${ALTOPTS} | ||
47 | fi | ||
48 | -- | ||
49 | 1.7.10.4 | ||
50 | |||