diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch')
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch b/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch new file mode 100644 index 00000000..c64b32a4 --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0002-Use-ninja-supplied-by-environment-variable-NINJA_PAT.patch @@ -0,0 +1,36 @@ +From 2fe53c4c28f91941ee3b446e88f519feb2edc457 Mon Sep 17 00:00:00 2001 +From: Simon Busch <morphis@gravedo.de> +Date: Fri, 20 Jun 2014 09:09:12 +0200 +Subject: [PATCH 2/2] Use ninja supplied by environment variable NINJA_PATH + +Signed-off-by: Simon Busch <morphis@gravedo.de> +--- + tools/qmake/mkspecs/features/functions.prf | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/tools/qmake/mkspecs/features/functions.prf b/tools/qmake/mkspecs/features/functions.prf +index 4dcd8ed..8725fd2 100644 +--- a/tools/qmake/mkspecs/features/functions.prf ++++ b/tools/qmake/mkspecs/features/functions.prf +@@ -84,16 +84,6 @@ defineReplace(which) { + } + + defineReplace(findOrBuildNinja) { +- git_chromium_src_dir = $$system("git config qtwebengine.chromiumsrcdir") +- # Fall back to the snapshot path if git does not know about chromium sources (i.e. init-repository.py has not been used) +- isEmpty(git_chromium_src_dir): git_chromium_src_dir = "src/3rdparty/chromium" +- +- out = $$absolute_path("$$git_chromium_src_dir/../ninja/ninja", "$$QTWEBENGINE_ROOT") +- win32: out = $$system_path($${out}.exe) +- +- # If we did not find ninja, then we bootstrap it. +- !exists($$out) { +- system("python $$dirname(out)/bootstrap.py") +- } +- return($$out) ++ message(Using ninja from path $$NINJA_PATH) ++ return($$NINJA_PATH) + } +-- +1.9.1 + |