Skip to contentSkip to conversation

qt packages: make sure PATH is set during make and qmake

PATCH New Thomas De Schampheleire 3 participants 10 messages Mar 19, 2014 – Mar 26, 2014

lore
Share & tools
lore

Thomas De Schampheleire

author
#0 lore raw

PATCH 1/1 qt packages: make sure PATH is set during make and qmake

Following a build error reported by Marco Trapanese, this patch series makes sure that PATH is set correctly during calls to make/qmake of qt packages.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/qextserialport/qextserialport.mk               |  4 ++--
 package/qt5/qt5connectivity/qt5connectivity.mk         |  2 +-
 package/qt5/qt5declarative/qt5declarative.mk           |  2 +-
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk |  2 +-
 package/qt5/qt5imageformats/qt5imageformats.mk         |  2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk             |  2 +-
 package/qt5/qt5quick1/qt5quick1.mk                     |  2 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk       |  2 +-
 package/qt5/qt5script/qt5script.mk                     |  2 +-
 package/qt5/qt5sensors/qt5sensors.mk                   |  2 +-
 package/qt5/qt5serialport/qt5serialport.mk             |  2 +-
 package/qt5/qt5svg/qt5svg.mk                           |  2 +-
 package/qt5/qt5x11extras/qt5x11extras.mk               |  2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           |  2 +-
 package/qtuio/qtuio.mk                                 |  6 +++---
 package/qwt/qwt.mk                                     |  4 ++--
 16 files changed, 20 insertions(+), 20 deletions(-)
author
#1 lore raw

PATCH 1/1 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 <[email protected]>
Signed-off-by Thomas De Schampheleire <[email protected]>

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

---
 package/qt5/qt5connectivity/qt5connectivity.mk         |  2 +-
 package/qt5/qt5declarative/qt5declarative.mk           |  2 +-
 package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk |  2 +-
 package/qt5/qt5imageformats/qt5imageformats.mk         |  2 +-
 package/qt5/qt5multimedia/qt5multimedia.mk             |  2 +-
 package/qt5/qt5quick1/qt5quick1.mk                     |  2 +-
 package/qt5/qt5quickcontrols/qt5quickcontrols.mk       |  2 +-
 package/qt5/qt5script/qt5script.mk                     |  2 +-
 package/qt5/qt5sensors/qt5sensors.mk                   |  2 +-
 package/qt5/qt5serialport/qt5serialport.mk             |  2 +-
 package/qt5/qt5svg/qt5svg.mk                           |  2 +-
 package/qt5/qt5x11extras/qt5x11extras.mk               |  2 +-
 package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk           |  2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)
package/qt5/qt5connectivity/qt5connectivity.mk +1 -1
@@ -23,7 +23,7 @@ QT5CONNECTIVITY_DEPENDENCIES += qt5decla
 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
@@ -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
@@ -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
@@ -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
@@ -25,7 +25,7 @@ QT5MULTIMEDIA_DEPENDENCIES += gst-plugin
 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
package/qt5/qt5quick1/qt5quick1.mk +1 -1
@@ -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
package/qt5/qt5quickcontrols/qt5quickcontrols.mk +1 -1
@@ -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
package/qt5/qt5script/qt5script.mk +1 -1
@@ -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
package/qt5/qt5sensors/qt5sensors.mk +1 -1
@@ -23,7 +23,7 @@ QT5SENSORS_DEPENDENCIES += qt5declarativ
 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
package/qt5/qt5serialport/qt5serialport.mk +1 -1
@@ -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
package/qt5/qt5svg/qt5svg.mk +1 -1
@@ -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
package/qt5/qt5x11extras/qt5x11extras.mk +1 -1
@@ -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
package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +1 -1
@@ -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
#2 lore raw

PATCH 1/1 qt5 packages: set correct PATH when running qmake

Quoted 7 lines · Thomas De Schampheleire

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.

Quoted 6 lines

This patch prepends TARGET_MAKE_ENV (which sets PATH) to the qmake call.

Reported-by Marco Trapanese <[email protected]>
Signed-off-by Thomas De Schampheleire <[email protected]>

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

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#3 lore raw

PATCH 1/1 qwt: use TARGET_MAKE_ENV when running make and qmake

In reply to Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/qwt/qwt.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/qwt/qwt.mk +2 -2
@@ -28,11 +28,11 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 # After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so
#4 lore raw

PATCH 1/1 qwt: use TARGET_MAKE_ENV when running make and qmake

Quoted 5 lines · Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 27 lines
---
 package/qwt/qwt.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/qwt/qwt.mk +2 -2
@@ -28,11 +28,11 @@ endif
 
 define QWT_CONFIGURE_CMDS
 	$(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri
-	(cd $(@D); $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
 endef
 
 define QWT_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 # After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#5 lore raw

PATCH 1/1 qtuio: use TARGET_MAKE_ENV when running make and qmake

In reply to Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/qtuio/qtuio.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/qtuio/qtuio.mk +3 -3
@@ -19,13 +19,13 @@ QTUIO_EXAMPLES = dials fingerpaint knobs
 ifeq ($(BR2_QTUIO_EXAMPLES),y)
 define QTUIO_CONFIGURE_EXAMPLES
 	for example in $(QTUIO_EXAMPLES) ; do \
-		(cd $(@D)/examples/$${example} && $(QT_QMAKE)) ; \
+		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) ; \
 	done
 endef
 endif
 
 define QTUIO_CONFIGURE_CMDS
-	cd $(@D)/src && $(QT_QMAKE)
+	cd $(@D)/src && $(TARGET_MAKE_ENV) $(QT_QMAKE)
 	$(QTUIO_CONFIGURE_EXAMPLES)
 endef
 

@@ -38,7 +38,7 @@ endef
 endif
 
 define QTUIO_BUILD_CMDS
-	$(MAKE) -C $(@D)/src
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src
 	$(QTUIO_BUILD_EXAMPLES)
 endef
#6 lore raw

PATCH 1/1 qtuio: use TARGET_MAKE_ENV when running make and qmake

Quoted 5 lines · Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 38 lines
---
 package/qtuio/qtuio.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
package/qtuio/qtuio.mk +3 -3
@@ -19,13 +19,13 @@ QTUIO_EXAMPLES = dials fingerpaint knobs
 ifeq ($(BR2_QTUIO_EXAMPLES),y)
 define QTUIO_CONFIGURE_EXAMPLES
 	for example in $(QTUIO_EXAMPLES) ; do \
-		(cd $(@D)/examples/$${example} && $(QT_QMAKE)) ; \
+		(cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) ; \
 	done
 endef
 endif
 
 define QTUIO_CONFIGURE_CMDS
-	cd $(@D)/src && $(QT_QMAKE)
+	cd $(@D)/src && $(TARGET_MAKE_ENV) $(QT_QMAKE)
 	$(QTUIO_CONFIGURE_EXAMPLES)
 endef
 

@@ -38,7 +38,7 @@ endef
 endif
 
 define QTUIO_BUILD_CMDS
-	$(MAKE) -C $(@D)/src
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src
 	$(QTUIO_BUILD_EXAMPLES)
 endef

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
author
#7 lore raw

PATCH 1/1 qextserialport: use TARGET_MAKE_ENV when running make and qmake

In reply to Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
---
 package/qextserialport/qextserialport.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/qextserialport/qextserialport.mk +2 -2
@@ -15,11 +15,11 @@ QEXTSERIALPORT_DEPENDENCIES = qt
 QEXTSERIALPORT_INSTALL_STAGING = YES
 
 define QEXTSERIALPORT_CONFIGURE_CMDS
-	(cd $(@D); $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
 endef
 
 define QEXTSERIALPORT_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define QEXTSERIALPORT_INSTALL_STAGING_CMDS
#8 lore raw

PATCH 1/1 qextserialport: use TARGET_MAKE_ENV when running make and qmake

Quoted 5 lines · Thomas De Schampheleire

This patch prepends TARGET_MAKE_ENV to $(MAKE) and $(QT_QMAKE) command lines, to make sure PATH is set correctly, and to line up with the qt5 packages that do this consistently.

Signed-off-by Thomas De Schampheleire <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

gpsd probably also requires this change.

Regards,
Arnout

Quoted 27 lines
---
 package/qextserialport/qextserialport.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
package/qextserialport/qextserialport.mk +2 -2
@@ -15,11 +15,11 @@ QEXTSERIALPORT_DEPENDENCIES = qt
 QEXTSERIALPORT_INSTALL_STAGING = YES
 
 define QEXTSERIALPORT_CONFIGURE_CMDS
-	(cd $(@D); $(QT_QMAKE))
+	(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
 endef
 
 define QEXTSERIALPORT_BUILD_CMDS
-	$(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
 define QEXTSERIALPORT_INSTALL_STAGING_CMDS

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#9 lore raw

PATCH 1/1 qt packages: make sure PATH is set during make and qmake

In reply to Thomas De Schampheleire
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas De Schampheleire <[email protected]> writes:

Following a build error reported by Marco Trapanese, this patch series makes sure that PATH is set correctly during calls to make/qmake of qt packages.

Signed-off-by Thomas De Schampheleire <[email protected]>

Committed series, thanks.

Signature · 1 line
Bye, Peter Korsgaard