Commit 10efac17 authored by Michael Roth's avatar Michael Roth Committed by Peter Korsgaard
Browse files

qt: enable proper re-configure 



The Qt configure script doesn't use config.cache but the
generated Makefile provides a confclean target to properly
clean out old configuration.

Signed-off-by: default avatarMichael Roth <mroth@nessie.de>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 42325834

package/qt/qt.mk

+2 −1
Original line number Diff line number Diff line
@@ -426,6 +426,7 @@ $(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE) 
	touch $@



$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked

	-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean

ifneq ($(BR2_INET_IPV6),y)

	$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure

	$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
@@ -450,7 +451,7 @@ endif 
# when cross compiling, Qt 4.4.3 is wrong here.

# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target

# instead of the host then.

	(cd $(QT_TARGET_DIR); rm -rf config.cache; \

	(cd $(QT_TARGET_DIR); \

		PATH=$(TARGET_PATH) \

		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \

		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \