diff options
| author | Michael Roth <mroth@nessie.de> | 2009-10-07 11:20:30 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-10-09 14:38:04 +0200 |
| commit | 1cd28840db4b7b05bc338f4a8c0584fc13ed8715 (patch) | |
| tree | 4b16f0327a1a51370c4cb5c8c29d79bec1bb5ee7 /package | |
| parent | ad1a8a156aaab584387d5cbfb27c20f21be32a54 (diff) | |
qt: remove PKG_CONFIG workaround
At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG.
So the PATH workaround is no longer needed.
Signed-off-by: Michael Roth <mroth@nessie.de>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/qt/qt.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 09a027df2..77e7f1a3b 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -444,16 +444,12 @@ endif $(call QT_QMAKE_SET,LFLAGS,$(TARGET_LDFLAGS)) -[ -f $(QT_QCONFIG_FILE) ] && cp $(QT_QCONFIG_FILE) \ $(QT_TARGET_DIR)/$(QT_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. # Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target -# instead of the host then. +# instead of the host then. So set PKG_CONFIG* manually. (cd $(QT_TARGET_DIR); \ - PATH=$(TARGET_PATH) \ PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ + PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ - PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \ ./configure \ $(if $(VERBOSE),-verbose,-silent) \ -force-pkg-config \ |