diff options
| author | Andreas Müller <schnitzeltony@gmail.com> | 2018-06-05 00:39:11 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-06-05 13:50:55 +0000 |
| commit | 29445f6e37a669276d28b96e07d6f80443f244b8 (patch) | |
| tree | 1ae05a29a2bb1df43ec3e3cf5ed170c64d6e5f70 /recipes-qt/qt5/qtwebkit | |
| parent | dde9b55a24a364c5fede0d6c874890acb0251386 (diff) | |
qtwebkit: do not skip build - use cmake as build system
log.do_configure says:
| The WebKit build was disabled for the following reasons:
| * cross-compilation of QtWebKit with qmake is not supported yet
| * Missing cmake from PATH
| * Using cmake version , but at least cmake 2.8.12 is required to build QtWebKit.
and build was finished without errors (but surprisingly fast). Looking into
qtwebkit, it seems they have changed to cmake build system and Webkit.pro is
just a wrapper for preparing and running cmake.
For the transition the packageconfigs were translated as close as possible.
'libxcomposite' and 'libxrender' were merged to 'x11' - there is only one
option 'ENABLE_X11_TARGET' available for both.
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebkit')
| -rw-r--r-- | recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch new file mode 100644 index 00000000..dac4815c --- /dev/null +++ b/recipes-qt/qt5/qtwebkit/0001-Do-not-skip-build-for-cross-compile.patch @@ -0,0 +1,31 @@ +From d9f4d11ffdf1e8b5485aefc3556b1bef3e009587 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 4 Jun 2018 10:35:46 +0200 +Subject: [PATCH] Do not skip build for cross-compile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + Tools/qmake/mkspecs/features/functions.prf | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Tools/qmake/mkspecs/features/functions.prf b/Tools/qmake/mkspecs/features/functions.prf +index e3f42cec4..797b7085f 100644 +--- a/Tools/qmake/mkspecs/features/functions.prf ++++ b/Tools/qmake/mkspecs/features/functions.prf +@@ -53,8 +53,6 @@ defineReplace(appleSdkVersion) { + defineTest(isPlatformSupported) { + !qtHaveModule(widgets): skipBuild("QtWidgets module is required to build QtWebKit.") + +- cross_compile: skipBuild("cross-compilation of QtWebKit with qmake is not supported yet") +- + requiredPrograms = cmake gperf python perl bison ruby flex + for(program, requiredPrograms): \ + !programExistsInPath($$program): \ +-- +2.14.3 + |