Jelajahi Sumber

qt: update x86x86fix for 32bit pc hosts

The recent change to use config.guess to figure out GNU_HOST_NAME
broken the x86x86fix detection for 32bit hosts, as config.guess
returns something like i686-pc-linux-gnu rather than something with
*-unknown-linux-* like we used to use.

Fix it by simply looking for "linux" instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard 15 tahun lalu
induk
melakukan
bb81787ae1
2 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 1 1
      CHANGES
  2. 1 1
      package/qt/qt.mk

+ 1 - 1
CHANGES

@@ -2,7 +2,7 @@
 
 	Fixes all over the tree.
 
-	Updated/fixed packages: aumix, avahi, busybox, mtd-utils, ntp
+	Updated/fixed packages: aumix, avahi, busybox, mtd-utils, ntp, qt
 
 	Issues resolved (http://bugs.uclibc.org):
 

+ 1 - 1
package/qt/qt.mk

@@ -372,7 +372,7 @@ 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 unknown-linux,$(GNU_HOST_NAME)),)
+ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
 ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
 QT_CONFIGURE+= -platform linux-g++
 endif