summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
-rw-r--r--recipes-qt/qt5/qtwebkit_git.bb17
1 files changed, 7 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 942e733a..4655d9fd 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -12,20 +12,16 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13 12# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.13
13# 5.13.meta-qt5.1 13# 5.13.meta-qt5.1
14SRC_URI += "\ 14SRC_URI += "\
15 file://0001-Do-not-skip-build-for-cross-compile.patch \ 15 file://0001-Port-build-to-python3.patch \
16 file://0002-Fix-build-with-non-glibc-libc-on-musl.patch \ 16 file://0002-Do-not-skip-build-for-cross-compile.patch \
17 file://0003-Fix-build-bug-for-armv32-BE.patch \ 17 file://0003-Fix-build-with-non-glibc-libc-on-musl.patch \
18 file://0004-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \ 18 file://0004-Fix-build-bug-for-armv32-BE.patch \
19 file://0005-PlatformQt.cmake-Do-not-generate-hardcoded-include-p.patch \
19" 20"
20 21
21inherit cmake_qt5 perlnative 22inherit cmake_qt5 perlnative
22 23
23inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)} 24inherit python3native
24
25python() {
26 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
27 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
28}
29 25
30# qemuarm build fails with: 26# qemuarm build fails with:
31# | {standard input}: Assembler messages: 27# | {standard input}: Assembler messages:
@@ -52,6 +48,7 @@ EXTRA_OECMAKE += " \
52 -DCROSS_COMPILE=ON \ 48 -DCROSS_COMPILE=ON \
53 -DECM_MKSPECS_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/modules \ 49 -DECM_MKSPECS_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/modules \
54 -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ 50 -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \
51 -DPYTHON_EXECUTABLE=`which python3` \
55" 52"
56 53
57EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" 54EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'"