diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch | 71 |
1 files changed, 71 insertions, 0 deletions
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 @@ | |||
1 | This patch is ported from WindRiver linux and to fix cross compile failure. | ||
2 | |||
3 | And original commits are: | ||
4 | commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b | ||
5 | commit 5c4212084b871a0c0fb7d174280ec9a634637deb | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-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 | |||