[1/1] mesa: fix cross compile failure

Submitted by Kang Kai on Nov. 16, 2011, 6:09 a.m.

Details

Message ID c7dca7b45c59a9fddbd9551cac5426906a1036c2.1321421127.git.kai.kang@windriver.com
State Accepted
Commit 0a815e889d056f44af1ada623b4b2edcb699693a
Headers show

Commit Message

Kang Kai Nov. 16, 2011, 6:09 a.m.
the bin/mklib file in mesa source code uses commands "ar ranlib" on build
machine, this causes build failed on some platform.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/recipes-graphics/mesa/mesa-7.11.inc           |    1 +
 meta/recipes-graphics/mesa/mesa-common.inc         |    2 +-
 .../mesa/mesa/crossfix-mklib.patch                 |   71 ++++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/mesa/mesa-7.11.inc b/meta/recipes-graphics/mesa/mesa-7.11.inc
index 746b764..2f14ed4 100644
--- a/meta/recipes-graphics/mesa/mesa-7.11.inc
+++ b/meta/recipes-graphics/mesa/mesa-7.11.inc
@@ -2,6 +2,7 @@  DEPENDS += "mesa-dri-glsl-native"
 
 SRC_URI += "file://uclibc.patch \
             file://crossfix.patch \
+            file://crossfix-mklib.patch \
            "
 SRC_URI[md5sum] = "ff03aca82d0560009a076a87c888cf13"
 SRC_URI[sha256sum] = "f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf"
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 06ebb75..1d9c894 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@  SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
-INC_PR = "r12"
+INC_PR = "r13"
 PE = "2"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
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 0000000..dc08228
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa/crossfix-mklib.patch
@@ -0,0 +1,71 @@ 
+This patch is ported from WindRiver linux and to fix cross compile failure.
+
+And original commits are:
+commit 8d5ccc8113e1b51b0529a00c18a4aba956247e1b
+commit 5c4212084b871a0c0fb7d174280ec9a634637deb
+
+Upstream-Status: Pending
+
+Signed-off-by: Kang Kai <kai.kang@windriver.com>
+
+--- Mesa-7.10.2/bin/mklib.orig	2011-09-28 16:15:34.170000074 +0800
++++ Mesa-7.10.2/bin/mklib	2011-09-28 16:15:42.370000073 +0800
+@@ -49,8 +49,8 @@
+                     /*) ;;
+                     *)  FILE="$ORIG_DIR/$FILE" ;;
+                 esac
+-                MEMBERS=`ar t $FILE`
+-                ar x $FILE
++                MEMBERS=`${AR} t $FILE`
++                ${AR} x $FILE
+                 for MEMBER in $MEMBERS ; do
+                     NEWFILES="$NEWFILES $DIR/$MEMBER"
+                 done
+@@ -77,7 +77,7 @@
+ make_ar_static_lib() {
+     OPTS=$1
+     shift;
+-    RANLIB=$1
++    USE_RANLIB=$1
+     shift;
+     LIBNAME=$1
+     shift;
+@@ -87,11 +87,11 @@
+     rm -f ${LIBNAME}
+ 
+     # make static lib
+-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
++    ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
+ 
+     # run ranlib
+-    if [ ${RANLIB} = 1 ] ; then
+-        ranlib ${LIBNAME}
++    if [ ${USE_RANLIB} = 1 ] ; then
++        ${RANLIB} ${LIBNAME}
+     fi
+ 
+     echo ${LIBNAME}
+@@ -313,9 +313,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+ 
+@@ -531,9 +531,9 @@
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=${CXX}
+             else
+-                LINK=gcc
++                LINK=${CC}
+             fi
+ 	fi
+ 

Comments

Henning Heinold Nov. 16, 2011, 8:58 a.m.
On Wed, Nov 16, 2011 at 02:09:03PM +0800, Kang Kai wrote:
> the bin/mklib file in mesa source code uses commands "ar ranlib" on build
> machine, this causes build failed on some platform.
 

Hi,

you added CC and CXX variables for linking too, shouldn't that mentioned in the
commit msg too?

Bye Henning
Kang Kai Nov. 18, 2011, 5:41 a.m.
On 2011?11?16? 16:58, Henning Heinold wrote:
> On Wed, Nov 16, 2011 at 02:09:03PM +0800, Kang Kai wrote:
>> the bin/mklib file in mesa source code uses commands "ar ranlib" on build
>> machine, this causes build failed on some platform.

Hi Bye,
>
>
> Hi,
>
> you added CC and CXX variables for linking too, shouldn't that mentioned in the
> commit msg too?

Fine, I'll add this msg

Thanks,
Kai