gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qt: remove no longer needed 'x86x86fix' workaround

Browse Source 
Tested with 4.5.2.

Signed-off-by: Michael Roth <mroth@nessie.de>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Michael Roth 2009-10-07 11:20:31 +02:00 committed by Peter Korsgaard
parent 1cd28840db
commit 03bdf67f43
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/qt/qt.mk
View File

@ -17,10 +17,6 @@
# (cd /usr/include; sudo ln -s dbus-1.0/dbus dbus)
# to fix
# BUG: There is a workaround below (search for x86x86fix) for
# x86 crosscompiling under linux x86. Please remove it when the workaround
# is no longer necessary.
QT_VERSION:=4.5.2
QT_CAT:=$(BZCAT)
@ -329,17 +325,6 @@ endif
QT_CONFIGURE:=$(call qstrip,$(QT_CONFIGURE))
BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
# x86x86fix
# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
# host. It's unclear if this would happen on other hosts.
ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
ifeq ($(BR2_PACKAGE_QT_EMB_PLATFORM),x86)
QT_CONFIGURE+= -platform linux-g++
QT_CONFIGURE:=$(call qstrip,$(QT_CONFIGURE))
endif
endif
# End of workaround.
# Figure out what libs to install in the target
QT_LIBS=#empty
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)