From: "Stefan Fröberg" <stefan.froberg@petroprogram.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 4/5] mesa3d: bumped to 8.0.5
Date: Sat, 29 Dec 2012 03:45:52 +0200 [thread overview]
Message-ID: <1356745553-15362-5-git-send-email-stefan.froberg@petroprogram.com> (raw)
In-Reply-To: <1356745553-15362-1-git-send-email-stefan.froberg@petroprogram.com>
Additional cross-compiling fixes
URL: http://git.openembedded.org/openembedded-core/plain/meta/recipes-graphics/mesa/mesa/0003-fix-for-x32.patch
Signed-off-by: Stefan Fr?berg <stefan.froberg@petroprogram.com>
---
package/x11r7/mesa3d/mesa3d-0003-fix-for-x32.patch | 50 ++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
create mode 100644 package/x11r7/mesa3d/mesa3d-0003-fix-for-x32.patch
diff --git a/package/x11r7/mesa3d/mesa3d-0003-fix-for-x32.patch b/package/x11r7/mesa3d/mesa3d-0003-fix-for-x32.patch
new file mode 100644
index 0000000..2d6a150
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-0003-fix-for-x32.patch
@@ -0,0 +1,50 @@
+Upstream-Status: Pending
+
+Using uname like this when cross compiling is a really bad idea. We
+provide the correct linker flags, lets just assume we can get this
+right ourselves.
+
+RP 2012/04/26
+---
+ bin/mklib | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/bin/mklib b/bin/mklib
+index b33aa90..16cb017 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -330,15 +330,7 @@ case $ARCH in
+ ;;
+ esac
+
+- # Check if objects are 32-bit and we're running in 64-bit
+- # environment. If so, pass -m32 flag to linker.
+ set ${OBJECTS}
+- ABI32=`file $1 | grep 32-bit`
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- OPTS="-m32 ${OPTS}"
+- fi
+
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
+@@ -389,15 +381,7 @@ case $ARCH in
+ # exptmp is removed below
+ fi
+
+- # Check if objects are 32-bit and we're running in 64-bit
+- # environment. If so, pass -m32 flag to linker.
+ set ${OBJECTS}
+- ABI32=`file $1 | grep 32-bit`
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- OPTS="-m32 ${OPTS}"
+- fi
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
+ fi
+--
+1.7.10.4
+
--
1.7.7.6
next prev parent reply other threads:[~2012-12-29 1:45 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-29 1:45 [Buildroot] (no subject) Stefan Fröberg
2012-12-29 1:45 ` [Buildroot] [PATCH 1/5] mesa3d: bumped to 8.0.5 Stefan Fröberg
2012-12-29 8:06 ` Thomas Petazzoni
2012-12-29 13:06 ` Stefan Fröberg
2012-12-29 1:45 ` [Buildroot] [PATCH 2/5] " Stefan Fröberg
2012-12-29 8:07 ` Thomas Petazzoni
2012-12-29 1:45 ` [Buildroot] [PATCH 3/5] " Stefan Fröberg
2012-12-29 8:08 ` Thomas Petazzoni
2012-12-29 1:45 ` Stefan Fröberg [this message]
2012-12-29 1:45 ` [Buildroot] [PATCH 5/5] " Stefan Fröberg
2012-12-29 8:08 ` Thomas Petazzoni
2012-12-29 7:59 ` [Buildroot] (no subject) Thomas Petazzoni
2012-12-29 14:13 ` Stefan Fröberg
2012-12-29 14:32 ` Thomas Petazzoni
2012-12-29 14:56 ` Stefan Fröberg
2012-12-29 15:23 ` [Buildroot] (no subject) git format-patch Carsten Schoenert
2012-12-29 15:31 ` Stefan Fröberg
2012-12-29 16:15 ` [Buildroot] Generating patches against packages source code Thomas Petazzoni
2012-12-29 16:54 ` Stefan Fröberg
2012-12-29 17:09 ` Richard Braun
2012-12-29 17:13 ` Thomas Petazzoni
2012-12-29 17:33 ` Richard Braun
2012-12-29 18:03 ` Yann E. MORIN
2012-12-29 18:39 ` Thomas Petazzoni
2012-12-29 19:04 ` Stefan Fröberg
2012-12-29 19:56 ` Yann E. MORIN
2012-12-29 20:18 ` Stefan Fröberg
2012-12-29 19:52 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1356745553-15362-5-git-send-email-stefan.froberg@petroprogram.com \
--to=stefan.froberg@petroprogram.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.