Commit bb2d9033 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

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.
parent 3d098dd6
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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) \