[vlc-commits] contrib: qt4: fix build in 32-bit chroot with 64-bit kernel

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Nov 11 14:52:06 2011 -0500| [63d88de230b60fa296fc8b8d9474fa57ca75069d] | committer: Rafaël Carré

contrib: qt4: fix build in 32-bit chroot with 64-bit kernel

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=63d88de230b60fa296fc8b8d9474fa57ca75069d
---

 contrib/src/qt4/chroot.patch |   13 +++++++++++++
 contrib/src/qt4/rules.mak    |    1 +
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/contrib/src/qt4/chroot.patch b/contrib/src/qt4/chroot.patch
new file mode 100644
index 0000000..328874c
--- /dev/null
+++ b/contrib/src/qt4/chroot.patch
@@ -0,0 +1,13 @@
+Fix build when using a 32-bit chroot with a x86_64 kernel
+Native tools would be built with -m64
+--- qt-everywhere-opensource-src-4.7.4/configure.orig	2011-11-11 14:48:12.944666802 -0500
++++ qt-everywhere-opensource-src-4.7.4/configure	2011-11-11 14:48:55.108875882 -0500
+@@ -168,7 +168,7 @@
+ #-------------------------------------------------------------------------------
+ 
+ # need that throughout the script
+-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
++UNAME_MACHINE=`(gcc -dumpmachine|cut -d- -f1) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
diff --git a/contrib/src/qt4/rules.mak b/contrib/src/qt4/rules.mak
index c4fb073..64ff038 100644
--- a/contrib/src/qt4/rules.mak
+++ b/contrib/src/qt4/rules.mak
@@ -21,6 +21,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
 	$(UNPACK)
 	patch -p0 < $(SRC)/qt4/cross.patch
 	patch -p0 < $(SRC)/qt4/styles.patch
+	patch -p0 < $(SRC)/qt4/chroot.patch
 	patch -p0 < $(SRC)/qt4/imageformats.patch
 	mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@