diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-26 17:47:43 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-08-26 17:47:43 +0200 |
| commit | 0b415edef35094310aa89dcfc7f694f1c07dea14 (patch) | |
| tree | 76a54b50ba60219de9a31b517ed61e272a64857a | |
| parent | b680672ad1b1c45e23cf89ddb217616274d68dee (diff) | |
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>
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | package/qt/qt.mk | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -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 baf653991..eb1ef0ffe 100644 --- 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) |