From bb2d903355505cab2db551472c6fb130dcf9fb83 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 28 Oct 2008 09:40:25 +0000 Subject: qtopia4: fix use of pkg-config When cross compiling, Qt sets PKG_CONFIG in its own configure script to an empty string. That leads to not using pkg-config. To avoid that, use the configure option -force-pkg-config. Also set environment variables for pkg-config defined in TARGET_CONFIGURE_OPTS. Patch by Markus Heidelberg. See http://buildroot.uclibc.org/lists/buildroot/2008-October/011324.html for more details. --- package/qtopia4/qtopia4.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package') diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index c959d4001..360b9492e 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -253,10 +253,15 @@ endif -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \ $(QTOPIA4_TARGET_DIR)/$(QTOPIA4_QCONFIG_FILE_LOCATION) +# Qt doesn't use PKG_CONFIG, it searches for pkg-config with 'which'. +# PKG_CONFIG_SYSROOT is only used to avoid a warning from Qt's configure system +# when cross compiling, Qt 4.4.3 is wrong here. (cd $(QTOPIA4_TARGET_DIR); rm -rf config.cache; \ - PATH=$(TARGET_PATH) \ + $(TARGET_CONFIGURE_OPTS) \ + PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \ ./configure \ -verbose \ + -force-pkg-config \ -embedded $(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM) \ $(QTOPIA4_QCONFIG_COMMAND) \ $(QTOPIA4_CONFIGURE) \ -- cgit v1.2.3