Commit 63d88de2 authored by Rafaël Carré's avatar Rafaël Carré

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

parent 673d6562
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
...@@ -21,6 +21,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4 ...@@ -21,6 +21,7 @@ qt4: qt-$(QT4_VERSION).tar.gz .sum-qt4
$(UNPACK) $(UNPACK)
patch -p0 < $(SRC)/qt4/cross.patch patch -p0 < $(SRC)/qt4/cross.patch
patch -p0 < $(SRC)/qt4/styles.patch patch -p0 < $(SRC)/qt4/styles.patch
patch -p0 < $(SRC)/qt4/chroot.patch
patch -p0 < $(SRC)/qt4/imageformats.patch patch -p0 < $(SRC)/qt4/imageformats.patch
mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@ mv qt-everywhere-opensource-src-4.7.4 $@ && touch $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment