From patchwork Sat Dec 29 01:45:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Stefan_Fr=C3=B6berg?= X-Patchwork-Id: 208610 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 6FF712C00B9 for ; Sat, 29 Dec 2012 12:59:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E282782030; Sat, 29 Dec 2012 01:59:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ziTewdveYV56; Sat, 29 Dec 2012 01:59:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 431168A9A7; Sat, 29 Dec 2012 01:59:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 471C08F74B for ; Sat, 29 Dec 2012 01:59:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6762881687 for ; Sat, 29 Dec 2012 01:59:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id voXQyYIl8gpq for ; Sat, 29 Dec 2012 01:59:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.petroprogram.com (mail.petroprogram.com [194.89.34.74]) by whitealder.osuosl.org (Postfix) with ESMTPS id E71DA80559 for ; Sat, 29 Dec 2012 01:59:19 +0000 (UTC) Received: from localhost.fi (unknown [194.89.34.74]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: stefan.froberg@petroprogram.com) by mail.petroprogram.com (Postfix) with ESMTPSA id BEE2B4FAE2; Sat, 29 Dec 2012 03:49:57 +0200 (EET) From: =?UTF-8?q?Stefan=20Fr=C3=B6berg?= To: buildroot@busybox.net Date: Sat, 29 Dec 2012 03:45:51 +0200 Message-Id: <1356745553-15362-4-git-send-email-stefan.froberg@petroprogram.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1356745553-15362-1-git-send-email-stefan.froberg@petroprogram.com> References: <1356745553-15362-1-git-send-email-stefan.froberg@petroprogram.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 3/5] mesa3d: bumped to 8.0.5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Cross-compile patch URL: http://git.openembedded.org/openembedded-core/plain/meta/recipes-graphics/mesa/mesa/0002-cross-compile.patch Signed-off-by: Stefan Fröberg --- .../x11r7/mesa3d/mesa3d-0002-cross-compile.patch | 94 ++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) create mode 100644 package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch diff --git a/package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch b/package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch new file mode 100644 index 0000000..dc8e994 --- /dev/null +++ b/package/x11r7/mesa3d/mesa3d-0002-cross-compile.patch @@ -0,0 +1,94 @@ +cross compile + +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 +--- + bin/mklib | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/bin/mklib b/bin/mklib +index 9bac29e..b33aa90 100755 +--- a/bin/mklib ++++ b/bin/mklib +@@ -49,8 +49,8 @@ expand_archives() { + /*) ;; + *) 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 @@ expand_archives() { + make_ar_static_lib() { + OPTS=$1 + shift; +- RANLIB=$1 ++ USE_RANLIB=$1 + shift; + LIBNAME=$1 + shift; +@@ -87,11 +87,11 @@ make_ar_static_lib() { + 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 @@ case $ARCH in + 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 + +@@ -535,9 +535,9 @@ case $ARCH in + 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 + +@@ -903,9 +903,9 @@ case $ARCH in + 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 + +-- +1.7.10.4 +