diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 60d4a5cc..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 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 12/22] 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 Makefiles to build the application - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - 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..de48b07 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.3.2 - |