qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configure

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 107 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
new file mode 100644
index 00000000..e432b979
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -0,0 +1,35 @@
+From 68c459603bcf545637e852e08613c6fca4da9ef9 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 9 May 2013 10:06:50 +0200
+Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+
+* sometimes we would like to add -e or define some variable and respect it from both
+  Makefiles used in configure tests and also Maakefiles to build the application
+
+Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+---
+ mkspecs/features/configure.prf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+index 39144e7..1864ba8 100644
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
+     qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
+ 
+     # Clean up after previous run
+-    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
++    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
+ 
+     mkpath($$test_out_dir)|error("Aborting.")
+ 
+     qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+-        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
++        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
+             log("yes$$escape_expand(\\n)")
+             msg = "test $$1 succeeded"
+             write_file($$QMAKE_CONFIG_LOG, msg, append)
+-- 
+1.8.2.1
+
diff --git a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
new file mode 100644
index 00000000..7d4b32bf
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -0,0 +1,35 @@
+From c57cec0fdcbc89671ef297c68554e27fbe99c09d Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 9 May 2013 10:06:50 +0200
+Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+
+* sometimes we would like to add -e or define some variable and respect it from both
+  Makefiles used in configure tests and also Maakefiles to build the application
+
+Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+---
+ mkspecs/features/configure.prf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+index b4569df..50ca562 100644
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -57,12 +57,12 @@ defineTest(qtCompileTest) {
+     qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
+ 
+     # Clean up after previous run
+-    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
++    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
+ 
+     mkpath($$test_out_dir)|error("Aborting.")
+ 
+     qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+-        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
++        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
+             log("yes$$escape_expand(\\n)")
+             msg = "test $$1 succeeded"
+             write_file($$QMAKE_CONFIG_LOG, msg, append)
+-- 
+1.8.2.1
+
diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc
index 1de1e1da..87698227 100644
--- a/recipes-qt/qt5/qtbase-native.inc
+++ b/recipes-qt/qt5/qtbase-native.inc
@@ -21,6 +21,7 @@ SRC_URI += " \
     file://0011-qt_module-Fix-paths-in-.prl-files.patch \
     file://0012-wayland-scanner-disable-silent-rules.patch \
     file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
+    file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
 # specific for native version
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 3e471517..9624f1de 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -13,6 +13,7 @@ SRC_URI += " \
     file://0011-qt_module-Fix-paths-in-.prl-files.patch \
     file://0012-wayland-scanner-disable-silent-rules.patch \
     file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
+    file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
 "
 
 DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}"
diff --git a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
new file mode 100644
index 00000000..79d314c5
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch
@@ -0,0 +1,35 @@
+From 01653e270c4a9169a32c0002a87a6644727d0b11 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 9 May 2013 10:06:50 +0200
+Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make
+
+* sometimes we would like to add -e or define some variable and respect it from both
+  Makefiles used in configure tests and also Maakefiles to build the application
+
+Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469
+---
+ mkspecs/features/configure.prf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf
+index 39144e7..1864ba8 100644
+--- a/mkspecs/features/configure.prf
++++ b/mkspecs/features/configure.prf
+@@ -54,12 +54,12 @@ defineTest(qtCompileTest) {
+     qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\""
+ 
+     # Clean up after previous run
+-    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean")
++    exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean")
+ 
+     mkpath($$test_out_dir)|error("Aborting.")
+ 
+     qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") {
+-        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") {
++        qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") {
+             log("yes$$escape_expand(\\n)")
+             msg = "test $$1 succeeded"
+             write_file($$QMAKE_CONFIG_LOG, msg, append)
+-- 
+1.8.2.1
+