gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Thomas De Schampheleire 2014-03-19 20:30:06 +01:00 committed by Peter Korsgaard
parent 205839d085
commit b923fdffdd
13 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/qt5/qt5connectivity/qt5connectivity.mk
View File

@ -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

2
package/qt5/qt5declarative/qt5declarative.mk
View File

@ -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

2
package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
View File

@ -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

2
package/qt5/qt5imageformats/qt5imageformats.mk
View File

@ -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

2
package/qt5/qt5multimedia/qt5multimedia.mk
View File

@ -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

2
package/qt5/qt5quick1/qt5quick1.mk
View File

@ -20,7 +20,7 @@ QT5QUICK1_REDISTRIBUTE = NO
endif
define QT5QUICK1_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5QUICK1_BUILD_CMDS

2
package/qt5/qt5quickcontrols/qt5quickcontrols.mk
View File

@ -19,7 +19,7 @@ QT5QUICKCONTROLS_REDISTRIBUTE = NO
endif
define QT5QUICKCONTROLS_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5QUICKCONTROLS_BUILD_CMDS

2
package/qt5/qt5script/qt5script.mk
View File

@ -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

2
package/qt5/qt5sensors/qt5sensors.mk
View File

@ -23,7 +23,7 @@ QT5SENSORS_DEPENDENCIES += qt5declarative
endif
define QT5SENSORS_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5SENSORS_BUILD_CMDS

2
package/qt5/qt5serialport/qt5serialport.mk
View File

@ -19,7 +19,7 @@ QT5SERIALPORT_REDISTRIBUTE = NO
endif
define QT5SERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5SERIALPORT_BUILD_CMDS

2
package/qt5/qt5svg/qt5svg.mk
View File

@ -20,7 +20,7 @@ QT5SVG_REDISTRIBUTE = NO
endif
define QT5SVG_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5SVG_BUILD_CMDS

2
package/qt5/qt5x11extras/qt5x11extras.mk
View File

@ -19,7 +19,7 @@ QT5X11EXTRAS_REDISTRIBUTE = NO
endif
define QT5X11EXTRAS_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5X11EXTRAS_BUILD_CMDS

2
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
View File

@ -19,7 +19,7 @@ QT5XMLPATTERNS_REDISTRIBUTE = NO
endif
define QT5XMLPATTERNS_CONFIGURE_CMDS
(cd $(@D); $(HOST_DIR)/usr/bin/qmake)
(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
endef
define QT5XMLPATTERNS_BUILD_CMDS