This project is archived. Its data is read-only.

Commit b923fdff authored Mar 19, 2014 by Thomas De Schampheleire Committed by Peter Korsgaard Mar 26, 2014

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 <marcotrapanese@gmail.com>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

[1] http://lists.busybox.net/pipermail/buildroot/2014-March/092283.html


Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 205839d0

package/qt5/qt5connectivity/qt5connectivity.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ QT5CONNECTIVITY_DEPENDENCIES += qt5declarative
		endif

		define QT5CONNECTIVITY_CONFIGURE_CMDS
		(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
		(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
		endef

		define QT5CONNECTIVITY_BUILD_CMDS

package/qt5/qt5declarative/qt5declarative.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ QT5DECLARATIVE_REDISTRIBUTE = NO
		endif

		define QT5DECLARATIVE_CONFIGURE_CMDS
		(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
		(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
		endef

		define QT5DECLARATIVE_BUILD_CMDS

package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO
		endif

		define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS
		(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
		(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
		endef

		define QT5GRAPHICALEFFECTS_BUILD_CMDS

package/qt5/qt5imageformats/qt5imageformats.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ QT5IMAGEFORMATS_REDISTRIBUTE = NO
		endif

		define QT5IMAGEFORMATS_CONFIGURE_CMDS
		(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
		(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
		endef

		define QT5IMAGEFORMATS_BUILD_CMDS

package/qt5/qt5multimedia/qt5multimedia.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ QT5MULTIMEDIA_DEPENDENCIES += gst-plugins-base
		endif

		define QT5MULTIMEDIA_CONFIGURE_CMDS
		(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
		(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
		endef

		define QT5MULTIMEDIA_BUILD_CMDS