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

qt: fix sysroot confusion in ./configure

Browse Source 
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>
This commit is contained in:
Peter Korsgaard 2010-08-26 17:47:43 +02:00
parent b680672ad1
commit 0b415edef3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -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):

8
package/qt/qt.mk
View File

@ -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)