diff options
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch new file mode 100644 index 0000000000..dc8e9948a3 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch | |||
@@ -0,0 +1,94 @@ | |||
1 | cross compile | ||
2 | |||
3 | This patch is ported from WindRiver linux and to fix cross compile | ||
4 | failure. | ||
5 | |||
6 | And original commits are: | ||
7 | commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b | ||
8 | commit 5c4212084b871a0c0fb7d174280ec9a634637deb | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Kang Kai <kai.kang@windriver.com> | ||
13 | --- | ||
14 | bin/mklib | 24 ++++++++++++------------ | ||
15 | 1 file changed, 12 insertions(+), 12 deletions(-) | ||
16 | |||
17 | diff --git a/bin/mklib b/bin/mklib | ||
18 | index 9bac29e..b33aa90 100755 | ||
19 | --- a/bin/mklib | ||
20 | +++ b/bin/mklib | ||
21 | @@ -49,8 +49,8 @@ expand_archives() { | ||
22 | /*) ;; | ||
23 | *) FILE="$ORIG_DIR/$FILE" ;; | ||
24 | esac | ||
25 | - MEMBERS=`ar t $FILE` | ||
26 | - ar x $FILE | ||
27 | + MEMBERS=`${AR} t $FILE` | ||
28 | + ${AR} x $FILE | ||
29 | for MEMBER in $MEMBERS ; do | ||
30 | NEWFILES="$NEWFILES $DIR/$MEMBER" | ||
31 | done | ||
32 | @@ -77,7 +77,7 @@ expand_archives() { | ||
33 | make_ar_static_lib() { | ||
34 | OPTS=$1 | ||
35 | shift; | ||
36 | - RANLIB=$1 | ||
37 | + USE_RANLIB=$1 | ||
38 | shift; | ||
39 | LIBNAME=$1 | ||
40 | shift; | ||
41 | @@ -87,11 +87,11 @@ make_ar_static_lib() { | ||
42 | rm -f ${LIBNAME} | ||
43 | |||
44 | # make static lib | ||
45 | - ar ${OPTS} ${LIBNAME} ${OBJECTS} | ||
46 | + ${AR} ${OPTS} ${LIBNAME} ${OBJECTS} | ||
47 | |||
48 | # run ranlib | ||
49 | - if [ ${RANLIB} = 1 ] ; then | ||
50 | - ranlib ${LIBNAME} | ||
51 | + if [ ${USE_RANLIB} = 1 ] ; then | ||
52 | + ${RANLIB} ${LIBNAME} | ||
53 | fi | ||
54 | |||
55 | echo ${LIBNAME} | ||
56 | @@ -313,9 +313,9 @@ case $ARCH in | ||
57 | if [ "x$LINK" = "x" ] ; then | ||
58 | # -linker was not specified so set default link command now | ||
59 | if [ $CPLUSPLUS = 1 ] ; then | ||
60 | - LINK=g++ | ||
61 | + LINK=$CXX | ||
62 | else | ||
63 | - LINK=gcc | ||
64 | + LINK=$CC | ||
65 | fi | ||
66 | fi | ||
67 | |||
68 | @@ -535,9 +535,9 @@ case $ARCH in | ||
69 | if [ "x$LINK" = "x" ] ; then | ||
70 | # -linker was not specified so set default link command now | ||
71 | if [ $CPLUSPLUS = 1 ] ; then | ||
72 | - LINK=g++ | ||
73 | + LINK=$CXX | ||
74 | else | ||
75 | - LINK=gcc | ||
76 | + LINK=$CC | ||
77 | fi | ||
78 | fi | ||
79 | |||
80 | @@ -903,9 +903,9 @@ case $ARCH in | ||
81 | if [ "x$LINK" = "x" ] ; then | ||
82 | # -linker was not specified so set default link command now | ||
83 | if [ $CPLUSPLUS = 1 ] ; then | ||
84 | - LINK=g++ | ||
85 | + LINK=${CXX} | ||
86 | else | ||
87 | - LINK=gcc | ||
88 | + LINK=${CC} | ||
89 | fi | ||
90 | fi | ||
91 | |||
92 | -- | ||
93 | 1.7.10.4 | ||
94 | |||