qt: fix sysroot confusion in ./configure

qt's configure script is getting confused now that we're passing --sysroot=
in QMAKE_CC / QMAKE_CXX, causing misdetection of features and runtime
breakage.

Fix it by passing --sysroot in CFLAGS/CXXFLAGS instead.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index 5658b61bdf460138999896300cd245641a68dfa4..2d244bc6b324cffe264becc231d5dc0aebf61b38 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -16,7 +16,7 @@
        added.
 
        Updated/fixed packages: busybox, imagemagick, libglib2, lua,
-       luafilesystem, lzo, netcat, php, sysvinit, util-linux
+       luafilesystem, lzo, netcat, php, qt, sysvinit, util-linux
 
        Issues resolved (http://bugs.uclibc.org):
 

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index baf653991ddc74e575bfc7b9dbbbff1dc0de0662..eb1ef0ffe9591025315564c9ef556acf70ae718d 100644 (file)
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -483,16 +483,16 @@ ifneq ($(BR2_INET_IPV6),y)
        $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
 endif
        # Fix compiler path
-       $(call QT_QMAKE_SET,CC,$(TARGET_CC))
-       $(call QT_QMAKE_SET,CXX,$(TARGET_CXX))
+       $(call QT_QMAKE_SET,CC,$(filter-out --sysroot=%,$(TARGET_CC)))
+       $(call QT_QMAKE_SET,CXX,$(filter-out --sysroot=%,$(TARGET_CXX)))
        $(call QT_QMAKE_SET,LINK,$(TARGET_CXX))
        $(call QT_QMAKE_SET,LINK_SHLIB,$(TARGET_CXX))
        $(call QT_QMAKE_SET,AR,$(TARGET_AR) cqs)
        $(call QT_QMAKE_SET,OBJCOPY,$(TARGET_OBJCOPY))
        $(call QT_QMAKE_SET,RANLIB,$(TARGET_RANLIB))
        $(call QT_QMAKE_SET,STRIP,$(TARGET_STRIP))
-       $(call QT_QMAKE_SET,CFLAGS,$(TARGET_CFLAGS))
-       $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_CXXFLAGS))
+       $(call QT_QMAKE_SET,CFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CFLAGS))
+       $(call QT_QMAKE_SET,CXXFLAGS,$(TARGET_SYSROOT_OPT) $(TARGET_CXXFLAGS))
        $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS))
        -[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \
                $(QT_TARGET_DIR)/$(QT_QCONFIG_FILE_LOCATION)