Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake
@ 2014-03-19 19:30 Thomas De Schampheleire
  2014-03-19 19:30 ` [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake Thomas De Schampheleire
                   ` (4 more replies)
  0 siblings, 5 replies; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-03-19 19:30 UTC (permalink / raw)
  To: buildroot


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 <thomas.de.schampheleire@gmail.com>

---
 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(-)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake
  2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
@ 2014-03-19 19:30 ` Thomas De Schampheleire
  2014-03-25 22:46   ` Arnout Vandecappelle
  2014-03-19 19:30 ` [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake Thomas De Schampheleire
                   ` (3 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-03-19 19:30 UTC (permalink / raw)
  To: buildroot

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

---
 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(-)

diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk
--- a/package/qt5/qt5connectivity/qt5connectivity.mk
+++ b/package/qt5/qt5connectivity/qt5connectivity.mk
@@ -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
diff --git a/package/qt5/qt5declarative/qt5declarative.mk b/package/qt5/qt5declarative/qt5declarative.mk
--- a/package/qt5/qt5declarative/qt5declarative.mk
+++ b/package/qt5/qt5declarative/qt5declarative.mk
@@ -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
diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
--- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
+++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.mk
@@ -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
diff --git a/package/qt5/qt5imageformats/qt5imageformats.mk b/package/qt5/qt5imageformats/qt5imageformats.mk
--- a/package/qt5/qt5imageformats/qt5imageformats.mk
+++ b/package/qt5/qt5imageformats/qt5imageformats.mk
@@ -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
diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk
--- a/package/qt5/qt5multimedia/qt5multimedia.mk
+++ b/package/qt5/qt5multimedia/qt5multimedia.mk
@@ -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
diff --git a/package/qt5/qt5quick1/qt5quick1.mk b/package/qt5/qt5quick1/qt5quick1.mk
--- a/package/qt5/qt5quick1/qt5quick1.mk
+++ b/package/qt5/qt5quick1/qt5quick1.mk
@@ -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
diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
--- a/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
+++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.mk
@@ -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
diff --git a/package/qt5/qt5script/qt5script.mk b/package/qt5/qt5script/qt5script.mk
--- 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
diff --git a/package/qt5/qt5sensors/qt5sensors.mk b/package/qt5/qt5sensors/qt5sensors.mk
--- a/package/qt5/qt5sensors/qt5sensors.mk
+++ b/package/qt5/qt5sensors/qt5sensors.mk
@@ -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
diff --git a/package/qt5/qt5serialport/qt5serialport.mk b/package/qt5/qt5serialport/qt5serialport.mk
--- a/package/qt5/qt5serialport/qt5serialport.mk
+++ b/package/qt5/qt5serialport/qt5serialport.mk
@@ -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
diff --git a/package/qt5/qt5svg/qt5svg.mk b/package/qt5/qt5svg/qt5svg.mk
--- a/package/qt5/qt5svg/qt5svg.mk
+++ b/package/qt5/qt5svg/qt5svg.mk
@@ -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
diff --git a/package/qt5/qt5x11extras/qt5x11extras.mk b/package/qt5/qt5x11extras/qt5x11extras.mk
--- a/package/qt5/qt5x11extras/qt5x11extras.mk
+++ b/package/qt5/qt5x11extras/qt5x11extras.mk
@@ -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
diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
--- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
+++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.mk
@@ -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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
  2014-03-19 19:30 ` [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake Thomas De Schampheleire
@ 2014-03-19 19:30 ` Thomas De Schampheleire
  2014-03-25 22:54   ` Arnout Vandecappelle
  2014-03-19 19:30 ` [Buildroot] [PATCH 3 of 4] qtuio: " Thomas De Schampheleire
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-03-19 19:30 UTC (permalink / raw)
  To: buildroot

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 <thomas.de.schampheleire@gmail.com>

---
 package/qwt/qwt.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
--- a/package/qwt/qwt.mk
+++ b/package/qwt/qwt.mk
@@ -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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 3 of 4] qtuio: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
  2014-03-19 19:30 ` [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake Thomas De Schampheleire
  2014-03-19 19:30 ` [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake Thomas De Schampheleire
@ 2014-03-19 19:30 ` Thomas De Schampheleire
  2014-03-25 22:58   ` Arnout Vandecappelle
  2014-03-19 19:30 ` [Buildroot] [PATCH 4 of 4] qextserialport: " Thomas De Schampheleire
  2014-03-26 16:09 ` [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during " Peter Korsgaard
  4 siblings, 1 reply; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-03-19 19:30 UTC (permalink / raw)
  To: buildroot

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 <thomas.de.schampheleire@gmail.com>

---
 package/qtuio/qtuio.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
--- a/package/qtuio/qtuio.mk
+++ b/package/qtuio/qtuio.mk
@@ -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
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 4 of 4] qextserialport: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
                   ` (2 preceding siblings ...)
  2014-03-19 19:30 ` [Buildroot] [PATCH 3 of 4] qtuio: " Thomas De Schampheleire
@ 2014-03-19 19:30 ` Thomas De Schampheleire
  2014-03-25 22:59   ` Arnout Vandecappelle
  2014-03-26 16:09 ` [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during " Peter Korsgaard
  4 siblings, 1 reply; 10+ messages in thread
From: Thomas De Schampheleire @ 2014-03-19 19:30 UTC (permalink / raw)
  To: buildroot

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 <thomas.de.schampheleire@gmail.com>

---
 package/qextserialport/qextserialport.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
--- a/package/qextserialport/qextserialport.mk
+++ b/package/qextserialport/qextserialport.mk
@@ -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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake
  2014-03-19 19:30 ` [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake Thomas De Schampheleire
@ 2014-03-25 22:46   ` Arnout Vandecappelle
  0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2014-03-25 22:46 UTC (permalink / raw)
  To: buildroot

On 19/03/14 20:30, Thomas De Schampheleire wrote:
> 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>


 Regards,
 Arnout

[snip]

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 ` [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake Thomas De Schampheleire
@ 2014-03-25 22:54   ` Arnout Vandecappelle
  0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2014-03-25 22:54 UTC (permalink / raw)
  To: buildroot

On 19/03/14 20:30, Thomas De Schampheleire wrote:
> 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 <thomas.de.schampheleire@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

> 
> ---
>  package/qwt/qwt.mk |  4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk
> --- a/package/qwt/qwt.mk
> +++ b/package/qwt/qwt.mk
> @@ -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
> 


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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 3 of 4] qtuio: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 ` [Buildroot] [PATCH 3 of 4] qtuio: " Thomas De Schampheleire
@ 2014-03-25 22:58   ` Arnout Vandecappelle
  0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2014-03-25 22:58 UTC (permalink / raw)
  To: buildroot

On 19/03/14 20:30, Thomas De Schampheleire wrote:
> 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 <thomas.de.schampheleire@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

> 
> ---
>  package/qtuio/qtuio.mk |  6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/package/qtuio/qtuio.mk b/package/qtuio/qtuio.mk
> --- a/package/qtuio/qtuio.mk
> +++ b/package/qtuio/qtuio.mk
> @@ -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
> 


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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 4 of 4] qextserialport: use TARGET_MAKE_ENV when running make and qmake
  2014-03-19 19:30 ` [Buildroot] [PATCH 4 of 4] qextserialport: " Thomas De Schampheleire
@ 2014-03-25 22:59   ` Arnout Vandecappelle
  0 siblings, 0 replies; 10+ messages in thread
From: Arnout Vandecappelle @ 2014-03-25 22:59 UTC (permalink / raw)
  To: buildroot

On 19/03/14 20:30, Thomas De Schampheleire wrote:
> 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 <thomas.de.schampheleire@gmail.com>

Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 gpsd probably also requires this change.


 Regards,
 Arnout

> 
> ---
>  package/qextserialport/qextserialport.mk |  4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/qextserialport/qextserialport.mk b/package/qextserialport/qextserialport.mk
> --- a/package/qextserialport/qextserialport.mk
> +++ b/package/qextserialport/qextserialport.mk
> @@ -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
> 


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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake
  2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
                   ` (3 preceding siblings ...)
  2014-03-19 19:30 ` [Buildroot] [PATCH 4 of 4] qextserialport: " Thomas De Schampheleire
@ 2014-03-26 16:09 ` Peter Korsgaard
  4 siblings, 0 replies; 10+ messages in thread
From: Peter Korsgaard @ 2014-03-26 16:09 UTC (permalink / raw)
  To: buildroot

>>>>> "Thomas" == Thomas De Schampheleire <patrickdepinguin@gmail.com> 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 <thomas.de.schampheleire@gmail.com>

Committed series, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2014-03-26 16:09 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-19 19:30 [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during make and qmake Thomas De Schampheleire
2014-03-19 19:30 ` [Buildroot] [PATCH 1 of 4] qt5 packages: set correct PATH when running qmake Thomas De Schampheleire
2014-03-25 22:46   ` Arnout Vandecappelle
2014-03-19 19:30 ` [Buildroot] [PATCH 2 of 4] qwt: use TARGET_MAKE_ENV when running make and qmake Thomas De Schampheleire
2014-03-25 22:54   ` Arnout Vandecappelle
2014-03-19 19:30 ` [Buildroot] [PATCH 3 of 4] qtuio: " Thomas De Schampheleire
2014-03-25 22:58   ` Arnout Vandecappelle
2014-03-19 19:30 ` [Buildroot] [PATCH 4 of 4] qextserialport: " Thomas De Schampheleire
2014-03-25 22:59   ` Arnout Vandecappelle
2014-03-26 16:09 ` [Buildroot] [PATCH 0 of 4] qt packages: make sure PATH is set during " Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox