From b923fdffdd77bccef2822748a2adcb9a04a1f1fa Mon Sep 17 00:00:00 2001 From: Thomas De Schampheleire Date: Wed, 19 Mar 2014 20:30:06 +0100 Subject: qt5 packages: set correct PATH when running qmake The qmake step of qt5 packages may attempt to run pkg-config. If qmake is executed in an environment where the buildroot host directory is not in PATH, pkg-config from the build machine may be used (/usr/bin/pkg-config). This causes qt5 package compilation to fail on machines that do not have pkg-config installed. Refer to mailing list thread [1] for a specific error case. This patch prepends TARGET_MAKE_ENV (which sets PATH) to the qmake call. Reported-by: Marco Trapanese Signed-off-by: Thomas De Schampheleire [1] http://lists.busybox.net/pipermail/buildroot/2014-March/092283.html Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- package/qt5/qt5script/qt5script.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/qt5/qt5script/qt5script.mk') diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk index e62e0ac46d..a80995c54a 100644 --- a/package/qt5/qt5script/qt5script.mk +++ b/package/qt5/qt5script/qt5script.mk @@ -19,7 +19,7 @@ QT5SCRIPT_REDISTRIBUTE = NO endif define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(HOST_DIR)/usr/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) endef define QT5SCRIPT_BUILD_CMDS -- cgit v1.2.3