diff options
Diffstat (limited to 'recipes-qt/qt5/qtwebkit_git.bb')
-rw-r--r-- | recipes-qt/qt5/qtwebkit_git.bb | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb index c5473440..28b9f128 100644 --- a/recipes-qt/qt5/qtwebkit_git.bb +++ b/recipes-qt/qt5/qtwebkit_git.bb | |||
@@ -24,16 +24,16 @@ inherit cmake_qt5 perlnative pythonnative | |||
24 | # | {standard input}: Assembler messages: | 24 | # | {standard input}: Assembler messages: |
25 | # | {standard input}:106: Error: invalid immediate: 983040 is out of range | 25 | # | {standard input}:106: Error: invalid immediate: 983040 is out of range |
26 | # | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 | 26 | # | {standard input}:106: Error: value of 983040 too large for field of 2 bytes at 146 |
27 | ARM_INSTRUCTION_SET_armv4 = "arm" | 27 | ARM_INSTRUCTION_SET:armv4 = "arm" |
28 | ARM_INSTRUCTION_SET_armv5 = "arm" | 28 | ARM_INSTRUCTION_SET:armv5 = "arm" |
29 | 29 | ||
30 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 | 30 | # https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 |
31 | # https://bugs.webkit.org/show_bug.cgi?id=159880 | 31 | # https://bugs.webkit.org/show_bug.cgi?id=159880 |
32 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. | 32 | # JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. |
33 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). | 33 | # Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). |
34 | ARM_INSTRUCTION_SET_armv7a = "thumb" | 34 | ARM_INSTRUCTION_SET:armv7a = "thumb" |
35 | ARM_INSTRUCTION_SET_armv7r = "thumb" | 35 | ARM_INSTRUCTION_SET:armv7r = "thumb" |
36 | ARM_INSTRUCTION_SET_armv7ve = "thumb" | 36 | ARM_INSTRUCTION_SET:armv7ve = "thumb" |
37 | 37 | ||
38 | # http://errors.yoctoproject.org/Errors/Details/179245/ | 38 | # http://errors.yoctoproject.org/Errors/Details/179245/ |
39 | # just use -fpermissive in this case like fedora did: | 39 | # just use -fpermissive in this case like fedora did: |
@@ -47,11 +47,11 @@ EXTRA_OECMAKE += " \ | |||
47 | -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ | 47 | -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ |
48 | " | 48 | " |
49 | 49 | ||
50 | EXTRA_OECMAKE_append_toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" | 50 | EXTRA_OECMAKE:append:toolchain-clang = " -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}'" |
51 | 51 | ||
52 | # JIT not supported on MIPS64 | 52 | # JIT not supported on MIPS64 |
53 | EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF " | 53 | EXTRA_OECMAKE:append:mips64 = " -DENABLE_JIT=OFF " |
54 | EXTRA_OECMAKE_append_mips64el = " -DENABLE_JIT=OFF " | 54 | EXTRA_OECMAKE:append:mips64el = " -DENABLE_JIT=OFF " |
55 | 55 | ||
56 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ | 56 | PACKAGECONFIG ??= "qtlocation qtmultimedia qtsensors qtwebchannel \ |
57 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ | 57 | ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} \ |
@@ -71,7 +71,7 @@ PACKAGECONFIG[fontconfig] = "-DENABLE_TEST_SUPPORT=ON,-DENABLE_TEST_SUPPORT=OFF, | |||
71 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" | 71 | PACKAGECONFIG[hyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,hyphen" |
72 | 72 | ||
73 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe | 73 | # remove default ${PN}-examples* set in qt5.inc, because they conflicts with ${PN} from separate webkit-examples recipe |
74 | PACKAGES_remove = "${PN}-examples" | 74 | PACKAGES:remove = "${PN}-examples" |
75 | 75 | ||
76 | QT_MODULE_BRANCH = "dev" | 76 | QT_MODULE_BRANCH = "dev" |
77 | 77 | ||